Skip to content

Aarondonahue/machines/tuo openmp linking fix #8656

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

Open
AaronDonahue wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −4
Open

Aarondonahue/machines/tuo openmp linking fix #8656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c5a28
Fix Flux batch system command-line arguments
AaronDonahue Aug 21, 2026
1bec203
Fix tuo_crayamd-mphipcc cmake configuration for threading and linking
AaronDonahue Aug 21, 2026
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
9 changes: 8 additions & 1 deletion cime_config/machines/cmake_macros/tuo_crayamd-mphipcc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@ set(SCC "${MPICC}")
set(SCXX "${MPICXX}")
set(SFC "${MPIFC}")

if (compile_threaded)
string(APPEND CMAKE_C_FLAGS " -fopenmp")
string(APPEND CMAKE_Fortran_FLAGS " -fopenmp")
string(APPEND CMAKE_CXX_FLAGS " -fopenmp")
string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp")
endif()

if (COMP_NAME STREQUAL gptl)
string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY")
endif()

# required to resolve bshr_infnan_mod.F90 compile issue
string(APPEND CPPDEFS " -DCPRCRAY")
string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DNO_R16 -DCPRCRAY")

set(USE_HIP "TRUE")

Expand Down
6 changes: 3 additions & 3 deletions cime_config/machines/config_batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@
<depend_separator>:</depend_separator>
<walltime_format>%Mm</walltime_format>
<submit_args>
<arg flag="--time" name="60m"/>
<arg flag="--queue" name="$JOB_QUEUE"/>
<arg flag="--bank" name="$PROJECT"/>
<arg flag="--time-limit" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-B" name="$PROJECT"/>
Comment on lines -242 to +244

@jasonb5 jasonb5 Aug 21, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Note that CIME will not replace $JOB_WALLCLOCK_TIME correctly, there's a PR open for this in CIME.

You'll need to manually set the value until that PR is merged and we do a CIME update.

@AaronDonahue AaronDonahue Aug 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ahhh okay, I was wondering why it was hard-coded. we can revert back to a hard-coded value for now if we want.

@jasonb5 jasonb5 Aug 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's fine to leave this, you'll need to set the wallclock anyway, this simplifies it to just ./xmlchange JOB_WALLCLOCK_TIME=<time>.
If you revert anything, i'd move back to the explicit flag, it reads better.

@jasonb5 jasonb5 Aug 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also note resubmits don't work, there's a CIME fix coming for this.

</submit_args>
<directives>
<directive> --job-name={{ job_id }}</directive>
Expand Down