Unset OMP_NUM_THREADS in MPI-only runs

rfiorella · Apr 25, 2019 · 26795a1 · 26795a1
1 parent f184078
commit 26795a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/scripts/lib/CIME/case/case.py b/scripts/lib/CIME/case/case.py
@@ -179,6 +179,8 @@ def initialize_derived_attributes(self):
 
         if self.get_build_threaded():
             os.environ["OMP_NUM_THREADS"] = str(self.thread_count)
+        elif "OMP_NUM_THREADS" in os.environ:
+            del os.environ["OMP_NUM_THREADS"]
 
         self.srun_binding = smt_factor*max_mpitasks_per_node / self.tasks_per_node
 
@@ -1414,6 +1416,8 @@ def load_env(self, reset=False, job=None, verbose=False):
                 job = self.get_primary_job()
             if self.get_build_threaded():
                 os.environ["OMP_NUM_THREADS"] = str(self.thread_count)
+            elif "OMP_NUM_THREADS" in os.environ:
+                del os.environ["OMP_NUM_THREADS"]
             env_module = self.get_env("mach_specific")
             env_module.load_env(self, job=job, verbose=verbose)
             self._is_env_loaded = True

diff --git a/scripts/lib/CIME/case/case_run.py b/scripts/lib/CIME/case/case_run.py
@@ -78,6 +78,8 @@ def _run_model_impl(case, lid, skip_pnl=False, da_cycle=0):
     # Set OMP_NUM_THREADS
     if case.get_build_threaded():
         os.environ["OMP_NUM_THREADS"] = str(case.thread_count)
+    elif "OMP_NUM_THREADS" in os.environ:
+        del os.environ["OMP_NUM_THREADS"]
 
     # Run the model
     cmd = case.get_mpirun_cmd(allow_unresolved_envvars=False)