Skip to content

Commit

Permalink
[develop] Upgrade SRW to spack-stack 1.6.0 from 1.5.1 (ufs-community#…
Browse files Browse the repository at this point in the history
…1093)

Since the ufs-weather-model was upgraded to spack-stack 1.6.0, the SRW App has been upgraded as well.

---------

Co-authored-by: EdwardSnyder-NOAA <Edward.Snyder@noaa.gov>
  • Loading branch information
RatkoVasic-NOAA and EdwardSnyder-NOAA authored Jun 21, 2024
1 parent dbfed17 commit 94dc192
Show file tree
Hide file tree
Showing 15 changed files with 65 additions and 60 deletions.
6 changes: 3 additions & 3 deletions modulefiles/build_derecho_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ the CISL machine Derecho (Cray) using Intel@2021.10.0
whatis([===[Loads libraries needed for building the UFS SRW App on Derecho ]===])

prepend_path("MODULEPATH","/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("stack_intel_ver") or "2021.10.0"))
load(pathJoin("stack-cray-mpich", os.getenv("stack_cray_mpich_ver") or "8.1.25"))
load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3"))
load(pathJoin("cmake", os.getenv("cmake_ver") or "3.23.1"))

load("srw_common")

load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))

setenv("CMAKE_Platform","derecho.intel")

4 changes: 2 additions & 2 deletions modulefiles/build_gaea_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0

whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===])

prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.25"
load(pathJoin("stack-cray-mpich", stack_mpich_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
load(pathJoin("stack-python", stack_python_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
Expand Down
23 changes: 14 additions & 9 deletions modulefiles/build_hera_gnu.lua
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
help([[
This module loads libraries for building the UFS SRW App on
the NOAA RDHPC machine Hera using GNU 9.2.0
the NOAA RDHPC machine Hera using GNU 13.3.0
]])

whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===])
whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 13.3.0 ]===])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/ufs-wm-srw-rocky8/install/modulefiles/Core")

load("stack-gcc/9.2.0")
load("stack-openmpi/4.1.5")
load("stack-python/3.10.8")
load("stack-gcc/13.3.0")
load("stack-openmpi/4.1.6")
load("stack-python/3.10.13")
load("cmake/3.23.1")

load("srw_common")

load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.19"))
load(pathJoin("nco", os.getenv("nco_ver") or "5.1.6"))
load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.24"))

prepend_path("CPPFLAGS", " -I/apps/slurm_hera/23.11.3/include/slurm"," ")
prepend_path("LD_LIBRARY_PATH", "/apps/slurm_hera/23.11.3/lib")
setenv("LD_PRELOAD", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/13.3.0/lib64/libstdc++.so.6")

setenv("CC", "mpicc")
setenv("CXX", "mpic++")
Expand Down
7 changes: 3 additions & 4 deletions modulefiles/build_hera_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===])
prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
load("sutils")

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
load(pathJoin("stack-python", stack_python_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
Expand All @@ -27,7 +26,7 @@ load("srw_common")

load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))

setenv("CMAKE_C_COMPILER","mpiicc")
setenv("CMAKE_CXX_COMPILER","mpiicpc")
Expand Down
9 changes: 4 additions & 5 deletions modulefiles/build_hercules_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ the MSU machine Hercules using intel-oneapi-compilers/2022.2.1

whatis([===[Loads libraries needed for building the UFS SRW App on Hercules ]===])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")

load("stack-intel/2021.9.0")
load("stack-intel-oneapi-mpi/2021.9.0")
load("stack-python/3.10.8")
load("cmake/3.26.3")
load("stack-python/3.10.13")
load("cmake/3.23.1")

load("srw_common")

load("nccmp/1.9.0.1")
load("nco/5.0.6")
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))

setenv("CFLAGS","-diag-disable=10441")
setenv("FFLAGS","-diag-disable=10441")
Expand Down
5 changes: 2 additions & 3 deletions modulefiles/build_jet_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ the NOAA RDHPC machine Jet using Intel-2021.5.0

whatis([===[Loads libraries needed for building the UFS SRW App on Jet ]===])

prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles")
prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")

load("stack-intel/2021.5.0")
load("stack-intel-oneapi-mpi/2021.5.1")
load("stack-python/3.10.8")
load("stack-python/3.10.13")
load("cmake/3.23.1")

load("srw_common")
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build_noaacloud_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/modules/modulefiles")
prepend_path("PATH", "/contrib/EPIC/bin")
load("stack-intel")
Expand Down
19 changes: 10 additions & 9 deletions modulefiles/build_orion_intel.lua
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
help([[
This module loads libraries for building the UFS SRW App on
the MSU machine Orion using Intel-2022.1.2
the MSU machine Orion using intel-oneapi-compilers/2021.9.0
]])

