BUG: fixed test that made bad assumptions of GetGlobalDefaultNumberOf…

…Threads() GetGlobalDefaultNumberOfThreads() in fact can return less that you ask it to, because it's also clamped to the compile-time choice of ITK_DEFAULT_MAX_THREADS.
InsightSoftwareConsortium · Jan 27, 2025 · 74576b6 · 74576b6
1 parent fde014a
commit 74576b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Modules/Core/Common/test/itkDataObjectAndProcessObjectTest.cxx b/Modules/Core/Common/test/itkDataObjectAndProcessObjectTest.cxx
@@ -229,7 +229,7 @@ itkDataObjectAndProcessObjectTest(int, char *[])
 
   ITK_TEST_EXPECT_TRUE(itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads() <= process->GetNumberOfWorkUnits());
   process->SetNumberOfWorkUnits(11);
-  ITK_TEST_SET_GET_VALUE(11, process->GetNumberOfWorkUnits());
+  ITK_TEST_SET_GET_VALUE(11, process->GetNumberOfWorkUnits()); // same...
   process->SetNumberOfWorkUnits(0);
   ITK_TEST_SET_GET_VALUE(1, process->GetNumberOfWorkUnits());
   process->SetNumberOfWorkUnits(itk::NumericTraits<itk::ThreadIdType>::max());

diff --git a/Modules/Core/Common/test/itkMultiThreadingEnvironmentTest.cxx b/Modules/Core/Common/test/itkMultiThreadingEnvironmentTest.cxx
@@ -34,10 +34,12 @@ itkMultiThreadingEnvironmentTest(int argc, char * argv[])
   {
     return EXIT_FAILURE;
   }
-  if (itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads() != requiredValue)
+  const auto actualValue = itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads();
+  if ((actualValue != requiredValue) &&
+      (actualValue != ITK_MAX_THREADS))
   {
-    std::cout << "ERROR: Wrong number of maximum number of threads set from environment. " << requiredValue
-              << " != " << itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads() << std::endl;
+    std::cout << "ERROR: Wrong number of maximum number of threads set from environment. " << actualValue
+              << " != " << requiredValue << " or " << ITK_MAX_THREADS << std::endl;
     return EXIT_FAILURE;
   }
   return EXIT_SUCCESS;