Revert "try setting mpiexec_executable to flux run"

This reverts commit dc37d96.
LLNL · Oct 28, 2024 · 13c09e7 · 13c09e7
1 parent 83001eb
commit 13c09e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/.gitlab/build_and_test.sh b/.gitlab/build_and_test.sh
@@ -143,16 +143,6 @@ install_dir="${build_root}/install_${job_unique_id}_${hostconfig//.cmake/}"
 
 cmake_exe=`grep 'CMake executable' ${hostconfig_path} | cut -d ':' -f 2 | xargs`
 
-# If using flux, append "run" after the flux executable path
-if [[ "${MPIEXEC_EXECUTABLE}" == "flux" ]]
-then
-    MPIEXEC_EXECUTABLE="$(which ${MPIEXEC_EXECUTABLE}) run"
-    flux jobs
-    flux resource list
-else
-    MPIEXEC_EXECUTABLE="$(which ${MPIEXEC_EXECUTABLE})"
-fi
-
 # Build
 if [[ "${option}" != "--deps-only" && "${option}" != "--test-only" ]]
 then
@@ -161,6 +151,9 @@ then
     echo "~ Host-config: ${hostconfig_path}"
     echo "~ Build Dir:   ${build_dir}"
     echo "~ Project Dir: ${project_dir}"
+    echo "~ MPIEXEC_EXECUTABLE: ${MPIEXEC_EXECUTABLE}"
+    echo "~ MPIEXEC_PREFLAGS: ${MPIEXEC_PREFLAGS}"
+    echo "~ MPIEXEC_POSTFLAGS: ${MPIEXEC_POSTFLAGS}"
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -183,19 +176,19 @@ then
         $cmake_exe \
             -C "${hostconfig_path}" \
             -DCMAKE_INSTALL_PREFIX=${install_dir} \
-            -DMPIEXEC_EXECUTABLE="${MPIEXEC_EXECUTABLE}" \
-            -DMPIEXEC_PREFLAGS="${MPIEXEC_PREFLAGS}" \
-            -DMPIEXEC_POSTFLAGS="${MPIEXEC_POSTFLAGS}" \
+            -DMPIEXEC_EXECUTABLE=$(which $MPIEXEC_EXECUTABLE) \
+            -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} \
+            -DMPIEXEC_POSTFLAGS=${MPIEXEC_POSTFLAGS} \
             -DSUNDIALS_CALIPER_OUTPUT_DIR="${CALIPER_DIR}/Release/${hostname}/${sundials_version}" \
             "${project_dir}"
 
     else
         $cmake_exe \
             -C "${hostconfig_path}" \
             -DCMAKE_INSTALL_PREFIX=${install_dir} \
-            -DMPIEXEC_EXECUTABLE="${MPIEXEC_EXECUTABLE}" \
-            -DMPIEXEC_PREFLAGS="${MPIEXEC_PREFLAGS}" \
-            -DMPIEXEC_POSTFLAGS="${MPIEXEC_POSTFLAGS}" \
+            -DMPIEXEC_EXECUTABLE=$(which $MPIEXEC_EXECUTABLE) \
+            -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} \
+            -DMPIEXEC_POSTFLAGS=${MPIEXEC_POSTFLAGS} \
             "${project_dir}"
     fi
 

diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -33,6 +33,7 @@
 .sundials_job_on_tioga:
   variables:
     MPIEXEC_EXECUTABLE: "flux"
+    MPIEXEC_PREFLAGS: "run"
   extends: [.custom_job, .job_on_tioga]
 
 # --- Builds with HIP