From bbe132ac881fa9a1c06b90dd1f1492f15e756983 Mon Sep 17 00:00:00 2001
From: Terry Cojean <terry.cojean@kit.edu>
Date: Wed, 2 Jun 2021 17:13:58 +0200
Subject: [PATCH] Run the CUDA tests with a few configurations

---
 .gitlab-ci.yml    | 14 ++++++--------
 .gitlab/image.yml |  3 +--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a4f31dce4c..65559c5ca07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,6 @@ include:
     - if [ -n "${CUDA_ARCH}" ]; then
       CUDA_ARCH_STR=-DGINKGO_CUDA_ARCHITECTURES=${CUDA_ARCH};
       CUDA_HOST_STR=-DCMAKE_CUDA_HOST_COMPILER=$(which ${CXX_COMPILER});
-      export CUDA_VISIBLE_DEVICES=$((RANDOM % 2));
       fi
     - cmake ${CI_PROJECT_DIR}${CI_PROJECT_DIR_SUFFIX}
         -GNinja
@@ -98,7 +97,6 @@ include:
     - if [ -n "${CUDA_ARCH}" ]; then
       CUDA_ARCH_STR=-DGINKGO_CUDA_ARCHITECTURES=${CUDA_ARCH};
       CUDA_HOST_STR=-DCMAKE_CUDA_HOST_COMPILER=$(which ${CXX_COMPILER});
-      export CUDA_VISIBLE_DEVICES=$((RANDOM % 2));
       fi
     - if [ -n "${SYCL_DEVICE_FILTER}" ]; then export SYCL_DEVICE_FILTER; fi
     - cmake ${CI_PROJECT_DIR}${CI_PROJECT_DIR_SUFFIX}
@@ -509,7 +507,7 @@ build/cuda102/intel/cuda/debug/static:
 
 # cuda 11.0 and friends
 build/cuda110/gcc/cuda/debug/shared:
-  <<: *default_build
+  <<: *default_build_with_test
   extends:
     - .full_test_condition
     - .use_gko-cuda110-gnu9-llvm9-intel2020
@@ -519,10 +517,10 @@ build/cuda110/gcc/cuda/debug/shared:
     BUILD_CUDA: "ON"
     BUILD_TYPE: "Debug"
     FAST_TESTS: "ON"
-    CUDA_ARCH: 35
+    CUDA_ARCH: 61
 
 build/cuda110/clang/cuda/release/static:
-  <<: *default_build
+  <<: *default_build_with_test
   extends:
     - .full_test_condition
     - .use_gko-cuda110-gnu9-llvm9-intel2020
@@ -534,10 +532,10 @@ build/cuda110/clang/cuda/release/static:
     BUILD_CUDA: "ON"
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "OFF"
-    CUDA_ARCH: 35
+    CUDA_ARCH: 61
 
 build/cuda110/intel/cuda/debug/static:
-  <<: *default_build
+  <<: *default_build_with_test
   extends:
     - .quick_test_condition
     - .use_gko-cuda110-gnu9-llvm9-intel2020
@@ -550,7 +548,7 @@ build/cuda110/intel/cuda/debug/static:
     BUILD_TYPE: "Debug"
     FAST_TESTS: "ON"
     BUILD_SHARED_LIBS: "OFF"
-    CUDA_ARCH: 35
+    CUDA_ARCH: 61
 
 # HIP AMD
 build/amd/gcc/hip/debug/shared:
diff --git a/.gitlab/image.yml b/.gitlab/image.yml
index 9779553522e..5ea3889d8df 100644
--- a/.gitlab/image.yml
+++ b/.gitlab/image.yml
@@ -65,8 +65,7 @@
   image: ginkgohub/cuda:110-gnu9-llvm9-intel2020
   tags:
     - private_ci
-    - controller
-    - cpu
+    - nvidia-gpu
 
 .use_gko-amd-gnu8-llvm7:
   image: ginkgohub/rocm:gnu8-llvm7