Skip to content

Commit b8de57f

Browse files
committed
cleanup unnecessary setNumThreads() calls
1 parent c49d781 commit b8de57f

30 files changed

+55
-64
lines changed

modules/bgsegm/samples/bgfg.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ static Ptr<BackgroundSubtractor> createBGSubtractorByName(const String& algoName
3737

3838
int main(int argc, char** argv)
3939
{
40-
setUseOptimized(true);
41-
setNumThreads(8);
42-
4340
CommandLineParser parser(argc, argv, keys);
4441
parser.about(about);
4542
parser.printMessage();

modules/optflow/perf/perf_deepflow.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ PERF_TEST_P(DenseOpticalFlow_DeepFlow, perf, Values(szVGA, sz720p))
2020
randu(frame1, 0, 255);
2121
randu(frame2, 0, 255);
2222

23-
cv::setNumThreads(cv::getNumberOfCPUs());
2423
TEST_CYCLE_N(1)
2524
{
2625
Ptr<DenseOpticalFlow> algo = createOptFlow_DeepFlow();

modules/optflow/perf/perf_disflow.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ PERF_TEST_P(DenseOpticalFlow_DIS, perf,
3232

3333
MakeArtificialExample(frame1, frame2);
3434

35-
cv::setNumThreads(cv::getNumberOfCPUs());
3635
TEST_CYCLE_N(10)
3736
{
3837
Ptr<DenseOpticalFlow> algo = createOptFlow_DIS(preset);

modules/optflow/perf/perf_variational_refinement.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ PERF_TEST_P(DenseOpticalFlow_VariationalRefinement, perf, Combine(Values(szQVGA,
2323
randu(frame2, 0, 255);
2424
flow.setTo(0.0f);
2525

26-
cv::setNumThreads(cv::getNumberOfCPUs());
2726
TEST_CYCLE_N(10)
2827
{
2928
Ptr<VariationalRefinement> var = createVariationalFlowRefinement();

modules/optflow/test/test_OF_reproducibility.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ TEST_P(DenseOpticalFlow_DIS, MultithreadReproducibility)
5757
OFParams params = GetParam();
5858
Size size = get<0>(params);
5959

60+
int nThreads = cv::getNumThreads();
61+
if (nThreads == 1)
62+
throw SkipTestException("Single thread environment");
6063
for (int iter = 0; iter <= loopsCount; iter++)
6164
{
6265
Mat frame1(size, CV_8U);
@@ -79,7 +82,7 @@ TEST_P(DenseOpticalFlow_DIS, MultithreadReproducibility)
7982
algo->setUseMeanNormalization(use_mean_normalization);
8083
algo->setUseSpatialPropagation(use_spatial_propagation);
8184

82-
cv::setNumThreads(cv::getNumberOfCPUs());
85+
cv::setNumThreads(nThreads);
8386
Mat resMultiThread;
8487
algo->calc(frame1, frame2, resMultiThread);
8588

@@ -111,6 +114,9 @@ TEST_P(DenseOpticalFlow_VariationalRefinement, MultithreadReproducibility)
111114
OFParams params = GetParam();
112115
Size size = get<0>(params);
113116

117+
int nThreads = cv::getNumThreads();
118+
if (nThreads == 1)
119+
throw SkipTestException("Single thread environment");
114120
for (int iter = 0; iter <= loopsCount; iter++)
115121
{
116122
Mat frame1(size, CV_8U);
@@ -128,7 +134,7 @@ TEST_P(DenseOpticalFlow_VariationalRefinement, MultithreadReproducibility)
128134
var->setFixedPointIterations(rng.uniform(1, 20));
129135
var->setOmega(rng.uniform(1.01f, 1.99f));
130136

131-
cv::setNumThreads(cv::getNumberOfCPUs());
137+
cv::setNumThreads(nThreads);
132138
Mat resMultiThread;
133139
flow.copyTo(resMultiThread);
134140
var->calc(frame1, frame2, resMultiThread);

modules/tracking/src/trackerCSRT.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,6 @@ bool TrackerCSRTImpl::updateImpl(const Mat& image_, Rect2d& boundingBox)
506506
// *********************************************************************
507507
bool TrackerCSRTImpl::initImpl(const Mat& image_, const Rect2d& boundingBox)
508508
{
509-
cv::setNumThreads(getNumThreads());
510-
511509
//treat gray image as color image
512510
Mat image;
513511
if(image_.channels() == 1) {

modules/ximgproc/perf/perf_adaptive_manifold.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ PERF_TEST_P( AdaptiveManifoldPerfTest, perf,
2929
Mat src(sz, CV_MAKE_TYPE(depth, srcCnNum));
3030
Mat dst(sz, CV_MAKE_TYPE(depth, srcCnNum));
3131

32-
cv::setNumThreads(cv::getNumberOfCPUs());
33-
34-
declare.in(joint, src, WARMUP_RNG).out(dst).tbb_threads(cv::getNumberOfCPUs());
32+
declare.in(joint, src, WARMUP_RNG).out(dst);
3533

3634
double sigma_s = 16;
3735
double sigma_r = 0.5;

modules/ximgproc/perf/perf_bilateral_texture_filter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ PERF_TEST_P(BilateralTextureFilterTest, perf,
2929
Mat src(sz, CV_MAKE_TYPE(depth,srcCn));
3030
Mat dst(sz, src.type());
3131

32-
cv::setNumThreads(cv::getNumberOfCPUs());
33-
declare.in(src, WARMUP_RNG).out(dst).tbb_threads(cv::getNumberOfCPUs());
32+
declare.in(src, WARMUP_RNG).out(dst);
3433

3534
TEST_CYCLE_N(1)
3635
{

modules/ximgproc/perf/perf_disparity_wls_filter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ PERF_TEST_P( DisparityWLSFilterPerfTest, perf, Combine(GuideTypes::all(), SrcTyp
4141
ROI = Rect(ROI.x/2,ROI.y/2,ROI.width/2,ROI.height/2);
4242
}
4343

44-
cv::setNumThreads(cv::getNumberOfCPUs());
4544
TEST_CYCLE_N(10)
4645
{
4746
Ptr<DisparityWLSFilter> wls_filter = createDisparityWLSFilterGeneric(use_conf);

modules/ximgproc/perf/perf_domain_transform.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ PERF_TEST_P( DomainTransformTest, perf,
3434
Mat src(size, srcType);
3535
Mat dst(size, srcType);
3636

37-
declare.in(guide, src, WARMUP_RNG).out(dst).tbb_threads(cv::getNumberOfCPUs());
37+
declare.in(guide, src, WARMUP_RNG).out(dst);
3838

39-
cv::setNumThreads(cv::getNumberOfCPUs());
4039
TEST_CYCLE_N(5)
4140
{
4241
dtFilter(guide, src, dst, sigmaSpatial, sigmaColor, dtfType);

0 commit comments

Comments
 (0)