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

dnn(test): avoid calling of cv::setNumThreads() in tests directly

Browse Source 
It is not necessary by default.
Also it breaks test system command-line parameters: --perf_threads / --test_threads
This commit is contained in:
Alexander Alekhin
2017-12-27 14:56:29 +00:00
parent 5232ea1ee6
commit 9b131b5f7e
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/perf/perf_convolution.cpp
+1 -3
View File
@@ -60,8 +60,6 @@ PERF_TEST_P( ConvolutionPerfTest, perf, Combine(
std::vector<Mat*> inpBlobs(1, &inpBlob);
std::vector<Mat> outBlobs, internalBlobs;
cv::setNumThreads(cv::getNumberOfCPUs());
Ptr<Layer> layer = cv::dnn::LayerFactory::createLayerInstance("Convolution", lp);
std::vector<MatShape> inputShapes(1, shape(inpBlob)), outShapes, internals;
layer->getMemoryShapes(inputShapes, 0, outShapes, internals);
@@ -81,7 +79,7 @@ PERF_TEST_P( ConvolutionPerfTest, perf, Combine(
Mat inpBlob2D = inpBlob.reshape(1, outCn);
Mat wgtBlob2D = wgtBlob.reshape(1, outCn*(inpCn/groups));
Mat outBlob2D = outBlobs[0].reshape(1, outBlobs[0].size[0]);
declare.in(inpBlob2D, wgtBlob2D, WARMUP_RNG).out(outBlob2D).tbb_threads(cv::getNumThreads());
declare.in(inpBlob2D, wgtBlob2D, WARMUP_RNG).out(outBlob2D);
layer->forward(inpBlobs, outBlobs, internalBlobs); /// warmup