third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-10-02 17:49:19 +03:00
parent 3133bb49aa a105f56957
commit 3fb6617d62
14 changed files with 534 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/misc/python/test/test_dnn.py
+1 -1
View File
@@ -215,7 +215,7 @@ class dnn_test(NewOpenCVTests):
testScores, testBoxes, 0.5, scoresDiff, iouDiff)
def test_async(self):
timeout = 500*10**6 # in nanoseconds (500ms)
timeout = 10*1000*10**6 # in nanoseconds (10 sec)
testdata_required = bool(os.environ.get('OPENCV_DNN_TEST_REQUIRE_TESTDATA', False))
proto = self.find_dnn_file('dnn/layers/layer_convolution.prototxt', required=testdata_required)
model = self.find_dnn_file('dnn/layers/layer_convolution.caffemodel', required=testdata_required)