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

Update RT scripts & modulefiles for removal of Cheyenne #1912

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
610e8ae
Update Jenkinsfile to add log automation
zach1221 Sep 20, 2023
8b639c2
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Sep 20, 2023
12b6a43
Update Jenkinsfile
zach1221 Sep 20, 2023
1d325b2
Update Jenkinsfile replace master node
zach1221 Sep 20, 2023
6dd9993
Update Jenkinsfile remove extra bracket
zach1221 Sep 21, 2023
f51c68a
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Sep 21, 2023
e07b494
Update Jenkinsfile swap script and node
zach1221 Sep 21, 2023
0a49df8
Update Jenkinsfile-add parentheses
ankimball Sep 25, 2023
ca7c032
Update Jenkinsfile change node name
ankimball Sep 26, 2023
fd84581
Update Jenkinsfile
ankimball Sep 28, 2023
d74d8dd
Update Jenkinsfile
ankimball Sep 28, 2023
c8354ea
Update Jenkinsfile
ankimball Sep 28, 2023
c213a99
Update Jenkinsfile
ankimball Sep 28, 2023
fae11b6
Update Jenkinsfile
ankimball Sep 28, 2023
17194b3
Update Jenkinsfile
ankimball Sep 28, 2023
e637097
Update Jenkinsfile
ankimball Sep 28, 2023
9bfe392
Update Jenkinsfile
ankimball Sep 28, 2023
78701db
Update Jenkinsfile
ankimball Sep 28, 2023
40930bf
Update Jenkinsfile
ankimball Sep 28, 2023
64d68c7
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Sep 29, 2023
27f428e
Update Jenkinsfile
ankimball Oct 2, 2023
9c1217d
Update Jenkinsfile
ankimball Oct 2, 2023
6f2aa44
Update Jenkinsfile
ankimball Oct 2, 2023
b77709c
Update Jenkinsfile
ankimball Oct 2, 2023
ffd588f
Update Jenkinsfile
ankimball Oct 2, 2023
c9b9b8f
Update Jenkinsfile
ankimball Oct 2, 2023
ccc0bfe
Update Jenkinsfile
ankimball Oct 2, 2023
395f42e
Update Jenkinsfile
ankimball Oct 2, 2023
1182652
Update Jenkinsfile
ankimball Oct 2, 2023
00deb2f
Update Jenkinsfile
ankimball Oct 2, 2023
718f44e
Update Jenkinsfile
ankimball Oct 2, 2023
7f6fb32
Update Jenkinsfile
ankimball Oct 2, 2023
0d71e1a
Update Jenkinsfile
ankimball Oct 2, 2023
2b311c0
Update Jenkinsfile
ankimball Oct 2, 2023
7770be8
Update Jenkinsfile
ankimball Oct 2, 2023
93be126
Update Jenkinsfile
ankimball Oct 2, 2023
7e589ec
Update Jenkinsfile
ankimball Oct 2, 2023
d90fe6b
Update Jenkinsfile
ankimball Oct 2, 2023
b9f4e2a
Update Jenkinsfile
ankimball Oct 2, 2023
209ffb3
Update Jenkinsfile
ankimball Oct 2, 2023
e0efcf4
Update Jenkinsfile
ankimball Oct 2, 2023
5c88f15
Update Jenkinsfile
ankimball Oct 2, 2023
df08ebc
Update Jenkinsfile
ankimball Oct 2, 2023
266066d
Create Jenkinsfile.spack_stack
zach1221 Oct 2, 2023
2230ea6
Update Jenkinsfile
ankimball Oct 3, 2023
c500547
Update Jenkinsfile
ankimball Oct 3, 2023
e882a93
Update Jenkinsfile
ankimball Oct 3, 2023
649c9cc
Update Jenkinsfile
ankimball Oct 3, 2023
9e91ce0
Update Jenkinsfile
ankimball Oct 3, 2023
4a50bbb
Update Jenkinsfile
ankimball Oct 3, 2023
21c7f13
Update Jenkinsfile
ankimball Oct 3, 2023
b8de60f
Update Jenkinsfile
ankimball Oct 3, 2023
1f05d3f
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 3, 2023
51a53e5
Update Jenkinsfile
ankimball Oct 4, 2023
98e2442
Update Jenkinsfile
ankimball Oct 4, 2023
46d9dae
Update Jenkinsfile
ankimball Oct 4, 2023
9727d1c
Update Jenkinsfile
ankimball Oct 4, 2023
ef30617
Update Jenkinsfile
ankimball Oct 4, 2023
e4f6925
Update Jenkinsfile.spack_stack
zach1221 Oct 4, 2023
6958c06
Update Jenkinsfile.spack_stack
zach1221 Oct 4, 2023
910706b
Update Jenkinsfile.spack_stack
zach1221 Oct 4, 2023
d988321
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 5, 2023
3d5e4dd
Update Jenkinsfile.spack_stack
zach1221 Oct 5, 2023
f92885b
Update Jenkinsfile.spack_stack
zach1221 Oct 6, 2023
cfd19a7
Update Jenkinsfile.spack_stack
zach1221 Oct 6, 2023
fb26e25
Update Jenkinsfile.spack_stack
zach1221 Oct 6, 2023
74fa938
Update Jenkinsfile.spack_stack
zach1221 Oct 6, 2023
6ee532a
Update rt.sh
zach1221 Oct 6, 2023
21616b1
Update Jenkinsfile.spack_stack
zach1221 Oct 6, 2023
dbaf2cb
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
825d00e
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 9, 2023
138f36c
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
d4ad857
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
b76567d
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
a1829b6
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
193afd4
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
e93926f
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
4ca1040
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
2643396
Update Jenkinsfile.spack_stack
zach1221 Oct 9, 2023
a6f7128
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 12, 2023
d36df03
Update cpld_control_p8 remove gnu wallclock
zach1221 Oct 12, 2023
9227351
Update cpld_debug_p8 remove gnu wall clock
zach1221 Oct 12, 2023
3d028f0
Update rt.conf re-add two cpld cases to gaea
zach1221 Oct 12, 2023
294f2d7
Update rt.conf replace cheyenne with derecho
zach1221 Oct 17, 2023
50aaa6f
Update rt.sh removing cheyenne
zach1221 Oct 17, 2023
514bce7
Update module-setup.sh removing cheyenne
zach1221 Oct 17, 2023
77973db
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 18, 2023
383a5c8
Update detect_machine.sh remove cheyenne
zach1221 Oct 18, 2023
0e87b80
Update default_vars.sh remove cheyenne
zach1221 Oct 18, 2023
b320127
Update compile.sh add derecho
zach1221 Oct 18, 2023
e345fe8
Update rt_utils.sh add derecho
zach1221 Oct 18, 2023
a5a3483
Update run_test.sh add derecho
zach1221 Oct 18, 2023
ea6a976
Update and rename ufs_cheyenne.intel.lua to ufs_derecho.intel.lua
zach1221 Oct 18, 2023
c8a81eb
Delete modulefiles/ufs_cheyenne.gnu.lua
zach1221 Oct 18, 2023
ae3b6df
Update default_vars.sh add Derecho
zach1221 Oct 18, 2023
b0941c6
Update detect_machine.sh add derecho
zach1221 Oct 18, 2023
5c4764f
Create compile_qsub.IN_derecho
zach1221 Oct 18, 2023
52a0840
Delete tests/fv3_conf/tests/fv3_conf directory
zach1221 Oct 18, 2023
f3e487a
Create compile_qsub.IN_derecho
zach1221 Oct 18, 2023
052f5ee
Update and rename fv3_qsub.IN_cheyenne to fv3_qsub.IN_derecho
zach1221 Oct 18, 2023
e85c191
Update rt.sh add derecho
zach1221 Oct 18, 2023
7ea1476
Update run_test.sh
zach1221 Oct 18, 2023
291af94
Update rt.sh hash out rocoto
zach1221 Oct 18, 2023
68aef03
Update rt.sh new derecho disknm
zach1221 Oct 19, 2023
8cf5cd0
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 23, 2023
2923616
Update rt.conf
zach1221 Oct 27, 2023
44c2125
Update rt.conf
zach1221 Oct 27, 2023
d820621
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Oct 27, 2023
99ffe4d
Update rt.conf
zach1221 Oct 27, 2023
b6a526c
Update cpld_control_p8 remove cheyenne, add hercules TPN stipulation
zach1221 Oct 27, 2023
fefb95c
Update cpld_debug_p8
zach1221 Oct 27, 2023
d5ccd4c
Merge branch 'develop' into Feature/ci_log_automation
zach1221 Oct 31, 2023
400b105
Merge branch 'ufs-community:develop' into Feature/ci_log_automation
zach1221 Nov 2, 2023
8096186
add hera RT logs
zach1221 Nov 6, 2023
fa8f2cc
Delete tests/ci/Jenkinsfile.spack_stack
zach1221 Nov 13, 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
60 changes: 0 additions & 60 deletions modulefiles/ufs_cheyenne.gnu.lua

