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.

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

Transition Gaea F2 to F5 + Cleanup #896

Merged
merged 14 commits into from
Mar 21, 2024
Merged

Transition Gaea F2 to F5 + Cleanup #896

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d576098
hera rocky8 and hercules python
FernandoAndrade-NOAA Mar 14, 2024
fe72b17
Add changes for Rocky8 on Hera.
WenMeng-NOAA Mar 17, 2024
3f31db8
Add changes for rocky8 on jet.
WenMeng-NOAA Mar 17, 2024
ca22a11
Merge remote-tracking branch 'upstream/post_rocky8' into feature/spac…
FernandoAndrade-NOAA Mar 18, 2024
fe14ec7
gaea f5 & hercules python
FernandoAndrade-NOAA Mar 18, 2024
2e593ea
Resolve gaea lua conflicts
FernandoAndrade-NOAA Mar 18, 2024
c688c43
update hercules python & cleanup detect_machine
FernandoAndrade-NOAA Mar 18, 2024
d29762f
Update rt.sh
FernandoAndrade-NOAA Mar 18, 2024
c775516
Update detect_machine.sh comment cleanup
FernandoAndrade-NOAA Mar 18, 2024
1544226
Update detect_machine.sh
FernandoAndrade-NOAA Mar 20, 2024
92014fe
Update detect_machine.sh (ufs weather model)
FernandoAndrade-NOAA Mar 20, 2024
7d2ff06
rm hera_c & fail message
FernandoAndrade-NOAA Mar 20, 2024
22f3d35
rm hera_c & hercules python load
FernandoAndrade-NOAA Mar 21, 2024
f8a1088
Update rt.sh hera rocky8
FernandoAndrade-NOAA Mar 21, 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
58 changes: 0 additions & 58 deletions modulefiles/gaea-c5.lua
View file
Open in desktop

This file was deleted.

70 changes: 24 additions & 46 deletions modulefiles/gaea.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,34 @@
help([[
This module loads libraries required for building and running UPP
on the NOAA RDHPC machine Gaea using Intel-2022.0.2
on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
]])

whatis([===[Loads libraries needed for building the UPP on Gaea ]===])

load_any(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"),"cmake")

prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack")
load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))

load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2022.0.2"))
load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "7.7.20"))
load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))
load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))

-- Needed at runtime:
load("alps")

local ufs_modules = {
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.10.6"},
{["netcdf"] = "4.7.4"},
{["pio"] = "2.5.7"},
{["esmf"] = "8.3.0b09"},
{["fms"] = "2022.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "v1.5.0"},
{["mapl"] = "2.22.0-esmf-8.3.0b09"},
{["nemsio"] = "2.5.4"},
{["sigio"] = "2.3.2"},
{["sfcio"] = "1.4.1"},
{["wrf_io"] = "1.2.0"},
}

for i = 1, #ufs_modules do
for name, default_version in pairs(ufs_modules[i]) do
local env_version_name = string.gsub(name, "-", "_") .. "_ver"
load(pathJoin(name, os.getenv(env_version_name) or default_version))
end
end
load("PrgEnv-intel/8.3.3")
load("intel-classic/2023.1.0")
load("cray-mpich/8.1.25")
load("python/3.9.12")

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

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

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

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

load("upp_common")

unload("darshan-runtime")
unload("cray-libsci")

setenv("CC","cc")
setenv("FC","ftn")
setenv("CXX","CC")
setenv("FC","ftn")

setenv("CMAKE_Platform","gaea.intel")
3 changes: 3 additions & 0 deletions modulefiles/hercules.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
load(pathJoin("cmake", cmake_ver))

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

load("upp_common")

setenv("CC","mpiicc")
Expand Down
24 changes: 6 additions & 18 deletions tests/compile_upp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,12 @@ source ${PATHTR}/tests/detect_machine.sh
if [[ $MACHINE_ID != "unknown" ]]; then
if [ $MACHINE_ID == "wcoss2" -o $MACHINE_ID == "wcoss2_a" ]; then
module reset
elif [[ "$MACHINE_ID" =~ gaea.* ]] ; then
if [[ $( hostname ) =~ gaea5[0-9] ]] ; then
module purge
# Unset the read-only variables $PELOCAL_PRGENV and $RCLOCAL_PRGENV
gdb -ex 'call (int) unbind_variable("PELOCAL_PRGENV")' \
-ex 'call (int) unbind_variable("RCLOCAL_PRGENV")' \
--pid=$$ --batch
# Reload system default modules:
set +eu
source /etc/bash.bashrc.local
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
set -eu
else
# There is no safe "module purge" on GAEA compute nodes.
set +eu
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
set -eu
fi
elif [[ "$MACHINE_ID" =~ gaea* ]] ; then
module reset
# Unset the read-only variables $PELOCAL_PRGENV and $RCLOCAL_PRGENV
gdb -ex 'call (int) unbind_variable("PELOCAL_PRGENV")' \
-ex 'call (int) unbind_variable("RCLOCAL_PRGENV")' \
--pid=$$ --batch
else
module purge
fi
Expand Down
102 changes: 15 additions & 87 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,99 +2,27 @@

case $(hostname -f) in

alogin01.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
alogin02.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
adecflow01.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
adecflow02.acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### acorn
dlogin01.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin02.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin03.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin04.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin05.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin06.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin07.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin08.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
dlogin09.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
clogin01.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin02.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin03.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin04.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin05.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin06.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin07.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin08.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
clogin09.cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus
alogin0[12].acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
adecflow0[12].acorn.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2_a ;; ### acorn
dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dodwood
clogin0[1-9].cactus.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### cactus

gaea9) MACHINE_ID=gaea ;; ### gaea9
gaea10) MACHINE_ID=gaea ;; ### gaea10
gaea11) MACHINE_ID=gaea ;; ### gaea11
gaea12) MACHINE_ID=gaea ;; ### gaea12
gaea13) MACHINE_ID=gaea ;; ### gaea13
gaea14) MACHINE_ID=gaea ;; ### gaea14
gaea15) MACHINE_ID=gaea ;; ### gaea15
gaea16) MACHINE_ID=gaea ;; ### gaea16
gaea9.ncrc.gov) MACHINE_ID=gaea ;; ### gaea9
gaea10.ncrc.gov) MACHINE_ID=gaea ;; ### gaea10
gaea11.ncrc.gov) MACHINE_ID=gaea ;; ### gaea11
gaea12.ncrc.gov) MACHINE_ID=gaea ;; ### gaea12
gaea13.ncrc.gov) MACHINE_ID=gaea ;; ### gaea13
gaea14.ncrc.gov) MACHINE_ID=gaea ;; ### gaea14
gaea15.ncrc.gov) MACHINE_ID=gaea ;; ### gaea15
gaea16.ncrc.gov) MACHINE_ID=gaea ;; ### gaea16
gaea5[1-8]) MACHINE_ID=gaea ;; ### gaea51-58
gaea5[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea51-58

gaea5[0-9]*) MACHINE_ID=gaea-c5 ;; ### GAEA C5 login node
hfe0[1-8]) MACHINE_ID=hera_c ;; ### hera01-08
hfe09) MACHINE_ID=hera ;; ### hera09
hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12

