Skip to content

Commit b62b580

Browse files
[develop] Update spack-stack to version 1.9.2 (#1311)
* Externals.cfg - Update to weather model hash 93d51ae (July 17) and UFS_UTILS hash 069b11c (August 4) * All build modulefiles have been updated to use spack-stack 1.9.2 * The srw_common.lua modulefile has been updated for spack-stack 1.9.2 * The plot_allvars.local.lua, prepstart.local.lua, run_vx.local.lua, and smoke_dust.local.lua task modulefiles were updated for spack-stack 1.9.2 * tests/WE2E/utils.py was updated to throttle jobs in order for WE2E tests to run on Derecho following the maintenance * Added wgrib2/3.1.2 to modulefiles/srw_common.lua to allow the SRW App to build on NOAA Cloud platforms
1 parent 10a450d commit b62b580

45 files changed

Lines changed: 262 additions & 87 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Externals.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[ufs_utils]
22
protocol = git
3-
repo_url = https://github.com/NOAA-EPIC/UFS_UTILS
3+
repo_url = https://github.com/MichaelLueken/UFS_UTILS
44
# Specify either a branch name or a hash but not both.
55
#branch = release/srw-v3.0.0
6-
hash = 0efd4ee
6+
hash = 069b11c
77
local_path = sorc/UFS_UTILS
88
required = True
99

@@ -12,7 +12,7 @@ protocol = git
1212
repo_url = https://github.com/ufs-community/ufs-weather-model
1313
# Specify either a branch name or a hash but not both.
1414
#branch = develop
15-
hash = 1f0ab43
15+
hash = 93d51ae
1616
local_path = sorc/ufs-weather-model
1717
required = True
1818

modulefiles/build_derecho_intel.lua

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,23 @@ the CISL machine Derecho (Cray) using Intel@2021.10.0
66
whatis([===[Loads libraries needed for building the UFS SRW App on Derecho ]===])
77

88
prepend_path("MODULEPATH","/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
9-
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
9+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
10+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/cray-mpich/8.1.29-3sepg3g/gcc/12.4.0")
1011

11-
load(pathJoin("stack-intel", os.getenv("stack_intel_ver") or "2021.10.0"))
12-
load(pathJoin("stack-cray-mpich", os.getenv("stack_cray_mpich_ver") or "8.1.25"))
13-
load(pathJoin("cmake", os.getenv("cmake_ver") or "3.23.1"))
12+
load(pathJoin("stack-oneapi", os.getenv("stack_intel_ver") or "2024.2.1"))
13+
load(pathJoin("stack-cray-mpich", os.getenv("stack_cray_mpich_ver") or "8.1.29"))
14+
load(pathJoin("cmake", os.getenv("cmake_ver") or "3.27.9"))
1415

1516
load("srw_common")
1617

17-
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
18+
load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
1819
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
1920

21+
setenv("CC", "mpicc")
22+
setenv("CXX", "mpicxx")
23+
setenv("FC", "mpif90")
24+
setenv("I_MPI_CC", "icx")
25+
setenv("I_MPI_CXX", "icpx")
26+
setenv("I_MPI_F90", "ifort")
27+
2028
setenv("CMAKE_Platform","derecho.intel")

modulefiles/build_gaeac6_intel.lua

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,31 @@ the NOAA RDHPC machine Gaea C6 using Intel-2023.2.0
55

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

8-
prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
9-
stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
10-
load(pathJoin("stack-intel", stack_intel_ver))
8+
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
9+
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/cray-mpich/8.1.32-64uo344/gcc/12.3.0")
10+
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/modulefiles")
1111

12-
stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.29"
12+
stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
13+
load(pathJoin("stack-oneapi", stack_intel_ver))
14+
15+
stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.32"
1316
load(pathJoin("stack-cray-mpich", stack_mpich_ver))
1417

15-
stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
18+
stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
1619
load(pathJoin("stack-python", stack_python_ver))
1720

18-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
21+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
1922
load(pathJoin("cmake", cmake_ver))
2023

2124
load("srw_common")
25+
load("zlib/1.2.13")
2226

23-
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
27+
load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
2428
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
2529

30+
setenv("LD_PRELOAD", "/usr/lib64/libstdc++.so.6")
31+
2632
unload("darshan-runtime")
27-
unload("cray-libsci")
2833

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

modulefiles/build_hera_gnu.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ the NOAA RDHPC machine Hera using GNU 13.3.0
55

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

8+
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-gcc-13.3.0/install/modulefiles/Core")
89
prepend_path("MODULEPATH", "/contrib/spack-stack/installs/gnu/modulefiles")
910
prepend_path("MODULEPATH", "/contrib/spack-stack/installs/openmpi/modulefiles")
10-
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gnu-fms-2024.01/install/modulefiles/Core")
1111

1212
load("stack-gcc/13.3.0")
1313
load("stack-openmpi/4.1.6")
14-
load("stack-python/3.10.13")
15-
load("cmake/3.23.1")
14+
load("stack-python/3.11.7")
15+
load("cmake/3.27.9")
1616

1717
load("srw_common")
1818

1919
load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
20-
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
20+
load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
2121
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
2222
load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.24"))
2323

modulefiles/build_hera_intel.lua

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,37 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===])
88
prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
99
load("sutils")
1010

