From 06e5f7c6ec9dad3058a337a898d09243dcf82e00 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Mon, 23 Jun 2025 07:23:18 +0200 Subject: [PATCH 1/3] test: cover GetNumThreads default --- modules/core/util/tests/util.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/core/util/tests/util.cpp b/modules/core/util/tests/util.cpp index 04efbc289..af43845ac 100644 --- a/modules/core/util/tests/util.cpp +++ b/modules/core/util/tests/util.cpp @@ -2,6 +2,7 @@ #include +#include #include #include "omp.h" @@ -15,15 +16,14 @@ TEST(util_tests, extracts_correct_namespace) { EXPECT_EQ(kNs, "my::nested"); } -TEST(util_tests, threads_control_check_openmp_disabled_valgrind) { - int ppc_num_threads = ppc::util::GetNumThreads(); +TEST(util_tests, GetNumThreadsEnvUnsetReturn) { + const auto num_threads_env_var = env::get("PPC_NUM_THREADS"); - int omp_num_threads = -1; -#pragma omp parallel default(none) shared(omp_num_threads) num_threads(ppc::util::GetNumThreads()) - omp_num_threads = omp_get_num_threads(); - - // Check Result - ASSERT_EQ(ppc_num_threads, omp_num_threads); + if (num_threads_env_var.has_value()) { + EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_num_threads()); + } else { + GTEST_SKIP() << "PPC_NUM_THREADS environment variable is set, skipping test"; + } } namespace test_ns { From 2e74ff5010f49e59dcc288cdb28bbd9665886fda Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Mon, 23 Jun 2025 09:59:26 +0200 Subject: [PATCH 2/3] fix --- modules/core/util/tests/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/util/tests/util.cpp b/modules/core/util/tests/util.cpp index af43845ac..d8c3e2afe 100644 --- a/modules/core/util/tests/util.cpp +++ b/modules/core/util/tests/util.cpp @@ -20,7 +20,7 @@ TEST(util_tests, GetNumThreadsEnvUnsetReturn) { const auto num_threads_env_var = env::get("PPC_NUM_THREADS"); if (num_threads_env_var.has_value()) { - EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_num_threads()); + EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_max_threads()); } else { GTEST_SKIP() << "PPC_NUM_THREADS environment variable is set, skipping test"; } From 9940b300d73f61e6a67069492d79a4a0b2751ed1 Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Mon, 23 Jun 2025 13:58:02 +0200 Subject: [PATCH 3/3] Fix --- modules/core/util/tests/util.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/core/util/tests/util.cpp b/modules/core/util/tests/util.cpp index d8c3e2afe..56a0c5da3 100644 --- a/modules/core/util/tests/util.cpp +++ b/modules/core/util/tests/util.cpp @@ -16,14 +16,10 @@ TEST(util_tests, extracts_correct_namespace) { EXPECT_EQ(kNs, "my::nested"); } -TEST(util_tests, GetNumThreadsEnvUnsetReturn) { +TEST(util_tests, threads_control_check_openmp_disabled_valgrind) { const auto num_threads_env_var = env::get("PPC_NUM_THREADS"); - if (num_threads_env_var.has_value()) { - EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_max_threads()); - } else { - GTEST_SKIP() << "PPC_NUM_THREADS environment variable is set, skipping test"; - } + EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_max_threads()); } namespace test_ns {