summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--.gitlab/ci/configure_cuda11.8_minimal_nvidia.cmake3
-rw-r--r--.gitlab/ci/docker/cuda11.8-minimal/Dockerfile5
-rwxr-xr-x.gitlab/ci/docker/cuda11.8-minimal/install_deps.sh26
-rw-r--r--.gitlab/ci/docker/nvhpc22.11/Dockerfile (renamed from .gitlab/ci/docker/nvhpc22.9/Dockerfile)2
-rwxr-xr-x.gitlab/ci/docker/nvhpc22.11/install_deps.sh (renamed from .gitlab/ci/docker/nvhpc22.9/install_deps.sh)0
-rw-r--r--.gitlab/ci/env_nvhpc_ninja.sh4
-rw-r--r--.gitlab/os-linux.yml17
-rw-r--r--Help/command/add_subdirectory.rst6
-rw-r--r--Help/prop_dir/SYSTEM.rst4
-rw-r--r--Help/prop_tgt/SYSTEM.rst4
-rw-r--r--Source/CMakeVersion.cmake2
12 files changed, 70 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd3f0a0..6fdb606 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
@@ -295,6 +295,16 @@ t:cuda11.6-clang:
variables:
CMAKE_CI_NO_MR: "true"
+t:cuda11.8-minimal-ninja:
+ extends:
+ - .cuda11.8_minimal_nvidia
+ - .cmake_test_linux_release
+ - .linux_x86_64_tags_cuda
+ - .run_dependent
+ - .needs_centos6_x86_64
+ variables:
+ CMAKE_CI_NO_MR: "true"
+
t:hip4.2-radeon:
extends:
- .hip4.2_radeon
diff --git a/.gitlab/ci/configure_cuda11.8_minimal_nvidia.cmake b/.gitlab/ci/configure_cuda11.8_minimal_nvidia.cmake
new file mode 100644
index 0000000..519699b
--- /dev/null
+++ b/.gitlab/ci/configure_cuda11.8_minimal_nvidia.cmake
@@ -0,0 +1,3 @@
+set(CMake_TEST_CUDA "NVIDIA" CACHE STRING "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
diff --git a/.gitlab/ci/docker/cuda11.8-minimal/Dockerfile b/.gitlab/ci/docker/cuda11.8-minimal/Dockerfile
new file mode 100644
index 0000000..02e096e
--- /dev/null
+++ b/.gitlab/ci/docker/cuda11.8-minimal/Dockerfile
@@ -0,0 +1,5 @@
+FROM nvidia/cuda:11.8.0-devel-ubuntu20.04
+MAINTAINER Robert Maynard <rmaynard@nvidia.com>
+
+COPY install_deps.sh /root/install_deps.sh
+RUN sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/cuda11.8-minimal/install_deps.sh b/.gitlab/ci/docker/cuda11.8-minimal/install_deps.sh
new file mode 100755
index 0000000..55f4ce5
--- /dev/null
+++ b/.gitlab/ci/docker/cuda11.8-minimal/install_deps.sh
@@ -0,0 +1,26 @@
+#!/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++ \
+ curl \
+ git
+
+# Reduce to minimal subset of libraries by removing static libraries
+mkdir /tmp/cuda_required
+mv /usr/local/cuda/lib64/libcuda* /tmp/cuda_required/
+rm -f /usr/local/cuda/lib64/*static.a
+mv /tmp/cuda_required/libcuda* /usr/local/cuda/lib64/
+rmdir /tmp/cuda_required
+
+apt-get clean
diff --git a/.gitlab/ci/docker/nvhpc22.9/Dockerfile b/.gitlab/ci/docker/nvhpc22.11/Dockerfile
index 90e7d12..52f4f8e 100644
--- a/.gitlab/ci/docker/nvhpc22.9/Dockerfile
+++ b/.gitlab/ci/docker/nvhpc22.11/Dockerfile
@@ -1,5 +1,5 @@
# https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
-FROM nvcr.io/nvidia/nvhpc:22.9-devel-cuda_multi-ubuntu22.04
+FROM nvcr.io/nvidia/nvhpc:22.11-devel-cuda_multi-ubuntu22.04
MAINTAINER Brad King <brad.king@kitware.com>
COPY install_deps.sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/nvhpc22.9/install_deps.sh b/.gitlab/ci/docker/nvhpc22.11/install_deps.sh
index 51ee410..51ee410 100755
--- a/.gitlab/ci/docker/nvhpc22.9/install_deps.sh
+++ b/.gitlab/ci/docker/nvhpc22.11/install_deps.sh
diff --git a/.gitlab/ci/env_nvhpc_ninja.sh b/.gitlab/ci/env_nvhpc_ninja.sh
index bf465d2..687403d 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 637df82..cf671ef 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
@@ -331,6 +331,21 @@
CMAKE_CONFIGURATION: cuda11.6_clang
CTEST_NO_WARNINGS_ALLOWED: 1
+.cuda11.8_minimal:
+ 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
+ variables:
+ CMAKE_CONFIGURATION: cuda11.8_minimal_nvidia
+ CTEST_NO_WARNINGS_ALLOWED: 1
+
### HIP builds
.hip4.2:
diff --git a/Help/command/add_subdirectory.rst b/Help/command/add_subdirectory.rst
index 13cae10..8640eeb 100644
--- a/Help/command/add_subdirectory.rst
+++ b/Help/command/add_subdirectory.rst
@@ -36,7 +36,7 @@ the dependency.
If the ``SYSTEM`` argument is provided, the :prop_dir:`SYSTEM` directory
property of the subdirectory will be set to true. This property is
-used to initialize the :prop_tgt:`SYSTEM` property of each target
-created in that subdirectory. The include directories of targets with
-:prop_tgt:`SYSTEM` set to true will be treated as ``SYSTEM`` when
+used to initialize the :prop_tgt:`SYSTEM` property of each non-imported
+target created in that subdirectory. The include directories of targets
+with :prop_tgt:`SYSTEM` set to true will be treated as ``SYSTEM`` when
compiling consumers.
diff --git a/Help/prop_dir/SYSTEM.rst b/Help/prop_dir/SYSTEM.rst
index 4f923b7..ad4ace1 100644
--- a/Help/prop_dir/SYSTEM.rst
+++ b/Help/prop_dir/SYSTEM.rst
@@ -4,7 +4,7 @@ SYSTEM
.. versionadded:: 3.25
This directory property is used to initialize the :prop_tgt:`SYSTEM`
-target property for targets created in that directory. It is set to
-true by :command:`add_subdirectory` and
+target property for non-imported targets created in that directory.
+It is set to true by :command:`add_subdirectory` and
:command:`FetchContent_Declare` when the ``SYSTEM`` option is given
as an argument to those commands.
diff --git a/Help/prop_tgt/SYSTEM.rst b/Help/prop_tgt/SYSTEM.rst
index a267738..6399d24 100644
--- a/Help/prop_tgt/SYSTEM.rst
+++ b/Help/prop_tgt/SYSTEM.rst
@@ -18,5 +18,5 @@ then their :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` will not be
treated as ``SYSTEM``, regardless of the value of the
:prop_tgt:`IMPORTED_NO_SYSTEM` property.
-This target property is initialized from the :prop_dir:`SYSTEM`
-directory property when the target is created.
+For non-imported targets, this target property is initialized from
+the :prop_dir:`SYSTEM` directory property when the target is created.
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f9a8eb1..f74a79f 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 25)
-set(CMake_VERSION_PATCH 20221206)
+set(CMake_VERSION_PATCH 20221207)
#set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0)
generated by cgit v0.12 at 2025-02-21 09:31:57 (GMT)