Comment out problematic OMP environment variables on PM

E3SM-Project · Jul 18, 2023 · a4d7dac · a4d7dac
1 parent e1dbffc
commit a4d7dac
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/mache/spack/pm-cpu_gnu_mpich.csh b/mache/spack/pm-cpu_gnu_mpich.csh
@@ -41,9 +41,11 @@ setenv PNETCDF_PATH $CRAY_PARALLEL_NETCDF_PREFIX
 {% endif %}
 setenv MPICH_ENV_DISPLAY 1
 setenv MPICH_VERSION_DISPLAY 1
-setenv OMP_STACKSIZE 128M
-setenv OMP_PROC_BIND spread
-setenv OMP_PLACES threads
+## purposefully omitting OMP variables that cause trouble in ESMF
+# setenv OMP_STACKSIZE 128M
+# setenv OMP_PROC_BIND spread
+# setenv OMP_PLACES threads
 setenv HDF5_USE_FILE_LOCKING FALSE
-setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
+## Not needed
+# setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 setenv FI_CXI_RX_MATCH_MODE software
diff --git a/mache/spack/pm-cpu_gnu_mpich.sh b/mache/spack/pm-cpu_gnu_mpich.sh
@@ -41,11 +41,13 @@ export PNETCDF_PATH=$CRAY_PARALLEL_NETCDF_PREFIX
 {% endif %}
 export MPICH_ENV_DISPLAY=1
 export MPICH_VERSION_DISPLAY=1
-export OMP_STACKSIZE=128M
-export OMP_PROC_BIND=spread
-export OMP_PLACES=threads
+## purposefully omitting OMP variables that cause trouble in ESMF
+# export OMP_STACKSIZE=128M
+# export OMP_PROC_BIND=spread
+# export OMP_PLACES=threads
 export HDF5_USE_FILE_LOCKING=FALSE
-export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
+## Not needed
+# export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 export FI_CXI_RX_MATCH_MODE=software
 
 if [ -z "${NERSC_HOST:-}" ]; then

diff --git a/mache/spack/pm-cpu_intel_mpich.csh b/mache/spack/pm-cpu_intel_mpich.csh
@@ -38,9 +38,11 @@ setenv PNETCDF_PATH $CRAY_PARALLEL_NETCDF_PREFIX
 {% endif %}
 setenv MPICH_ENV_DISPLAY 1
 setenv MPICH_VERSION_DISPLAY 1
-setenv OMP_STACKSIZE 128M
-setenv OMP_PROC_BIND spread
-setenv OMP_PLACES threads
+## purposefully omitting OMP variables that cause trouble in ESMF
+# setenv OMP_STACKSIZE 128M
+# setenv OMP_PROC_BIND spread
+# setenv OMP_PLACES threads
 setenv HDF5_USE_FILE_LOCKING FALSE
-setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
+## Not needed
+# setenv PERL5LIB /global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 setenv FI_CXI_RX_MATCH_MODE software
diff --git a/mache/spack/pm-cpu_intel_mpich.sh b/mache/spack/pm-cpu_intel_mpich.sh
@@ -38,11 +38,13 @@ export PNETCDF_PATH=$CRAY_PARALLEL_NETCDF_PREFIX
 {% endif %}
 export MPICH_ENV_DISPLAY=1
 export MPICH_VERSION_DISPLAY=1
-export OMP_STACKSIZE=128M
-export OMP_PROC_BIND=spread
-export OMP_PLACES=threads
+## purposefully omitting OMP variables that cause trouble in ESMF
+# export OMP_STACKSIZE=128M
+# export OMP_PROC_BIND=spread
+# export OMP_PLACES=threads
 export HDF5_USE_FILE_LOCKING=FALSE
-export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
+## Not needed
+# export PERL5LIB=/global/cfs/cdirs/e3sm/perl/lib/perl5-only-switch
 export FI_CXI_RX_MATCH_MODE=software
 
 if [ -z "${NERSC_HOST:-}" ]; then