From 569221f40f1f03031859fa92332ecfc246cd76c8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Jan 2025 15:32:53 -0500 Subject: ci: Update NVHPC to version 24.9 Fixes: #24187 --- .gitlab-ci.yml | 2 +- .gitlab/ci/ctest_exclusions.cmake | 7 ------- .gitlab/ci/docker/nvhpc22.11/Dockerfile | 6 ------ .gitlab/ci/docker/nvhpc22.11/install_deps.sh | 11 ----------- .gitlab/ci/docker/nvhpc24.9/Dockerfile | 6 ++++++ .gitlab/ci/docker/nvhpc24.9/install_deps.sh | 11 +++++++++++ .gitlab/os-linux.yml | 2 +- 7 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 .gitlab/ci/docker/nvhpc22.11/Dockerfile delete mode 100755 .gitlab/ci/docker/nvhpc22.11/install_deps.sh create mode 100644 .gitlab/ci/docker/nvhpc24.9/Dockerfile create mode 100755 .gitlab/ci/docker/nvhpc24.9/install_deps.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89ad4f7..6facf4d 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index e9c148f..f151bf6 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.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})") diff --git a/.gitlab/ci/docker/nvhpc22.11/Dockerfile b/.gitlab/ci/docker/nvhpc22.11/Dockerfile deleted file mode 100644 index 078ae37..0000000 --- a/.gitlab/ci/docker/nvhpc22.11/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags -FROM kitware/nvidia-nvhpc:22.11-devel-cuda_multi-ubuntu22.04 -MAINTAINER Brad King - -COPY install_deps.sh /root/install_deps.sh -RUN sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/nvhpc22.11/install_deps.sh b/.gitlab/ci/docker/nvhpc22.11/install_deps.sh deleted file mode 100755 index 51ee410..0000000 --- a/.gitlab/ci/docker/nvhpc22.11/install_deps.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -apt-get update - -# Install development tools. -apt-get install -y \ - curl - -apt-get clean diff --git a/.gitlab/ci/docker/nvhpc24.9/Dockerfile b/.gitlab/ci/docker/nvhpc24.9/Dockerfile new file mode 100644 index 0000000..b94b14a --- /dev/null +++ b/.gitlab/ci/docker/nvhpc24.9/Dockerfile @@ -0,0 +1,6 @@ +# https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags +FROM kitware/nvidia-nvhpc:24.9-devel-cuda_multi-ubuntu24.04 +MAINTAINER Brad King + +COPY install_deps.sh /root/install_deps.sh +RUN sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/nvhpc24.9/install_deps.sh b/.gitlab/ci/docker/nvhpc24.9/install_deps.sh new file mode 100755 index 0000000..51ee410 --- /dev/null +++ b/.gitlab/ci/docker/nvhpc24.9/install_deps.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +apt-get update + +# Install development tools. +apt-get install -y \ + curl + +apt-get clean diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index d6179af..3fbc812 100644 --- a/.gitlab/os-linux.yml +++ b/.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 -- cgit v0.12 From 2481de0353e2f1f11b21f000cb5bf8c9e3043c60 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Jan 2025 15:35:15 -0500 Subject: ci: Record expected C and CXX language standard support for NVHPC Extend commit 31acc90abe (ci: Record expected C and CXX language standard support, 2024-04-02, v3.30.0-rc1~279^2) to cover the NVHPC job. --- .gitlab/ci/configure_nvhpc_ninja.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/ci/configure_nvhpc_ninja.cmake b/.gitlab/ci/configure_nvhpc_ninja.cmake index 07e47c4..03038ee 100644 --- a/.gitlab/ci/configure_nvhpc_ninja.cmake +++ b/.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") -- cgit v0.12