Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to spack-stack-1.7.0 #1070

Draft
wants to merge 21 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7fa2c3d
Update srw_common.lua
RatkoVasic-NOAA Apr 10, 2024
91a5c55
Update build_jet_intel.lua
RatkoVasic-NOAA Apr 10, 2024
b3b16da
Update build_hera_gnu.lua
RatkoVasic-NOAA Apr 10, 2024
fa2e976
Update build_hera_intel.lua
RatkoVasic-NOAA Apr 10, 2024
b6fa298
Update build_gaea_intel.lua
RatkoVasic-NOAA Apr 10, 2024
f2f71e3
Update build_hercules_intel.lua
RatkoVasic-NOAA Apr 10, 2024
2b64928
Update build_orion_intel.lua
RatkoVasic-NOAA Apr 10, 2024
0511c78
Update build_derecho_intel.lua
RatkoVasic-NOAA Apr 10, 2024
00964ed
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Apr 12, 2024
961ce21
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Apr 15, 2024
2b0670b
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Apr 23, 2024
6f35b4d
Merge branch 'develop' into ss170
RatkoVasic-NOAA Apr 23, 2024
0fc8293
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Apr 30, 2024
f9fe025
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 1, 2024
ae2b691
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 7, 2024
9e84393
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 13, 2024
dd7baa2
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 15, 2024
671103d
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 15, 2024
78869bb
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA May 31, 2024
5d9552e
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Jun 6, 2024
b27a5dd
Merge branch 'ufs-community:develop' into ss170
RatkoVasic-NOAA Jun 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions modulefiles/build_derecho_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ the CISL machine Derecho (Cray) using [email protected]
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.7.0/envs/ue-intel/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"))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for this CMake version downgrade?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkavulich, just used cmake build by spack-stack vs. using one built by admins. It was to be consistent with other machines which use spack-stack built cmake (3.23.1).
For Derecho, we can go with 3.26.3 if needed.

Copy link
Collaborator

@mkavulich mkavulich Apr 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation, I didn't realize we were previously using the platform build instead of through spack. It's not necessary, I was just curious.


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")

6 changes: 3 additions & 3 deletions modulefiles/build_gaea_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ This module loads libraries for building the UFS SRW App on
the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0
]])

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

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.7.0/envs/ue-intel/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
11 changes: 5 additions & 6 deletions modulefiles/build_hera_gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ the NOAA RDHPC machine Hera using GNU 9.2.0

whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.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", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.7.0/envs/ue-gcc/install/modulefiles/Core")

load("stack-gcc/9.2.0")
load("stack-openmpi/4.1.5")
load("stack-python/3.10.8")
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"))

setenv("CC", "mpicc")
setenv("CXX", "mpic++")
Expand Down
9 changes: 4 additions & 5 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.7.0/envs/ue-intel/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 @@ -26,8 +25,8 @@ load(pathJoin("cmake", cmake_ver))
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("nco", os.getenv("nco_ver") or "5.1.6"))
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
8 changes: 3 additions & 5 deletions modulefiles/build_hercules_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@ 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.7.0/envs/ue-intel/install/modulefiles/Core")

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

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("nco/5.1.6")

setenv("CFLAGS","-diag-disable=10441")
setenv("FFLAGS","-diag-disable=10441")
Expand Down
8 changes: 3 additions & 5 deletions modulefiles/build_jet_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ 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.7.0/envs/ue-intel/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")

load("nccmp/1.9.0.1")
load("nco/5.0.6")
load("nco/5.1.6")

setenv("CMAKE_C_COMPILER","mpiicc")
setenv("CMAKE_CXX_COMPILER","mpiicpc")
setenv("CMAKE_Fortran_COMPILER","mpiifort")
setenv("CMAKE_Platform","jet.intel")

10 changes: 5 additions & 5 deletions modulefiles/build_orion_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ the MSU machine Orion using Intel-2022.1.2

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/epic/role-epic/spack-stack/orion/spack-stack-1.7.0/envs/ue-intel-centos/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")

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-python/3.10.13")
load("cmake/3.23.1")

load("srw_common")

load("nccmp/1.9.0.1")
load("nco/5.0.6")
load("nco/5.1.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("CMAKE_C_COMPILER","mpiicc")
setenv("CMAKE_CXX_COMPILER","mpiicpc")
Expand Down
20 changes: 10 additions & 10 deletions modulefiles/srw_common.lua
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
load("jasper/2.0.32")
load("zlib/1.2.13")
load("zlib-ng/2.1.5")
load("libpng/1.6.37")

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

load("bacio/2.4.1")
load("crtm/2.4.0")
load("g2/3.4.5")
load("crtm/2.4.0.1")
load("g2/3.4.9")
load("g2tmpl/1.10.2")
load("ip/4.3.0")
load("sp/2.3.3")
load("ip/5.0.0")
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
Loading