From 953fcb0642eb4b607542b84156bc291839a3da7e Mon Sep 17 00:00:00 2001 From: Ivan Novoselov Date: Tue, 8 Nov 2022 17:50:58 +0100 Subject: [PATCH] Revert unintended changes to master --- src/inference/include/ie/ie_parallel.hpp | 20 +++++++++---------- .../skip_tests_config.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/inference/include/ie/ie_parallel.hpp b/src/inference/include/ie/ie_parallel.hpp index 88d84f096366ca..6199acce63d980 100644 --- a/src/inference/include/ie/ie_parallel.hpp +++ b/src/inference/include/ie/ie_parallel.hpp @@ -616,17 +616,17 @@ void parallel_for5d(const T0& D0, const T1& D1, const T2& D2, const T3& D3, cons int nthr = parallel_get_max_threads(); if (static_cast(nthr) > work_amount) nthr = static_cast(work_amount); -// if (nthr == 1) { + if (nthr == 1) { for_5d(0, 1, D0, D1, D2, D3, D4, func); -// } else { -// tbb::parallel_for( -// 0, -// nthr, -// [&](int ithr) { -// for_5d(ithr, nthr, D0, D1, D2, D3, D4, func); -// }, -// tbb::static_partitioner()); -// } + } else { + tbb::parallel_for( + 0, + nthr, + [&](int ithr) { + for_5d(ithr, nthr, D0, D1, D2, D3, D4, func); + }, + tbb::static_partitioner()); + } #elif IE_THREAD == IE_THREAD_TBB_AUTO const int nthr = parallel_get_max_threads(); tbb::parallel_for(0, nthr, [&](int ithr) { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 24b6874b875873..5ee7451c2ee9d8 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -163,7 +163,7 @@ std::vector disabledTestPatterns() { // tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp // is shared across plugins // passed local test and cpu has specific test cases with nms9 to cover - R"(smoke_NmsLayerTest.*)" + R"(smoke_NmsLayerTest.*)", }; #define FIX_62820 0