[RELEASE] Fixes for gaea, noaacloud, and miniconda updates (#444)

* Update build_cheyenne_gnu.lua remove loading of system python3 * Update build_cheyenne_intel.lua remove loading system python module * Update wflow_cheyenne.lua Load updated miniconda3 and ask to activate regional_workflow enviroment * Update wflow_hera.lua Load an updated miniconda3 and ask to activate regional_workflow environment * Update wflow_jet.lua Update miniconda3 module location and ask to activate regional_workflow * Update wflow_orion.lua Update miniconda3/4.12.0 module location and ask to activate regional_workflow environment * Update load_modules_run_task.sh Run an additional cycle of "conda deactivate" and "conda activate regional_workflow". It ensures that _python3_ binary path from the *regional_workflow* environment becomes prepended to the search $PATH, and is found first, before the _python3_ from miniconda3/4.12.0 from the *base* environment. * Update wflow_cheyenne.lua "conda activate regional_workfow" * Update and rename conda_regional_workflow.lua to miniconda_regional_workflow.lua use new miniconda3/4.12.0 with regional_workflow environment * Update make_grid.local.lua * Update get_extrn_ics.local.lua * Update get_extrn_lbcs.local.lua * Update make_ics.local.lua * Update make_lbcs.local.lua * Update and rename make_orog.hardcoded.lua to make_orog.local.lua * Update run_fcst.local.lua * Update run_vx.local.lua * Create make_sfc_climo.local.lua * Update miniconda_regional_workflow.lua * Update get_obs.local.lua all the requested packages for the python3 are found in regional_workflow environment * Update miniconda_regional_workflow.lua load updated miniconda3/4.12.0 with regional_workflow environment * Update miniconda_regional_workflow.lua Load an updated miniconda3/4.12.0 with the regional_workflow environment * Enable SCHED_NATIVE_CMD on all systems. * Update build_cheyenne_gnu.lua need to have miniconda3 loaded in build module * Update build_cheyenne_intel.lua need to have miniconda3 loaded in the build module * Update build_gaea_intel.lua need to have miniconda3 loaded in build module * Update build_hera_intel.lua need to have miniconda3 loaded in build module * Update build_jet_intel.lua need to have miniconda3 loaded in the build modulefile * Update build_orion_intel.lua need to have miniconda3 loaded in build modulefile * Update load_modules_wflow.sh conda activate command same across the platforms * Don't export variables for those that use SLURM. * Add some missing task specific modulefiles. * Update miniconda_regional_workflow.lua miniconda3 is now loaded in build_<system>_<compiler>, not in *.local files * Update miniconda_regional_workflow.lua miniconda3 is now loaded in build_<system>_<compiler>, not in *.local files * Update miniconda_regional_workflow.lua miniconda3 is now loaded in build_<system>_<compiler>, not in *.local files * Update miniconda_regional_workflow.lua miniconda3 is now loaded in build_<system>_<compiler>, not in *.local files * Update miniconda_regional_workflow.lua * fixes for noaacloud that work with Daniels pr * removed extra lines * removed commented lines * Removed set -x and some commented lines * put module list back in * removed ldd * removed miniconda from build*.lua files * returned conda load to local files * returned python to cheyenne * unload python module before setting up miniconda * added unload python to miniconda_regional_workflow.lua file * added local files for orion Co-authored-by: Natalie Perlin <[email protected]> Co-authored-by: Daniel Abdi <[email protected]> Co-authored-by: Mark Potts <[email protected]>
ufs-community · Nov 1, 2022 · 2217d1c · 2217d1c
1 parent 6033ba6
commit 2217d1c
Show file tree

Hide file tree

Showing 31 changed files with 80 additions and 58 deletions.
diff --git a/modulefiles/build_cheyenne_gnu.lua b/modulefiles/build_cheyenne_gnu.lua
@@ -6,10 +6,10 @@ the CISL machine Cheyenne using GNU
 whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===])
 
 load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0"))
-load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
 load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3"))
 load(pathJoin("gnu", os.getenv("gnu_ver") or "11.2.0"))
 load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25"))