11-
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
11+
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
12+
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/intel-oneapi-mpi/2021.13-sbi3u54/gcc/13.3.0")
1213

13-
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
14-
load(pathJoin("stack-intel", stack_intel_ver))
14+
stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
15+
load(pathJoin("stack-oneapi", stack_intel_ver))
1516

16-
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
17+
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
1718
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
1819

19-
stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
20+
stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
2021
load(pathJoin("stack-python", stack_python_ver))
2122

22-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
23+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
2324
load(pathJoin("cmake", cmake_ver))
2425

2526
load("srw_common")
27+
load("zlib/1.2.11")
2628

2729
load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
28-
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
30+
load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
2931
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
3032

33+
setenv("LD_PRELOAD", "/contrib/spack-stack/installs/gnu/13.3.0/lib64/libstdc++.so.6")
34+
3135
setenv("FC", "mpiifort")
3236

33-
setenv("CMAKE_C_COMPILER","mpiicc")
34-
setenv("CMAKE_CXX_COMPILER","mpiicpc")
37+
setenv("CMAKE_C_COMPILER","mpiicx")
38+
setenv("CMAKE_CXX_COMPILER","mpiicpx")
3539
setenv("CMAKE_Fortran_COMPILER","mpiifort")
40+
setenv("I_MPI_CC", "icx")
41+
setenv("I_MPI_CXX", "icpx")
42+
setenv("I_MPI_F90", "ifort")
43+
3644
setenv("CMAKE_Platform","hera.intel")

modulefiles/build_hercules_intel.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ the MSU machine Hercules using intel-oneapi-compilers/2022.2.1
55

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

8-
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
8+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
9+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/intel-oneapi-mpi/2021.13-sqiixt7/gcc/13.3.0")
910

10-
load("stack-intel/2021.9.0")
11-
load("stack-intel-oneapi-mpi/2021.9.0")
12-
load("stack-python/3.10.13")
13-
load("cmake/3.23.1")
11+
load("stack-oneapi/2024.2.1")
12+
load("stack-intel-oneapi-mpi/2021.13")
13+
load("stack-python/3.11.7")
14+
load("cmake/3.27.9")
1415

1516
load("srw_common")
17+
load("zlib/1.2.13")
1618

1719
load("nccmp/1.9.0.1")
18-
load("nco/5.0.6")
20+
load("nco/5.2.4")
1921
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
2022

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

modulefiles/build_noaacloud_intel.lua

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,32 @@ the NOAA cloud using Intel-oneapi
55

66
whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===])
77

8-
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
8+
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
9+
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/intel-oneapi-mpi/2021.13-mg3hegm/gcc/13.2.0") -- path for NOAA AWS
10+
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/intel-oneapi-mpi/2021.13-fosayin/gcc/13.2.0") -- path for NOAA GCP
11+
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/intel-oneapi-mpi/2021.13-u7pshji/gcc/13.2.0") -- path for NOAA Azure
912
prepend_path("MODULEPATH", "/apps/modules/modulefiles")
1013

