Browse Source

gitlab-ci: de-duplicate cuda job settings

Brad King 3 years ago
parent
commit
ae610be60f
1 changed files with 10 additions and 21 deletions
  1. 10 21
      .gitlab/os-linux.yml

+ 10 - 21
.gitlab/os-linux.yml

@@ -269,76 +269,65 @@
 
 ### CUDA builds
 
-.cuda9.2:
-    image: "kitware/cmake:ci-cuda9.2-x86_64-2021-10-01"
-
+.cuda:
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
-        CMAKE_ARCH: x86_64
         CTEST_LABELS: "CUDA"
         CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1
 
+.cuda9.2:
+    extends: .cuda
+    image: "kitware/cmake:ci-cuda9.2-x86_64-2021-10-01"
+    variables:
+        CMAKE_ARCH: x86_64
+
 .cuda9.2_nvidia:
     extends: .cuda9.2
-
     variables:
         CMAKE_CONFIGURATION: cuda9.2_nvidia
         CMAKE_GENERATOR: "Ninja Multi-Config"
 
 .cuda10.2:
+    extends: .cuda
     image: "kitware/cmake:ci-cuda10.2-x86_64-2021-06-16"
-
     variables:
-        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
-        CTEST_LABELS: "CUDA"
-        CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1
 
 .cuda10.2_nvidia:
     extends: .cuda10.2
-
     variables:
         CMAKE_CONFIGURATION: cuda10.2_nvidia
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 .cuda10.2_clang:
     extends: .cuda10.2
-
     variables:
         CMAKE_CONFIGURATION: cuda10.2_clang
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 .cuda11.6:
+    extends: .cuda
     image: "kitware/cmake:ci-cuda11.6-x86_64-2022-02-28"
-
     variables:
-        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
-        CTEST_LABELS: "CUDA"
-        CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1
 
 .cuda11.6_nvidia:
     extends: .cuda11.6
-
     variables:
         CMAKE_CONFIGURATION: cuda11.6_nvidia
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 .cuda11.6_clang:
     extends: .cuda11.6
-
     variables:
         CMAKE_CONFIGURATION: cuda11.6_clang
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 .cuda11.8_minimal:
+    extends: .cuda
     image: "kitware/cmake:ci-cuda11.8-minimal-x86_64-2022-12-06"
-
     variables:
-        GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
         CMAKE_ARCH: x86_64
-        CTEST_LABELS: "CUDA"
-        CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1
 
 .cuda11.8_minimal_nvidia:
     extends: .cuda11.8_minimal