+load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
 setenv("MKLROOT", "/glade/u/apps/opt/intel/2022.1/mkl/latest")
 load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0"))
 unload("netcdf")

diff --git a/modulefiles/build_cheyenne_intel.lua b/modulefiles/build_cheyenne_intel.lua
@@ -6,11 +6,11 @@ the CISL machine Cheyenne using Intel-2022.1
 whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===])
 
 load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0"))
-load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
 load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3"))
 load(pathJoin("intel", os.getenv("intel_ver") or "2022.1"))
 load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25"))
 load(pathJoin("mkl", os.getenv("mkl_ver") or "2022.1"))
+load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
 load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0"))
 unload("netcdf")
 

diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua
@@ -5,14 +5,12 @@ the NOAA cloud using Intel-oneapi
 
 whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===])
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/apps/srw-app-test/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/envs/srw-develop-intel/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/modules/modulefiles")
+load("intel/2021.3.0")
+load("impi/2021.3.0")
 load("stack-intel")
 load("stack-intel-oneapi-mpi")
 load("cmake/3.22.1") 
 
-load("srw_common")
-load("esmf/8.2.0")
-load("netcdf-c")
-load("netcdf-fortran")
-load("libpng")
-load("jasper")
+load("srw_common_spack")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -9,7 +9,6 @@ load("contrib")
 load("noaatools")
 
 load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.1"))
-load(pathJoin("python", os.getenv("python_ver") or "3.9.2"))
 
 prepend_path("MODULEPATH","/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
 load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))

diff --git a/modulefiles/srw_common_spack.lua b/modulefiles/srw_common_spack.lua
@@ -0,0 +1,30 @@
+load("jasper/2.0.25")
+load("zlib/1.2.11")
+load("libpng/1.6.37")
+load("netcdf-c/4.7.4")
+load("netcdf-fortran/4.5.4")
+load("pio/2.5.3")
+load("esmf/8.3.0b09")
+load("fms/2022.01")
+
+load("bufr/11.7.0")
+load("bacio/2.4.1")
+load("crtm/2.3.0")
+load("g2/3.4.5")
+load("g2tmpl/1.10.0")
+load("ip/3.3.3")
+load("sp/2.3.3")
+load("w3emc/2.9.2")
+
+load("gftl-shared/1.5.0")
+load("yafyaml/0.5.1")
+load("mapl/2.22.0-esmf-8.3.0b09-esmf-8.3.0")
+
+load("nemsio/2.5.4")
+load("sfcio/1.4.1")
+load("sigio/2.3.2")
+load("w3nco/2.4.1")
+load("wrf_io/1.2.0")
+
+load("ncio/1.1.2")
+load("wgrib2/2.0.8")
diff --git a/modulefiles/tasks/cheyenne/conda_regional_workflow.lua b/modulefiles/tasks/cheyenne/conda_regional_workflow.lua
diff --git a/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua b/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua b/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/make_grid.local.lua b/modulefiles/tasks/cheyenne/make_grid.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/make_ics.local.lua b/modulefiles/tasks/cheyenne/make_ics.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/make_lbcs.local.lua b/modulefiles/tasks/cheyenne/make_lbcs.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/make_orog.hardcoded.lua b/modulefiles/tasks/cheyenne/make_orog.hardcoded.lua
diff --git a/modulefiles/tasks/cheyenne/make_orog.local.lua b/modulefiles/tasks/cheyenne/make_orog.local.lua
@@ -0,0 +1 @@
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua b/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua b/modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua
@@ -0,0 +1,5 @@
+unload("python")
+prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
+
+setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/run_fcst.local.lua b/modulefiles/tasks/cheyenne/run_fcst.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua
@@ -1 +1 @@
-load("conda_regional_workflow")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/gaea/miniconda_regional_workflow.lua b/modulefiles/tasks/gaea/miniconda_regional_workflow.lua
@@ -1,4 +1,4 @@
-prepend_path("MODULEPATH", "/lustre/f2/dev/role.epic/contrib/modulefiles")
+prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/modulefiles")
 load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/tasks/hera/get_obs.local.lua b/modulefiles/tasks/hera/get_obs.local.lua