This file was deleted.

61 changes: 0 additions & 61 deletions modulefiles/ufs_cheyenne.intel.lua

This file was deleted.

43 changes: 43 additions & 0 deletions modulefiles/ufs_derecho.intel.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
help([[
loads UFS Model prerequisites for NOAA Parallelworks/Intel
]])


setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles")
load("ecflow/5.8.4")
load("mysql/8.0.33")

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230825/envs/unified-env/install/modulefiles/Core")
--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230814/envs/unified-en2/install/modulefiles/Core")
--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230814/envs/unified-env/install/modulefiles/Core")
--prepend_path("MODULEPATH", "/lustre/desc1/scratch/mpotts/spack-stack/spack-stack-dev-20230814/envs/ufs-pio-2.5.10/install/modulefiles/Core")
--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-1.4.1/envs/unified-dev/install/modulefiles/Core")

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

--stack_impi_ver=os.getenv("stack_impi_ver") or "2021.8.0"
--load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

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

cmake_ver=os.getenv("cmake_ver") or "3.26.3"
load(pathJoin("cmake", cmake_ver))

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


setenv("CMAKE_Platform", "derecho.intel")
load("ufs-weather-model-env")
--prepend_path("PATH","/opt/cray/pe/pals/1.2.11/bin")
--setenv("CC", "cc")
--setenv("CXX", "CC")
--setenv("FC", "ftn")

