Skip to content

Port to Hercules #23

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
aerorahul merged 4 commits into from
Jan 5, 2024
Merged

Port to Hercules #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
137f706
Initial port to Hercules. #22
DavidHuber-NOAA Dec 11, 2023
6c37857
Perform unification when possible.
DavidHuber-NOAA Dec 18, 2023
fe8e439
Upgrade sp in CI.
DavidHuber-NOAA Dec 18, 2023
d20aaeb
Update detect_machine.sh for Hercules. #107
DavidHuber-NOAA Dec 18, 2023
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
4 changes: 2 additions & 2 deletions ci/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spack:
- bufr@11.7.0
- bacio@2.4.1
- w3emc@2.10.0
- sp@2.3.3
- sp@2.5.0
- ip@4.3.0
- sigio@2.3.2
- sfcio@1.4.1
Expand All @@ -24,4 +24,4 @@ spack:
- cmake@3.20.1
view: true
concretizer:
unify: true
unify: when_possible
26 changes: 26 additions & 0 deletions modulefiles/gsiutils_hercules.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")

local stack_python_ver=os.getenv("python_ver") or "3.10.8"
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 mkl_ver=os.getenv("mkl_ver") or "2022.2.1"
local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
load(pathJoin("intel-oneapi-mkl", mkl_ver))
load(pathJoin("python", stack_python_ver))
load(pathJoin("cmake", cmake_ver))

load("gsiutils_common")

load(pathJoin("prod_util", prod_util_ver))

pushenv("CFLAGS", "-xHOST")
pushenv("FFLAGS", "-xHOST")

whatis("Description: GSI utilities environment on Orion with Intel Compilers")
2 changes: 2 additions & 0 deletions ush/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ case $(hostname -f) in

Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4

[Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ed]du) MACHINE_ID=hercules ;; ### hercules1-4

cheyenne[1-6].cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
cheyenne[1-6].ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
chadmin[1-6].ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1-6
Expand Down
9 changes: 8 additions & 1 deletion ush/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ elif [[ $MACHINE_ID = hera* ]] ; then
elif [[ $MACHINE_ID = orion* ]] ; then
# We are on Orion
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/init/bash
source /apps/lmod/lmod/init/bash
fi
module purge

elif [[ $MACHINE_ID = hercules* ]] ; then
# We are on Hercules
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/other/lmod/lmod/init/bash
fi
module purge

Expand Down