ci: test with mpirun -np 4, 1 GPU per rank

icl-utk-edu · Jun 27, 2024 · b89a59d · b89a59d
1 parent 73f2ad2
commit b89a59d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/setup_env.sh b/.github/workflows/setup_env.sh
@@ -110,7 +110,7 @@ mpif90 --version
 #----------------------------------------------------------------- GPU
 # Find idle GPUs. gpu_bind.sh also uses ${idle_gpus}.
 # Arrays can't be exported, effectively.
-export idle_gpus=$(./tools/idle_gpus.py)
+export idle_gpus=$(./test/idle_gpus.py)
 idle_gpus_array=(${idle_gpus})  # convert to array
 gpu_kind=${idle_gpus_array[0]}  # element 0 is gpu_kind: cuda or rocm
 idle_gpus_array=(${idle_gpus_array[@]:1})  # slice elements 1:end

diff --git a/.github/workflows/test.sh b/.github/workflows/test.sh
@@ -45,7 +45,7 @@ if [ "$maker" = "cmake" ]; then
    tests="potrf"
 fi
 
-./run_tests.py ${args} --xml ${top}/report-${maker}.xml ${tests}
+./run_tests.py --test 'mpirun -np 4 ./gpu_bind.sh ./tester' ${args} ${tests}
 (( err += $? ))
 
 print "======================================== Smoke tests"

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -124,7 +124,9 @@ add_custom_command(
     TARGET ${tester} POST_BUILD
     COMMAND
         cp ${CMAKE_CURRENT_SOURCE_DIR}/run_tests.py
-           ${CMAKE_CURRENT_BINARY_DIR}/run_tests.py
+           ${CMAKE_CURRENT_SOURCE_DIR}/gpu_bind.sh
+           ${CMAKE_CURRENT_SOURCE_DIR}/idle_gpus.py
+           ${CMAKE_CURRENT_BINARY_DIR}/
 )
 
 if (slate_is_project)

diff --git a/test/gpu_bind.sh b/test/gpu_bind.sh
@@ -33,8 +33,8 @@ fi
 # Ignore GPUs that are already have processes.
 # Use cached ${idle_gpus} if it was already set in setup_env.sh
 if [ -z "${idle_gpus+x}" ]; then
-    echo "${local_rank} ../tools/idle_gpus.py"
-    export idle_gpus=$(../tools/idle_gpus.py)
+    echo "${local_rank} ./idle_gpus.py"
+    export idle_gpus=$(./idle_gpus.py)
 fi
 
 # Arrays can't be exported, effectively.

diff --git a/tools/idle_gpus.py → test/idle_gpus.py b/tools/idle_gpus.py → test/idle_gpus.py
diff --git a/test/run_tests.py b/test/run_tests.py
@@ -544,7 +544,8 @@ def filter_csv( values, csv ):
         # Requires ref to check. Only QR.
         cmds += [[ 'heev', gen + dtype + la + n + ' --jobz n --ref y --method-eig qr' ]]
     if ('v' in jobz):
-        cmds += [[ 'heev', gen + dtype + la + n + ' --jobz v --method-eig qr,dc' ]]
+        cmds += [[ 'heev', gen + dtype + la + n + ' --jobz v --method-eig dc' ]]
+        cmds += [[ 'heev', gen + dtype + la + n + ' --jobz v --method-eig qr' ]]
 
     cmds += [
     # heev uses only side=l, no-trans. side=r and trans don't yet work