Browse Source

Merge topic 'ci-cuda-12.6'

7f1250ca68 ci: Drop redundant job testing cuda12.2 with nvcc -ccbin=clang++-18
1ffa199c55 ci: add jobs testing cuda12.6 with nvcc and clang 18
07ddceea84 ci: add cuda12.6 base image

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10261
Brad King 10 months ago
parent
commit
13cb4913c5

+ 25 - 4
.gitlab-ci.yml

@@ -396,10 +396,31 @@ t:cuda12.2-nvidia:
         - .cmake_junit_artifacts
         - .run_dependent
         - .needs_centos7_x86_64
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:cuda12.2-nvidia-clang:
+t:cuda12.2-clang:
     extends:
-        - .cuda12.2_nvidia_clang
+        - .cuda12.2_clang
+        - .cmake_test_linux_release
+        - .linux_x86_64_tags_cuda
+        - .run_dependent
+        - .needs_centos7_x86_64
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
+t:cuda12.6-nvidia:
+    extends:
+        - .cuda12.6_nvidia
+        - .cmake_test_linux_release
+        - .linux_x86_64_tags_cuda
+        - .cmake_junit_artifacts
+        - .run_dependent
+        - .needs_centos7_x86_64
+
+t:cuda12.6-nvidia-clang:
+    extends:
+        - .cuda12.6_nvidia_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags_cuda
         - .cmake_junit_artifacts
@@ -408,9 +429,9 @@ t:cuda12.2-nvidia-clang:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:cuda12.2-clang:
+t:cuda12.6-clang:
     extends:
-        - .cuda12.2_clang
+        - .cuda12.6_clang
         - .cmake_test_linux_release
         - .linux_x86_64_tags_cuda
         - .run_dependent

+ 0 - 1
.gitlab/ci/configure_cuda12.2_nvidia_clang.cmake

@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_cuda12.2_nvidia_common.cmake")

+ 6 - 0
.gitlab/ci/configure_cuda12.6_clang.cmake

@@ -0,0 +1,6 @@
+set(CMake_TEST_CUDA "Clang" CACHE STRING "")
+set(CMake_TEST_CUDA_STANDARDS "03;11;14;17;20;23" CACHE STRING "")
+set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_CUDA "ON" CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

+ 1 - 0
.gitlab/ci/configure_cuda12.6_nvidia.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_cuda12.6_nvidia_common.cmake")

+ 1 - 0
.gitlab/ci/configure_cuda12.6_nvidia_clang.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/configure_cuda12.6_nvidia_common.cmake")

+ 7 - 0
.gitlab/ci/configure_cuda12.6_nvidia_common.cmake

@@ -0,0 +1,7 @@
+set(CMake_TEST_CUDA "NVIDIA" CACHE STRING "")
+set(CMake_TEST_CUDA_CUPTI "ON" CACHE STRING "")
+set(CMake_TEST_CUDA_STANDARDS "03;11;14;17;20" CACHE STRING "")
+set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_CUDA "ON" CACHE BOOL "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

+ 9 - 0
.gitlab/ci/docker/cuda12.6/Dockerfile

@@ -0,0 +1,9 @@
+FROM kitware/nvidia-cuda:12.6.3-devel-ubuntu24.04
+MAINTAINER Brad King <[email protected]>
+
+COPY llvm.list /etc/apt/sources.list.d/llvm.list
+COPY llvm-snapshot.gpg.key /root/llvm-snapshot.gpg.key
+RUN apt-key add /root/llvm-snapshot.gpg.key
+
+COPY install_deps.sh /root/install_deps.sh
+RUN sh /root/install_deps.sh

+ 21 - 0
.gitlab/ci/docker/cuda12.6/install_deps.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+apt-get update
+
+# Install dependency without interaction.
+env DEBIAN_FRONTEND=noninteractive \
+    TZ=America/New_York \
+  apt-get install -y \
+    tzdata
+
+# Install development tools.
+apt-get install -y \
+    g++ \
+    clang-18 \
+    libomp-18-dev \
+    curl \
+    git
+
+apt-get clean

+ 52 - 0
.gitlab/ci/docker/cuda12.6/llvm-snapshot.gpg.key

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+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
+bXb5c6gCHESH5PXwPU4jQEE7Ib9J6sbk7ZT2Mw==
+=j+4q
+-----END PGP PUBLIC KEY BLOCK-----

+ 2 - 0
.gitlab/ci/docker/cuda12.6/llvm.list

@@ -0,0 +1,2 @@
+deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
+deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main

+ 3 - 0
.gitlab/ci/env_cuda12.6_clang.sh

@@ -0,0 +1,3 @@
+export CC=/usr/bin/clang-18
+export CXX=/usr/bin/clang++-18
+export CUDACXX=/usr/bin/clang++-18

+ 1 - 1
.gitlab/ci/env_cuda12.2_nvidia_clang.sh → .gitlab/ci/env_cuda12.6_nvidia_clang.sh

@@ -2,4 +2,4 @@ export CC=/usr/bin/clang-18
 export CXX=/usr/bin/clang++-18
 export CUDACXX=/usr/local/cuda/bin/nvcc
 export CUDAHOSTCXX=/usr/bin/clang++-18
-export CUDAFLAGS=--allow-unsupported-compiler
+export CUDAFLAGS=

+ 23 - 5
.gitlab/os-linux.yml

@@ -402,16 +402,34 @@
         CMAKE_CONFIGURATION: cuda12.2_nvidia
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.cuda12.2_nvidia_clang:
+.cuda12.2_clang:
     extends: .cuda12.2
     variables:
-        CMAKE_CONFIGURATION: cuda12.2_nvidia_clang
+        CMAKE_CONFIGURATION: cuda12.2_clang
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.cuda12.2_clang:
-    extends: .cuda12.2
+.cuda12.6:
+    extends: .cuda
+    image: "kitware/cmake:ci-cuda12.6-x86_64-2025-01-30"
     variables:
-        CMAKE_CONFIGURATION: cuda12.2_clang
+        CMAKE_ARCH: x86_64
+
+.cuda12.6_nvidia:
+    extends: .cuda12.6
+    variables:
+        CMAKE_CONFIGURATION: cuda12.6_nvidia
+        CTEST_NO_WARNINGS_ALLOWED: 1
+
+.cuda12.6_nvidia_clang:
+    extends: .cuda12.6
+    variables:
+        CMAKE_CONFIGURATION: cuda12.6_nvidia_clang
+        CTEST_NO_WARNINGS_ALLOWED: 1
+
+.cuda12.6_clang:
+    extends: .cuda12.6
+    variables:
+        CMAKE_CONFIGURATION: cuda12.6_clang
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 ### HIP builds