Fix thread number unit test

ahnaf-tahmid-chowdhury · Jun 20, 2020 · 01e8df5 · 01e8df5
1 parent 78b9ac1
commit 01e8df5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,6 +71,7 @@ simulation-state/*
 */simulation-state*
 */simulation-state*/*
 pf_group_*_iter_*txt
+k_negative_sources_iter*
 
 *.data
 */*.data
@@ -179,8 +180,6 @@ sphinx/
 *.xml
 statepoint*
 summary*
-k_negative_sources_iter*
-pf_group_*_iter_*.txt
 
 # Test results error file
 results_error.dat

diff --git a/tests/unit_tests/test_options.py b/tests/unit_tests/test_options.py
@@ -14,7 +14,7 @@
 # keeps working.
 
 class TestDefaultInit(unittest.TestCase):
- 
+
  # creates a new Options() every test
  def setUp(self):
  self._default_options = openmoc.options.Options()
@@ -38,8 +38,12 @@ def test_default_tolerance(self):
  self.assertEqual(self._default_options._tolerance, .00001)
 
  def test_default_num_omp_threads(self):
+ try:
+ default_num_threads = int(os.environ["OMP_NUM_THREADS"])
+ except KeyError:
+ default_num_threads = multiprocessing.cpu_count()
  self.assertEqual(self._default_options._num_omp_threads,
- multiprocessing.cpu_count())
+ default_num_threads)
 
  def test_default_num_thread_blocks(self):
  self.assertEqual(self._default_options._num_thread_blocks, 64)
@@ -88,4 +92,4 @@ def test_custom_num_gpu_threads(self):
 suite = unittest.TestLoader().loadTestsFromTestCase(TestDefaultInit)
 suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCustomInit))
 
-unittest.TextTestRunner(verbosity=2).run(suite) 
+unittest.TextTestRunner(verbosity=2).run(suite)