From 12d032b2655ae4b91c7cb9688c36173cf6153200 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 6 Dec 2022 10:56:16 -0500 Subject: gitlab-ci: Update NVHPC to version 22.11 Fixes: #24225 --- .gitlab-ci.yml | 2 +- .gitlab/ci/docker/nvhpc22.11/Dockerfile | 6 ++++++ .gitlab/ci/docker/nvhpc22.11/install_deps.sh | 11 +++++++++++ .gitlab/ci/docker/nvhpc22.9/Dockerfile | 6 ------ .gitlab/ci/docker/nvhpc22.9/install_deps.sh | 11 ----------- .gitlab/ci/env_nvhpc_ninja.sh | 4 ---- .gitlab/os-linux.yml | 2 +- 7 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 .gitlab/ci/docker/nvhpc22.11/Dockerfile create mode 100755 .gitlab/ci/docker/nvhpc22.11/install_deps.sh delete mode 100644 .gitlab/ci/docker/nvhpc22.9/Dockerfile delete mode 100755 .gitlab/ci/docker/nvhpc22.9/install_deps.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd3f0a0c53..b930fc0e67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,7 +237,7 @@ t:fedora37-makefiles-nospace: CMAKE_CI_BUILD_NAME: fedora37_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" -t:nvhpc22.9-ninja: +t:nvhpc22.11-ninja: extends: - .nvhpc_ninja - .cmake_test_linux_release diff --git a/.gitlab/ci/docker/nvhpc22.11/Dockerfile b/.gitlab/ci/docker/nvhpc22.11/Dockerfile new file mode 100644 index 0000000000..52f4f8ecaf --- /dev/null +++ b/.gitlab/ci/docker/nvhpc22.11/Dockerfile @@ -0,0 +1,6 @@ +# https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags +FROM nvcr.io/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 new file mode 100755 index 0000000000..51ee410606 --- /dev/null +++ b/.gitlab/ci/docker/nvhpc22.11/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/ci/docker/nvhpc22.9/Dockerfile b/.gitlab/ci/docker/nvhpc22.9/Dockerfile deleted file mode 100644 index 90e7d1214c..0000000000 --- a/.gitlab/ci/docker/nvhpc22.9/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags -FROM nvcr.io/nvidia/nvhpc:22.9-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.9/install_deps.sh b/.gitlab/ci/docker/nvhpc22.9/install_deps.sh deleted file mode 100755 index 51ee410606..0000000000 --- a/.gitlab/ci/docker/nvhpc22.9/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/env_nvhpc_ninja.sh b/.gitlab/ci/env_nvhpc_ninja.sh index bf465d2aaa..687403d096 100644 --- a/.gitlab/ci/env_nvhpc_ninja.sh +++ b/.gitlab/ci/env_nvhpc_ninja.sh @@ -3,7 +3,3 @@ export CXX=nvc++ export FC=nvfortran export CUDACXX=nvcc export CUDAHOSTCXX=nvc++ -# FIXME(#24225): /opt/nvidia/hpc_sdk/Linux_x86_64/22.9/compilers/bin/nvcc -# selects a CUDA version 10.2 with host driver versions > 520. -# Manually select the preferred nvcc version. -export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/22.9/cuda/11.7/bin:$PATH diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 637df82a25..e62a8cc49a 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -258,7 +258,7 @@ ### NVHPC Compiler .nvhpc: - image: "kitware/cmake:ci-nvhpc22.9-x86_64-2022-11-22" + image: "kitware/cmake:ci-nvhpc22.11-x86_64-2022-12-06" variables: CMAKE_ARCH: x86_64 -- cgit v1.2.1