@@ -1,5 +1,2 @@
 load("hpss")
-prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12")
-
-setenv("SRW_ENV", "pygraf")
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow.lua b/modulefiles/tasks/hera/miniconda_regional_workflow.lua
@@ -1,4 +1,4 @@
-prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
+prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/tasks/jet/miniconda_regional_workflow.lua b/modulefiles/tasks/jet/miniconda_regional_workflow.lua
@@ -1,4 +1,4 @@
-prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
+prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua b/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua
@@ -1,4 +1 @@
-prepend_path("MODULEPATH", "/contrib/GST/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3"))
-
-setenv("SRW_ENV", "regional_workflow")
+prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
diff --git a/modulefiles/tasks/orion/make_orog.local.lua b/modulefiles/tasks/orion/make_orog.local.lua
@@ -0,0 +1 @@
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/orion/make_sfc_climo.local.lua b/modulefiles/tasks/orion/make_sfc_climo.local.lua
@@ -0,0 +1 @@
+load("miniconda_regional_workflow")
diff --git a/modulefiles/tasks/orion/miniconda_regional_workflow.lua b/modulefiles/tasks/orion/miniconda_regional_workflow.lua
@@ -1,4 +1,4 @@
-append_path("MODULEPATH", "/apps/contrib/miniconda3-noaa-gsl/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "3.8"))
+append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/wflow_cheyenne.lua b/modulefiles/wflow_cheyenne.lua
@@ -10,11 +10,13 @@ load("ncarenv")
 append_path("MODULEPATH","/glade/p/ral/jntp/UFS_SRW_app/modules")
 load("rocoto")
 
-load(pathJoin("conda", os.getenv("conda_ver") or "latest"))
+unload("python")
+prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:
-       > conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
+       > conda activate regional_workflow
 ]===])
 end
 
diff --git a/modulefiles/wflow_hera.lua b/modulefiles/wflow_hera.lua
@@ -7,8 +7,8 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Hera ]===])
 
 load("rocoto")
 
-prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
+prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

diff --git a/modulefiles/wflow_jet.lua b/modulefiles/wflow_jet.lua
@@ -7,8 +7,8 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Jet ]===])
 
 load("rocoto")
 
-prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
+prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

diff --git a/modulefiles/wflow_noaacloud.lua b/modulefiles/wflow_noaacloud.lua
@@ -8,12 +8,12 @@ whatis([===[Loads libraries needed for running the UFS SRW App on NOAA cloud ]==
 prepend_path("MODULEPATH","/apps/modules/modulefiles")
 load("rocoto")
 
-prepend_path("MODULEPATH","/contrib/GST/miniconda3/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3"))
+prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
-setenv("PROJ_LIB","/contrib/GST/miniconda/envs/regional_workflow/share/proj")
+setenv("PROJ_LIB","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/share/proj")
 setenv("OPT","/contrib/EPIC/hpc-modules")
-append_path("PATH","/contrib/GST/miniconda/envs/regional_workflow/bin")
+append_path("PATH","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

diff --git a/modulefiles/wflow_orion.lua b/modulefiles/wflow_orion.lua
@@ -8,8 +8,8 @@ whatis([===[Loads libraries needed for running SRW on Orion ]===])
 load("contrib")
 load("rocoto")
 
-append_path("MODULEPATH","/apps/contrib/miniconda3-noaa-gsl/modulefiles")
-load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "3.8"))
+append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

diff --git a/ush/load_modules_wflow.sh b/ush/load_modules_wflow.sh
@@ -60,13 +60,11 @@ task failed:
 [[ ${SHELLOPTS} =~ nounset ]] && has_mu=true || has_mu=false
 
 $has_mu && set +u
-if [[ "${machine}" == 'cheyenne' ]]; then
-    conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
-else
-    if [ ! -z $(command -v conda) ]; then
-        conda activate regional_workflow
-    fi
+
+if [ ! -z $(command -v conda) ]; then
+    conda activate regional_workflow
 fi
+
 $has_mu && set -u
 
 # List loaded modulefiles