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

Use flux instead of srun on tioga #1011

Merged
merged 2 commits into from
Jan 24, 2023
Merged

Use flux instead of srun on tioga #1011

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
718f1d0
Attempted workaround for temporarily faulty CI runner
kennyweiss Jan 24, 2023
7a058c3
Use flux instead of srun on tioga
bmhan12 Jan 23, 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
2 changes: 1 addition & 1 deletion .gitlab/build_tioga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.on_tioga:
tags:
- shell
- tioga
- tioga10
rules:
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TIOGA == "OFF"' #run except if ...
when: never
Expand Down
4 changes: 2 additions & 2 deletions host-configs/[email protected]_hip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ set(MPI_CXX_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-

set(MPI_Fortran_COMPILER "/usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/bin/mpif90" CACHE PATH "")

set(MPIEXEC_EXECUTABLE "/usr/bin/srun" CACHE PATH "")
set(MPIEXEC_EXECUTABLE "/usr/bin/flux" CACHE PATH "")

set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
set(MPIEXEC_NUMPROC_FLAG "mini;run;-n" CACHE STRING "")
Comment on lines +44 to +46
Copy link
Member

Choose a reason for hiding this comment

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

This will get lost the next time we run build_tpls.py

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will get lost the next time we run build_tpls.py

I will do a follow-up PR with the spack fix for this host-config.
I think there are quite a few PR's that are ready to go, but just need this tioga fix for gitlab CI to pass.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks @bmhan12 -- I agree that we should get something working as soon as possible.

Longer term, I think the MPIEXEC_NUMPROC_FLAG should allow for spaces (i.e. flux mini run) and we should make changes to blt/axom to support that.

@white238 pointed out a place yesterday where MPIEXEC_NUMPROC_FLAG likely needs to be quoted.
e.g.
https://github.com/LLNL/blt/blob/8c229991e65e7a9603c621b47cb3ba158bb7468c/cmake/BLTMacros.cmake#L904-L914


set(ENABLE_MPI ON CACHE BOOL "")

Expand Down