Merge pull request #1011 from LLNL/bugfix/han12/gitlabTioga

Use flux instead of srun on tioga, use tioga10 runner instead of tioga11
LLNL · Jan 24, 2023 · 0705185 · 0705185
2 parents 1f86e24 + 7a058c3
commit 0705185
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml
@@ -8,7 +8,7 @@
 .on_tioga:
   tags:
     - shell
-    - tioga
+    - tioga10
   rules:
     - if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TIOGA == "OFF"' #run except if ...
       when: never

diff --git a/host-configs/[email protected]_hip.cmake b/host-configs/[email protected]_hip.cmake
@@ -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 "")
 
 set(ENABLE_MPI ON CACHE BOOL "")
-Original file 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 @@