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

Jump to bottom

Update Orion module file for Rocky 9 upgrade #987

Merged
merged 5 commits into from
Jul 3, 2024
Merged

Update Orion module file for Rocky 9 upgrade #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e70146
Update Orion module file for Rocky 9 upgrade
DavidHuber-NOAA Jul 1, 2024
ff7cd55
Update orion Intel version and detection
DavidHuber-NOAA Jul 2, 2024
2743fa4
add Orion RT log and python
FernandoAndrade-NOAA Jul 2, 2024
1310d7b
add hercules RT log
FernandoAndrade-NOAA Jul 3, 2024
c354036
add hera RT log
FernandoAndrade-NOAA Jul 3, 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: 4 additions & 3 deletions ci/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,15 @@ if [ $mac2 = hf ]; then # for HERA
module load stack-intel/2021.5.0
module load stack-intel-oneapi-mpi/2021.5.1
module load prod_util/2.1.1
elif [ $mac = O ] ; then
elif [ $mac3 = orio ] ; then
export machine=ORION
export homedir=${homedir:-"/work/noaa/epic/UPP"}
export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
module load stack-intel/2022.0.2
module load stack-intel-oneapi-mpi/2021.5.1
module load stack-intel/2021.9.0
module load stack-intel-oneapi-mpi/2021.9.0
module load prod_util/2.1.1
module load python/3.10.8
elif [ $mac3 = herc ] ; then
export machine=HERCULES
export homedir=${homedir:-"/work/noaa/epic/UPP"}
Expand Down
7 changes: 5 additions & 2 deletions modulefiles/orion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ Load environment to build UPP on orion

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

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

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

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

python_ver=os.getenv("python_ver") or "3.10.8"
load(pathJoin("python", python_ver))

load("upp_common")

setenv("CC","mpiicc")
Expand Down
7 changes: 4 additions & 3 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ case $(hostname -f) in
fe[1-8]) MACHINE_ID=jet ;; ### jet1-8
tfe[12]) MACHINE_ID=jet ;; ### tjet1-2

Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4
[Oo]rion-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=orion ;; ### orion1-4

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

Expand Down Expand Up @@ -76,8 +76,9 @@ elif [[ -d /scratch1 ]]; then
# We are on NOAA Hera
MACHINE_ID=hera
elif [[ -d /work ]]; then
# We are on MSU Orion or Hercules
if [[ -d /apps/other ]]; then
# We are on MSU Orion or Hercules, check the home mount
mount=$(findmnt -n -o SOURCE /home)
if [[ ${mount} =~ "hercules" ]]; then
# We are on Hercules
MACHINE_ID=hercules
else
Expand Down
132 changes: 76 additions & 56 deletions tests/logs/rt.log.HERA
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,89 @@
===== Start of UPP Regression Testing Log =====
UPP Hash Tested:
ee3c64cb2a0ceb9326acd413b1e4d13a9ad6b253
2743fa41163593720364a644e55945d494e50efb

Submodule hashes:
-1ba8270870947b583cd51bc72ff8960f4c1fb36e sorc/libIFI.fd
-567edcc94bc418d0dcd6cdaafed448eeb5aab570 sorc/ncep_post.fd/post_gtg.fd

Run directory: /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/974/UPP/ci/rundir/upp-HERA
Run directory: /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/987/UPP/ci/rundir/upp-HERA
Baseline directory: /scratch2/NAGAPE/epic/UPP/test_suite

Total runtime: 00h:15m:37s
Test Date: 20240620 01:19:51
Total runtime: 03h:58m:06s
Test Date: 20240703 07:00:35
Summary Results:

