Skip to content

Add support for Ursa, upgrade to spack-stack 1.9.1 #185

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.

Sign up for GitHub

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

Merged
EdwardSafford-NOAA merged 9 commits into from
Jun 26, 2025
Merged

Add support for Ursa, upgrade to spack-stack 1.9.1 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc8477b
Ref #182
EdwardSafford-NOAA Jun 5, 2025
3a41bca
Ref #182
EdwardSafford-NOAA Jun 5, 2025
467cac7
Ref #182
EdwardSafford-NOAA Jun 5, 2025
b130a3e
Remove unsupported machines
DavidHuber-NOAA Jun 11, 2025
4dfa9de
Add C6 ss/1.9.1 support; clean up modules
DavidHuber-NOAA Jun 11, 2025
a294f7f
Remove support for GNU compilers on Hera
DavidHuber-NOAA Jun 11, 2025
f0b2c08
Point Hera to spack-stack 1.9.1
DavidHuber-NOAA Jun 11, 2025
6fcbffb
Add LLVM to the list of supported compilers
DavidHuber-NOAA Jun 11, 2025
f55a04b
Merge remote-tracking branch 'origin/develop' into feature/port-spack…
DavidHuber-NOAA Jun 23, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()

if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Intel)$")
if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Intel|IntelLLVM)$")
message(WARNING "${CMAKE_Fortran_COMPILER_ID} is not supported.")
endif()

Expand Down
5 changes: 3 additions & 2 deletions modulefiles/common-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ Load common modules to run GSI Monitoring on all machines

local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
local wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local wgrib2_ver=os.getenv("wgrib2_ver") or "3.6.0"

load(pathJoin("netcdf-c", netcdf_c_ver))
load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
load(pathJoin("wgrib2", wgrib2_ver))

load(pathJoin("prod_util", prod_util_ver))
2 changes: 2 additions & 0 deletions modulefiles/common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
local cmake_ver=os.getenv("cmake_ver") or "3.27.9"

load(pathJoin("cmake", cmake_ver))
load(pathJoin("netcdf-c", netcdf_c_ver))
load(pathJoin("netcdf-fortran", netcdf_fortran_ver))

Expand Down
18 changes: 0 additions & 18 deletions modulefiles/gaeac5.intel-run.lua
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions modulefiles/gaeac5.intel.lua
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions modulefiles/gaeac6.intel-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
help([[
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.1/envs/ue-intel-2023.2.0/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
local grads_ver=os.getenv("grads_ver") or "2.0.2"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"
local Core_ver=os.getenv("Core_ver") or "24.11"
local grads_ver=os.getenv("grads_ver") or "2.2.3"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
-- The Core module add modules that were populated following a system upgrade in November 2024 (including GrADS)
load(pathJoin("Core", Core_ver))
load(pathJoin("grads", grads_ver))
load(pathJoin("prod_util", prod_util_ver))

load("common-run")
unload("cray-libsci")
Expand Down
6 changes: 2 additions & 4 deletions modulefiles/gaeac6.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
help([[
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.1/envs/ue-intel-2023.2.0/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
load(pathJoin("cmake", cmake_ver))

load("common")
unload("cray-libsci")
Expand Down
19 changes: 0 additions & 19 deletions modulefiles/hera.gnu-run.lua
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions modulefiles/hera.gnu.lua
View file
Open in desktop

This file was deleted.

13 changes: 5 additions & 8 deletions modulefiles/hera.intel-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
help([[
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
local grads_ver=os.getenv("grads_ver") or "2.2.3"
local perl_ver=os.getenv("perl_ver") or "5.38.0"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("grads", grads_ver))
load(pathJoin("prod_util", prod_util_ver))

load("common-run")

whatis("Description: GSI Monitoring run-time environment on Hera.intel")
whatis("Description: GSI Monitoring run-time environment on Hera.oneapi")
12 changes: 5 additions & 7 deletions modulefiles/hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
help([[
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("cmake", cmake_ver))

load("common")

whatis("Description: GSI Monitoring environment on Hera with Intel Compilers")
whatis("Description: GSI Monitoring environment on Hera with oneapi Compilers")
18 changes: 8 additions & 10 deletions modulefiles/hercules.intel-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
-- Spack Stack installation specs
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local grads_ver=os.getenv("grads_ver") or "2.2.1"
local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"

-- wgrib2 is a newer version on Hercules
setenv("wgrib2_ver", "3.1.1")
local grads_ver=os.getenv("grads_ver") or "2.2.3"

load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpiver))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("grads", grads_ver))
load(pathJoin("prod_util", prod_util_ver))

load("common-run")

Expand Down
13 changes: 6 additions & 7 deletions modulefiles/hercules.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
-- Spack Stack installation specs
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi=os.getenv("stack_intel_oneapi_mpi") or "2021.13"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("cmake", cmake_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi))

load("common")

Expand Down
19 changes: 0 additions & 19 deletions modulefiles/jet.intel-run.lua
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions modulefiles/jet.intel.lua
View file
Open in desktop

This file was deleted.

18 changes: 7 additions & 11 deletions modulefiles/orion.intel-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@ help([[
]])

-- Spack Stack installation specs
local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
local ss_ver=os.getenv("stack_ver") or "1.6.0"
local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local grads_ver=os.getenv("grads_ver") or "2.2.1"
local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
local grads_ver=os.getenv("grads_ver") or "2.2.3"

load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpiver))

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("grads", grads_ver))
load(pathJoin("prod_util", prod_util_ver))

load("common-run")

Expand Down
16 changes: 5 additions & 11 deletions modulefiles/orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,13 @@ help([[
]])

-- Spack Stack installation specs
local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
local ss_ver=os.getenv("stack_ver") or "1.6.0"
local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")

prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi=os.getenv("stack_intel_oneapi_mpi") or "2021.13"

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("cmake", cmake_ver))
load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi))

load("common")

Expand Down
18 changes: 0 additions & 18 deletions modulefiles/s4.intel-run.lua
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions modulefiles/s4.intel.lua
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions modulefiles/ursa.intel-run.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
help([[
]])

-- Spack Stack installation specs
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")

local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"

local grads_ver=os.getenv("grads_ver") or "2.2.3"

load(pathJoin("stack-oneapi", stack_oneapi_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpiver))

load(pathJoin("grads", grads_ver))

load("common-run")

whatis("Description: GSI Monitoring run-time environment on Ursa")
Loading