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

Gaea machine name #14

Merged
merged 19 commits into from
Jan 25, 2024
Merged

Gaea machine name #14

merged 19 commits into from
Jan 25, 2024

Conversation

zach1221
Copy link
Collaborator

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full RT suite (compared to current baselines) on either Hera/Derecho/Hercules AND have committed the log to my PR branch.
  • Add list of all failed regression tests in "Regression Tests" section.

PR Information

Description

Commit Message

Priority

  • Critical Bugfix (This PR contains a critical bug fix and should be prioritized.)
  • High (This PR contains a feature or fix needed for a time-sensitive project (eg, retrospectives, implementations))
  • Normal

Blocking Dependencies

Git Issues Fixed By This PR

Changes

Subcomponent (with links)

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Input data

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Regression Tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:
FAILED REGRESSION TESTS

Libraries

  • Not Needed
  • Needed
    • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
    • Add issue link from JCSDA/spack-stack following this item

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

@ulmononian
Copy link
Owner

@zach1221 most of these changes look good, but some seem redundant to commits already in my pr branch. a can you check if your updates reflect the most up to date version of my branch?

ulmononian
ulmononian reviewed Jan 25, 2024
View reviewed changes
tests/compile.sh Outdated
if [[ $MACHINE_ID == gaea-c5 ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
if [[ $MACHINE_ID == gaea ]]; then
source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@natalie-perlin is the source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh still needed here? i know you mentioned that we do not need to source this file in module-setup.sh anymore, and i've replaced it there with module reset. thanks!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ulmononian I've changed mine to module reset to match yours.

ulmononian
ulmononian reviewed Jan 25, 2024
View reviewed changes
tests/module-setup.sh Outdated
@@ -75,7 +75,7 @@ elif [[ $MACHINE_ID = gaea-c5 ]] ; then
# /etc/profile here.
source /etc/profile
fi
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
source /gpfs/f5/epic/scratch/role.epic/contrib/Lmod_init_C5.sh
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zach1221 @natalie-perlin my understanding is that we just need to do module reset here now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ulmononian good here

ulmononian
ulmononian reviewed Jan 25, 2024
View reviewed changes
tests/rt.sh Outdated
module load rocoto
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
ROCOTOCOMPLETE=$(which rocotocomplete)
ROCOTO_SCHEDULER=slurm

module use /ncrc/proj/epic/miniconda3/modulefiles
module load miniconda3/4.12.0
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think we need to load miniconda here

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we? python is loaded below which is sufficient for spack-stack

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ulmononian done.

ulmononian
ulmononian reviewed Jan 25, 2024
View reviewed changes
tests/rt.sh
module load PrgEnv-intel/8.3.3
module load intel-classic/2023.1.0
module load cray-mpich/8.1.25
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please add module load cray-mpich/8.1.25 back?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ulmononian ok module added back.

@ulmononian ulmononian merged commit f4dc1f7 into ulmononian:feature/update_gaea Jan 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ulmononian ulmononian ulmononian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zach1221 @ulmononian