Skip to content

Commit

Permalink
Merge branch 'jgfouca/smp_present_is_gone' into master (PR #6216)
Browse files Browse the repository at this point in the history
SMP_PRESENT is gone, use BUILD_THREADED

A few more of these have slipped in.

[BFB]
  • Loading branch information
jgfouca committed Feb 6, 2024
2 parents 1e5c47f + 93120a4 commit 075645f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cime_config/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,7 @@
<env name="SKIP_BLAS">True</env> <!-- find_package(blas) doesn't work well with Cray LibSci-->
</environment_variables>

<environment_variables SMP_PRESENT="TRUE">
<environment_variables BUILD_THREADED="TRUE">
<env name="OMP_STACKSIZE">128M</env>
<env name="OMP_PROC_BIND">spread</env>
<env name="OMP_PLACES">threads</env>
Expand Down Expand Up @@ -2954,10 +2954,10 @@
</module_system>
<RUNDIR>/p/gpfs1/$USER/e3sm_scratch/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables SMP_PRESENT="FALSE">
<environment_variables BUILD_THREADED="FALSE">
<env name="JSRUN_THREAD_VARS"> </env>
</environment_variables>
<environment_variables SMP_PRESENT="TRUE">
<environment_variables BUILD_THREADED="TRUE">
<env name="JSRUN_THREAD_VARS">-E OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS} -E OMP_PROC_BIND=spread -E OMP_PLACES=threads -E OMP_STACKSIZE=256M</env>
</environment_variables>
<environment_variables compiler="gnugpu">
Expand Down

0 comments on commit 075645f

Please sign in to comment.