whatis([===[Loads libraries needed for building the UFS SRW App on Orion ]===])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")

load("stack-intel/2022.0.2")
load("stack-intel-oneapi-mpi/2021.5.1")
load("stack-python/3.10.8")
load("cmake/3.22.1")
load("stack-intel/2021.9.0")
load("stack-intel-oneapi-mpi/2021.9.0")
load("stack-python/3.10.13")
load("cmake/3.23.1")

load("srw_common")

load("nccmp/1.9.0.1")
load("nco/5.0.6")
load("wget")
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))

setenv("CFLAGS","-diag-disable=10441")
setenv("FFLAGS","-diag-disable=10441")

setenv("CMAKE_C_COMPILER","mpiicc")
setenv("CMAKE_CXX_COMPILER","mpiicpc")
Expand Down
12 changes: 6 additions & 6 deletions modulefiles/srw_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ load("zlib/1.2.13")
load("libpng/1.6.37")

load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.0")
load("netcdf-fortran/4.6.1")
load("parallelio/2.5.10")
load("esmf/8.5.0")
load("fms/2023.02.01")
load("esmf/8.6.0")
load("fms/2023.04")

load("bacio/2.4.1")
load("crtm/2.4.0")
load("crtm/2.4.0.1")
load("g2/3.4.5")
load("g2tmpl/1.10.2")
load("ip/4.3.0")
load("sp/2.3.3")
load("sp/2.5.0")
load("w3emc/2.10.0")

load("gftl-shared/1.6.1")
load("mapl/2.40.3-esmf-8.5.0")
load("mapl/2.40.3-esmf-8.6.0")

load("nemsio/2.5.4")
load("sfcio/1.4.1")
Expand Down
7 changes: 2 additions & 5 deletions modulefiles/tasks/noaacloud/plot_allvars.local.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
unload("python")
append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

setenv("SRW_ENV", "regional_workflow")
load("conda")
setenv("SRW_ENV", "srw_graphics")
5 changes: 5 additions & 0 deletions modulefiles/tasks/noaacloud/python_srw.lua
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
load("conda")
setenv("SRW_ENV", "srw_app")

-- Add missing libstdc binary for Azure
if os.getenv("PW_CSP") == "azure" then
setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
end
5 changes: 5 additions & 0 deletions modulefiles/tasks/noaacloud/run_vx.local.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ end
load("ufs-pyenv")
load("conda")
setenv("SRW_ENV", "srw_app")

-- Add missing libstdc binary for Azure
if os.getenv("PW_CSP") == "azure" then
setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
end
6 changes: 1 addition & 5 deletions modulefiles/tasks/orion/run_vx.local.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
--[[
Compiler-specific modules are used for met and metplus libraries
--]]
--load("build_orion_intel")

local met_ver = (os.getenv("met_ver") or "11.1.0")
local metplus_ver = (os.getenv("metplus_ver") or "5.1.0")
if (mode() == "load") then
Expand All @@ -20,12 +18,10 @@ setenv("METPLUS_VERSION", metplus_ver)
setenv("METPLUS_ROOT", base_metplus)
setenv("METPLUS_PATH", base_metplus)


if (mode() == "unload") then
unload(pathJoin("met", met_ver))
unload(pathJoin("metplus",metplus_ver))
end
--load("ufs-pyenv")
load("stack-python/3.10.8")
load("ufs-pyenv")
load("conda")
setenv("SRW_ENV", "srw_app")
10 changes: 5 additions & 5 deletions modulefiles/wflow_noaacloud.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ whatis([===[Loads libraries needed for running the UFS SRW App on NOAA cloud ]==
prepend_path("MODULEPATH","/apps/modules/modulefiles")
load("rocoto")



load("conda")

setenv("PROJ_LIB","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/share/proj")
setenv("OPT","/contrib/EPIC/hpc-modules")
append_path("PATH","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
prepend_path("PATH","/contrib/EPIC/bin")

-- Add missing libstdc binary for Azure
if os.getenv("PW_CSP") == "azure" then
setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
end

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
> conda activate srw_app
Expand Down
5 changes: 2 additions & 3 deletions modulefiles/wflow_orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ the MSU machine Orion
whatis([===[Loads libraries needed for running SRW on Orion ]===])

load("contrib")
load("rocoto")
load("wget")

load("ruby/3.2.3")
load("rocoto/1.3.7")

unload("python")
load("conda")
Expand Down

0 comments on commit 94dc192

Please sign in to comment.