06/20 01:07:38Z -fv3gefs pe test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
06/20 01:07:39Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
06/20 01:07:52Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
06/20 01:07:54Z -fv3hafs pe test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
06/20 01:08:18Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the trunk
06/20 01:08:19Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
06/20 01:08:27Z -nmmb pe test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
06/20 01:08:30Z -nmmb pe test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
06/20 01:08:31Z -nmmb pe test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
06/20 01:08:31Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
06/20 01:08:33Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
06/20 01:08:34Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
06/20 01:08:35Z -rap pe test: your new post executable did generate changed results in WRFPRS.GrbF16
06/20 01:08:36Z -rap pe test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
06/20 01:08:45Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
06/20 01:08:50Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
06/20 01:08:50Z -fv3r pe test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
06/20 01:08:51Z -rtma pe test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
06/20 01:08:56Z -fv3r pe test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
06/20 01:08:58Z -rtma test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
06/20 01:08:59Z -rtma pe test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
06/20 01:08:59Z -rtma pe test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
06/20 01:09:07Z -rtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
06/20 01:09:07Z -rtma test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
06/20 01:09:10Z -hrrr pe test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
06/20 01:09:12Z -hrrr pe test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
06/20 01:09:14Z -hrrr pe test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
06/20 01:09:35Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
06/20 01:09:36Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
06/20 01:09:39Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
06/20 01:19:02Z gfs_post_00.2401007-fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
06/20 01:19:02Z gfs_post_00.2401007-fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
06/20 01:19:02Z gfs_post_00.2401007-fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
06/20 01:19:42Z gfs_post_00.1987840-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
06/20 01:19:43Z gfs_post_00.1987840-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
06/20 01:19:44Z gfs_post_00.1987840-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
06/20 01:08:41Z -Runtime: nmmb_test 00:01:23 -- baseline 00:01:00
06/20 01:08:41Z -Runtime: nmmb_pe_test 00:01:12 -- baseline 00:01:00
06/20 01:08:42Z -Runtime: fv3gefs_test 00:00:28 -- baseline 00:40:00
06/20 01:08:42Z -Runtime: fv3gefs_pe_test 00:00:27 -- baseline 00:40:00
06/20 01:08:42Z -Runtime: rap_test 00:01:08 -- baseline 00:02:00
06/20 01:08:43Z -Runtime: rap_pe_test 00:01:17 -- baseline 00:02:00
06/20 01:09:43Z -Runtime: hrrr_test 00:02:40 -- baseline 00:02:00
06/20 01:09:44Z -Runtime: hrrr_pe_test 00:02:15 -- baseline 00:02:00
06/20 01:19:04Z -Runtime: fv3gfs_test 00:12:04 -- baseline 00:15:00
06/20 01:19:49Z -Runtime: fv3gfs_pe_test 00:12:45 -- baseline 00:15:00
06/20 01:19:50Z -Runtime: fv3r_test 00:01:51 -- baseline 00:03:00
06/20 01:19:50Z -Runtime: fv3r_pe_test 00:01:49 -- baseline 00:03:00
06/20 01:19:50Z -Runtime: fv3hafs_test 00:00:45 -- baseline 00:03:00
06/20 01:19:51Z -Runtime: fv3hafs_pe_test 00:00:43 -- baseline 00:03:00
06/20 01:19:51Z -Runtime: rtma_test 00:02:00 -- baseline 00:03:00
06/20 01:19:51Z -Runtime: rtma_test_pe_test 00:02:00 -- baseline
07/03 03:17:12Z gfs_post_00.3841764-fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
07/03 03:17:13Z gfs_post_00.3841764-fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
07/03 03:17:13Z gfs_post_00.3841764-fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
07/03 03:17:36Z gfs_post_00.2489321-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
07/03 03:17:37Z gfs_post_00.2489321-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
07/03 03:17:37Z gfs_post_00.2489321-fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
07/03 03:39:11Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
07/03 03:39:13Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
07/03 03:39:15Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
07/03 04:25:30Z -rtma pe test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
07/03 04:25:33Z -rtma pe test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
07/03 04:25:34Z -rtma pe test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
07/03 05:15:33Z -hrrr pe test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
07/03 05:15:35Z -hrrr pe test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
07/03 05:15:38Z -hrrr pe test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
07/03 06:58:54Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
07/03 06:59:05Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
07/03 06:59:07Z -fv3gefs pe test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
07/03 06:59:08Z -fv3r pe test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
07/03 06:59:09Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
07/03 06:59:14Z -fv3r pe test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
07/03 06:59:51Z -fv3hafs pe test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
07/03 07:00:00Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the trunk
07/03 07:00:00Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
07/03 07:00:02Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
07/03 07:00:10Z -rtma test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
07/03 07:00:14Z -rtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
07/03 07:00:15Z -rtma test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
07/03 07:00:21Z -rap pe test: your new post executable did generate changed results in WRFPRS.GrbF16
07/03 07:00:23Z -rap pe test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
07/03 06:59:16Z -Runtime: fv3gefs_pe_test 00:00:21 -- baseline 00:40:00
07/03 07:00:17Z -Runtime: rap_test 00:01:05 -- baseline 00:02:00
07/03 07:00:32Z -Runtime: rap_pe_test 00:01:13 -- baseline 00:02:00
07/03 07:00:32Z -Runtime: hrrr_test 00:02:37 -- baseline 00:02:00
07/03 07:00:33Z -Runtime: hrrr_pe_test 00:02:22 -- baseline 00:02:00
07/03 07:00:33Z -Runtime: fv3gfs_test 00:12:04 -- baseline 00:15:00
07/03 07:00:33Z -Runtime: fv3gfs_pe_test 00:12:21 -- baseline 00:15:00
07/03 07:00:34Z -Runtime: fv3r_test 00:01:44 -- baseline 00:03:00
07/03 07:00:34Z -Runtime: fv3r_pe_test 00:01:38 -- baseline 00:03:00
07/03 07:00:34Z -Runtime: fv3hafs_test 00:00:41 -- baseline 00:03:00
07/03 07:00:34Z -Runtime: fv3hafs_pe_test 00:00:37 -- baseline 00:03:00
07/03 07:00:35Z -Runtime: rtma_test 00:01:54 -- baseline 00:03:00
07/03 07:00:35Z -Runtime: rtma_test_pe_test 00:01:50 -- baseline
No changes in test results detected.
===== End of UPP Regression Testing Log =====
===== Start of UPP Regression Testing Log =====
UPP Hash Tested:
2743fa41163593720364a644e55945d494e50efb

Submodule hashes:
-1ba8270870947b583cd51bc72ff8960f4c1fb36e sorc/libIFI.fd
-567edcc94bc418d0dcd6cdaafed448eeb5aab570 sorc/ncep_post.fd/post_gtg.fd

Run directory: /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/987/UPP/ci/rundir/upp-HERA
Baseline directory: /scratch2/NAGAPE/epic/UPP/test_suite

Total runtime: 00h:10m:55s
Test Date: 20240703 14:54:11
Summary Results:

07/03 14:46:45Z -fv3gefs pe test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
07/03 14:47:24Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
07/03 14:49:17Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
07/03 14:49:20Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
07/03 14:49:21Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
07/03 14:53:53Z -nmmb pe test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
07/03 14:53:57Z -nmmb pe test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
07/03 14:53:58Z -nmmb pe test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
07/03 14:49:23Z -Runtime: nmmb_test 00:01:57 -- baseline 00:01:00
07/03 14:54:10Z -Runtime: nmmb_pe_test 00:01:40 -- baseline 00:01:00
07/03 14:54:10Z -Runtime: fv3gefs_test 00:01:12 -- baseline 00:40:00
07/03 14:54:11Z -Runtime: fv3gefs_pe_test 00:00:37 -- baseline 00:40:00
No changes in test results detected.
===== End of UPP Regression Testing Log =====
Loading
Loading