Prechádzať zdrojové kódy

Merge topic 'ci-nvhpc24.9'

2481de0353 ci: Record expected C and CXX language standard support for NVHPC
569221f40f ci: Update NVHPC to version 24.9

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10177
Brad King 9 mesiacov pred
rodič
commit
26198a491f

+ 1 - 1
.gitlab-ci.yml

@@ -306,7 +306,7 @@ t:fedora41-makefiles-nospace:
         CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:nvhpc22.11-ninja:
+t:nvhpc24.9-ninja:
     extends:
         - .nvhpc_ninja
         - .cmake_test_linux_release

+ 3 - 0
.gitlab/ci/configure_nvhpc_ninja.cmake

@@ -1,6 +1,9 @@
 set(CMake_TEST_CUDA "NVIDIA" CACHE STRING "")
 set(CMake_TEST_CUDA_CUPTI "ON" CACHE STRING "")
 
+set(CMake_TEST_C_STANDARDS "90;99;11;17" CACHE STRING "")
+set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23" CACHE STRING "")
+
 set(configure_no_sccache 1)
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

+ 0 - 7
.gitlab/ci/ctest_exclusions.cmake

@@ -34,13 +34,6 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_jom")
     )
 endif()
 
-if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "nvhpc_")
-  list(APPEND test_exclusions
-    # FIXME(#24187): This test fails with NVHPC as the CUDA host compiler.
-    "^CudaOnly.SeparateCompilationPTX$"
-    )
-endif()
-
 string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
 if (test_exclusions)
   set(test_exclusions "(${test_exclusions})")

+ 1 - 1
.gitlab/ci/docker/nvhpc22.11/Dockerfile → .gitlab/ci/docker/nvhpc24.9/Dockerfile

@@ -1,5 +1,5 @@
 # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
-FROM kitware/nvidia-nvhpc:22.11-devel-cuda_multi-ubuntu22.04
+FROM kitware/nvidia-nvhpc:24.9-devel-cuda_multi-ubuntu24.04
 MAINTAINER Brad King <[email protected]>
 
 COPY install_deps.sh /root/install_deps.sh

+ 0 - 0
.gitlab/ci/docker/nvhpc22.11/install_deps.sh → .gitlab/ci/docker/nvhpc24.9/install_deps.sh


+ 1 - 1
.gitlab/os-linux.yml

@@ -307,7 +307,7 @@
 ### NVHPC Compiler
 
 .nvhpc:
-    image: "kitware/cmake:ci-nvhpc22.11-x86_64-2022-12-06"
+    image: "kitware/cmake:ci-nvhpc24.9-x86_64-2024-09-27"
     variables:
         CMAKE_ARCH: x86_64