11-
gnu_ver=os.getenv("gnu_ver") or ""
14+
gnu_ver=os.getenv("gnu_ver") or "14.2.0"
1215
load(pathJoin("gnu", gnu_ver))
1316

14-
stack_intel_ver=os.getenv("stack_intel_ver") or ""
15-
load(pathJoin("stack-intel", stack_intel_ver))
17+
stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
18+
load(pathJoin("stack-oneapi", stack_intel_ver))
1619

17-
stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or ""
18-
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
20+
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
21+
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
1922

20-
gnu_ver=os.getenv("gnu_ver") or ""
23+
gnu_ver=os.getenv("gnu_ver") or "14.2.0"
2124
unload(pathJoin("gnu", gnu_ver))
2225

23-
load("cmake/3.23.1")
26+
load("cmake/3.27.9")
2427

2528
load("srw_common")
29+
load("zlib/1.2.11")
2630

27-
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
31+
load(pathJoin("nco", os.getenv("nco_ver") or "5.2.4"))
2832
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
2933

30-
setenv("CC", "mpiicc")
31-
setenv("CXX", "mpiicpc")
34+
setenv("CC", "mpiicx")
35+
setenv("CXX", "mpiicpx")
3236
setenv("FC", "mpiifort")

modulefiles/build_orion_intel.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ the MSU machine Orion using intel-oneapi-compilers/2021.9.0
55

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

8-
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
8+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
9+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/intel-oneapi-mpi/2021.13-li242lf/gcc/12.2.0")
910

10-
load("stack-intel/2021.9.0")
11-
load("stack-intel-oneapi-mpi/2021.9.0")
12-
load("stack-python/3.10.13")
13-
load("cmake/3.23.1")
11+
load("stack-oneapi/2024.2.1")
12+
load("stack-intel-oneapi-mpi/2021.13")
13+
load("stack-python/3.11.7")
14+
load("cmake/3.27.9")
1415

1516
load("srw_common")
17+
load("zlib/1.2.13")
1618

1719
load("nccmp/1.9.0.1")
18-
load("nco/5.0.6")
20+
load("nco/5.2.4")
1921
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
2022

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

modulefiles/srw_common.lua

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
load("jasper/2.0.32")
2-
load("zlib/1.2.13")
32
load("libpng/1.6.37")
43

54
load("netcdf-c/4.9.2")
65
load("netcdf-fortran/4.6.1")
7-
load("parallelio/2.5.10")
8-
load("esmf/8.6.0")
9-
load("fms/2024.01")
6+
load("parallelio/2.6.2")
7+
load("esmf/8.8.0")
8+
load("fms/2024.02")
109

1110
load("bacio/2.4.1")
1211
load("crtm/2.4.0.1")
1312
load("g2/3.5.1")
1413
load("g2tmpl/1.13.0")
15-
load("ip/4.3.0")
14+
load("ip/5.1.0")
1615
load("sp/2.5.0")
1716
load("w3emc/2.10.0")
1817

19-
load("gftl-shared/1.6.1")
20-
load("mapl/2.40.3-esmf-8.6.0")
18+
load("gftl-shared/1.9.0")
19+
load("mapl/2.53.4-esmf-8.8.0")
2120

2221
load("nemsio/2.5.4")
23-
load("sfcio/1.4.1")
24-
load("sigio/2.3.2")
22+
load("sfcio/1.4.2")
23+
load("sigio/2.3.3")
2524
load("w3nco/2.4.1")
2625
load("wrf-io/1.2.0")
2726

28-
load_any("wgrib2/2.0.8","wgrib2/3.1.1")
27+
load_any("wgrib2/2.0.8","wgrib2/3.1.1","wgrib2/3.1.2")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
load("nco/5.1.9")
1+
load("nco/5.2.4")
22
load("python_srw_aqm")

0 commit comments

Comments
 (0)