hfe01) MACHINE_ID=hera_c ;; ### hera01
hfe02) MACHINE_ID=hera_c ;; ### hera02
hfe03) MACHINE_ID=hera_c ;; ### hera03
hfe04) MACHINE_ID=hera_c ;; ### hera04
hfe05) MACHINE_ID=hera_c ;; ### hera05
hfe06) MACHINE_ID=hera_c ;; ### hera06
hfe07) MACHINE_ID=hera_c ;; ### hera07
hfe08) MACHINE_ID=hera_c ;; ### hera08
hfe09) MACHINE_ID=hera ;; ### hera09
hfe10) MACHINE_ID=hera ;; ### hera10
hfe11) MACHINE_ID=hera ;; ### hera11
hfe12) MACHINE_ID=hera ;; ### hera12
fe[1-4]) MACHINE_ID=jet_c ;; ### jet1-4
fe[5-8]) MACHINE_ID=jet ;; ### jet5-8
tfe[12]) MACHINE_ID=jet ;; ### tjet1-2

fe1) MACHINE_ID=jet_c ;; ### jet01
fe2) MACHINE_ID=jet_c ;; ### jet02
fe3) MACHINE_ID=jet_c ;; ### jet03
fe4) MACHINE_ID=jet_c ;; ### jet04
fe5) MACHINE_ID=jet ;; ### jet05
fe6) MACHINE_ID=jet ;; ### jet06
fe7) MACHINE_ID=jet ;; ### jet07
fe8) MACHINE_ID=jet ;; ### jet08
tfe1) MACHINE_ID=jet ;; ### jet09
tfe2) MACHINE_ID=jet ;; ### jet10
Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4

Orion-login-1.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1
Orion-login-2.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion2
Orion-login-3.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion3
Orion-login-4.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion4
[Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=hercules ;; ### hercules1-4

Hercules-login-1.HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules1
Hercules-login-2.HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules2
Hercules-login-3.HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules3
Hercules-login-4.HPC.MsState.Edu) MACHINE_ID=hercules ;; ### hercules4

cheyenne1.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
cheyenne2.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne2
cheyenne3.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne3
cheyenne4.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne4
cheyenne5.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne5
cheyenne6.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne6
cheyenne1.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
cheyenne2.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne2
cheyenne3.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne3
cheyenne4.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne4
cheyenne5.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne5
cheyenne6.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne6

login1.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1
login2.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede2
login3.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede3
login4.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede4
login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4

s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### S4

Expand Down
Loading