whatis("Description: UFS build environment")
2 changes: 1 addition & 1 deletion tests/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ BUILD_DIR=${BUILD_DIR:-$(pwd)/build_${BUILD_NAME}}
# ----------------------------------------------------------------------
# Make sure we have reasonable number of threads.

if [[ $MACHINE_ID == cheyenne ]]; then
if [[ $MACHINE_ID == derecho ]]; then
BUILD_JOBS=${BUILD_JOBS:-3}
fi

Expand Down
47 changes: 8 additions & 39 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -214,62 +214,31 @@ elif [[ $MACHINE_ID = s4 ]]; then
ICE_tasks_cpl_bmrk=48
WAV_tasks_cpl_bmrk=80

elif [[ $MACHINE_ID = gaea ]]; then

TPN=24
elif [[ $MACHINE_ID = derecho ]]; then

TPN=128
INPES_dflt=3 ; JNPES_dflt=8
INPES_thrd=3 ; JNPES_thrd=4
INPES_c384=6 ; JNPES_c384=8 ; THRD_c384=1
INPES_c384=8 ; JNPES_c384=6 ; THRD_c384=2
INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2

THRD_cpl_atmw_gdas=3
THRD_cpl_atmw_gdas=2
INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
WAV_tasks_atmw_gdas=264
WAV_tasks_atmw_gdas=248

elif [[ $MACHINE_ID = cheyenne ]]; then
elif [[ $MACHINE_ID = gaea ]]; then

TPN=36
TPN=24

INPES_dflt=3 ; JNPES_dflt=8
INPES_thrd=3 ; JNPES_thrd=4
INPES_c384=8 ; JNPES_c384=6 ; THRD_c384=2
INPES_c384=6 ; JNPES_c384=8 ; THRD_c384=1
INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2

THRD_cpl_atmw_gdas=3
INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
WAV_tasks_atmw_gdas=264

THRD_cpl_dflt=1
INPES_cpl_dflt=6; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
OCN_tasks_cpl_dflt=20
ICE_tasks_cpl_dflt=10
WAV_tasks_cpl_dflt=20

THRD_cpl_thrd=2
INPES_cpl_thrd=6; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
OCN_tasks_cpl_thrd=20
ICE_tasks_cpl_thrd=10
WAV_tasks_cpl_thrd=20

THRD_cpl_dcmp=1
INPES_cpl_dcmp=4; JNPES_cpl_dcmp=12; WPG_cpl_dcmp=6
OCN_tasks_cpl_dcmp=20
ICE_tasks_cpl_dcmp=10
WAV_tasks_cpl_dcmp=20

THRD_cpl_mpi=1
INPES_cpl_mpi=6; JNPES_cpl_mpi=12; WPG_cpl_mpi=6
OCN_tasks_cpl_mpi=24
ICE_tasks_cpl_mpi=12
WAV_tasks_cpl_mpi=24

THRD_cpl_bmrk=2
INPES_cpl_bmrk=12; JNPES_cpl_bmrk=8; WPG_cpl_bmrk=48
OCN_tasks_cpl_bmrk=120
ICE_tasks_cpl_bmrk=48
WAV_tasks_cpl_bmrk=100

elif [[ $MACHINE_ID = stampede ]]; then

echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
Expand Down
28 changes: 9 additions & 19 deletions tests/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,20 @@ case $(hostname -f) in
Orion-login-3.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion3
Orion-login-4.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion4

derecho1.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho1
derecho2.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho2
derecho3.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho3
derecho4.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho4
derecho5.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho5
derecho6.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho6
derecho7.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho7
derecho8.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho8

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
chadmin1.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
chadmin2.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
chadmin3.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
chadmin4.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
chadmin5.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
chadmin6.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1

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
Expand Down
16 changes: 16 additions & 0 deletions tests/fv3_conf/compile_qsub.IN_derecho
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash -l
#PBS -o out
#PBS -e err
#PBS -N @[JBNME]
#PBS -A @[ACCNR]
#PBS -q @[QUEUE]
#PBS -l select=1:ncpus=8:mpiprocs=1
#PBS -l walltime=00:30:00

set -eux

echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`
module purge

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -eux
echo -n " $( date +%s )," > job_timestamp.txt

set +x
MACHINE_ID=cheyenne
MACHINE_ID=derecho
source ./module-setup.sh
if [[ ! -d modulefiles ]]; then
mkdir modulefiles
Expand All @@ -30,11 +30,12 @@ export OMP_NUM_THREADS=@[THRD]
export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
export ESMF_RUNTIME_PROFILE=ON
export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
export MPICH_COLL_OPT_OFF=1

# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

mpiexec_mpt -p %g: -np @[TASKS] omplace ./fv3.exe
mpiexec -n @[TASKS] -ppn @[PPN] --hostfile $PBS_NODEFILE ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
Loading