Merge pull request #2073 from DARMA-tasking/2059-add-ci-pipeline-for-…

…NVCC-11-4 #2059: Add CI pipeline for NVCC 11.2
DARMA-tasking · Jan 30, 2023 · 25cfe0c · 25cfe0c
2 parents c0e0282 + 27fa571
commit 25cfe0c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 49 deletions.
diff --git a/ci/azure/azure-nvidia-10-ubuntu-mpich.yml → ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-10-ubuntu-mpich.yml → ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -2,7 +2,7 @@
 ############## Warning this is a generated file---do not modify ###############
 ###############################################################################
 
-name: PR tests (nvidia cuda 10.1, ubuntu, mpich)
+name: PR tests (nvidia cuda 11.2, ubuntu, mpich)
 
 trigger:
   branches:
@@ -27,7 +27,7 @@ variables:
   ARCH: amd64
   UBUNTU: 18.04
   COMPILER_TYPE: nvidia
-  COMPILER: nvcc-10
+  COMPILER: nvcc-11.2
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -42,9 +42,9 @@ variables:
   VT_WERROR: 1
   VT_POOL: 0
   VT_EXTENDED_TESTS: 0
-  VT_TESTS_NUM_NODES: 2
+  VT_TESTS_NUM_NODES: 4
   VT_UNITY_BUILD: 1
-  VT_PRODUCTION_BUILD: 1
+  VT_PRODUCTION_BUILD: 0
   VT_FCONTEXT: 0
   VT_ZOLTAN: 0
   VT_CI_BUILD: 1
@@ -55,7 +55,7 @@ variables:
   CMAKE_CXX_STANDARD: 17
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
-  cache_name: ubuntu-nvidia-10-cache
+  cache_name: ubuntu-nvidia-11.2-cache
   build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
   TS: 0
   TS_YEAR: 0

diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile
@@ -4,7 +4,7 @@ ARG arch=amd64
 FROM ${arch}/ubuntu:18.04 as base
 
 ARG proxy=""
-ARG compiler=nvcc-10
+ARG compiler=nvcc-11
 
 ENV https_proxy=${proxy} \
     http_proxy=${proxy}
@@ -31,31 +31,7 @@ RUN apt-get update -y -q && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN if test ${compiler} = "nvcc-10"; then \
-      wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin && \
-      mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
-      wget http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_amd64.deb && \
-      dpkg -i cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_amd64.deb && \
-      apt-key add /var/cuda-repo-10-1-local-10.1.243-418.87.00/7fa2af80.pub && \
-      apt-get update && \
-      apt-get -y install cuda-nvcc-10-1 cuda-cudart-dev-10-1 && \
-      apt-get clean && \
-      rm -rf /var/lib/apt/lists/* && \
-      rm -rf cuda-repo-ubuntu1804-10-1-local-10.1.243-418.87.00_1.0-1_amd64.deb && \
-      ln -s /usr/local/cuda-10.1 /usr/local/cuda-versioned; \
-   elif test ${compiler} = "nvcc-10.2"; then \
-     wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin && \
-     mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
-     wget https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda-repo-ubuntu1804-10-2-local-10.2.89-440.33.01_1.0-1_amd64.deb && \
-     dpkg -i cuda-repo-ubuntu1804-10-2-local-10.2.89-440.33.01_1.0-1_amd64.deb && \
-     apt-key add /var/cuda-repo-10-2-local-10.2.89-440.33.01/7fa2af80.pub && \
-     apt-get update && \
-     apt-get -y install cuda && \
-     apt-get clean && \
-     rm -rf /var/lib/apt/lists/* && \
-     rm -rf cuda-repo-ubuntu1804-10-2-local-10.2.89-440.33.01_1.0-1_amd64.deb && \
-     ln -s /usr/local/cuda-10.2 /usr/local/cuda-versioned; \
-   else \
+RUN if test ${compiler} = "nvcc-11"; then \
       wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin && \
       mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
       wget http://developer.download.nvidia.com/compute/cuda/11.0.1/local_installers/cuda-repo-ubuntu1804-11-0-local_11.0.1-450.36.06-1_amd64.deb && \
@@ -67,6 +43,18 @@ RUN if test ${compiler} = "nvcc-10"; then \
       rm -rf /var/lib/apt/lists/* && \
       rm -rf cuda-repo-ubuntu1804-11-0-local_11.0.1-450.36.06-1_amd64.deb && \
       ln -s /usr/local/cuda-11.0 /usr/local/cuda-versioned; \
+    else \
+      wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin && \
+      mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
+      wget https://developer.download.nvidia.com/compute/cuda/11.2.0/local_installers/cuda-repo-ubuntu1804-11-2-local_11.2.0-460.27.04-1_amd64.deb && \
+      dpkg -i cuda-repo-ubuntu1804-11-2-local_11.2.0-460.27.04-1_amd64.deb && \
+      apt-key add /var/cuda-repo-ubuntu1804-11-2-local/7fa2af80.pub && \
+      apt-get update && \
+      apt-get -y install cuda-nvcc-11-2 && \
+      apt-get clean && \
+      rm -rf /var/lib/apt/lists/* && \
+      rm -rf cuda-repo-ubuntu1804-11-2-local_11.2.0-460.27.04-1_amd64.deb && \
+      ln -s /usr/local/cuda-11.2 /usr/local/cuda-versioned; \
     fi
 
 ENV CC=gcc \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,7 @@
 #             clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8,
 #             clang-9, clang-10,
 #             icpx,
-#             nvcc-10, nvcc-10.2, nvcc-11}
+#             nvcc-11, nvcc-11.2}
 #   REPO=lifflander1/vt
 #   UBUNTU={18.04, 20.04}
 #   ULIMIT_CORE=0
@@ -84,9 +84,8 @@ volumes:
   amd64-ubuntu-20.04-gcc-10-cache:
   amd64-ubuntu-18.04-icpx-cache:
   amd64-ubuntu-18.04-icpc-cache:
-  amd64-ubuntu-18.04-nvcc-10-cache:
-  amd64-ubuntu-18.04-nvcc-10.2-cache:
   amd64-ubuntu-18.04-nvcc-11-cache:
+  amd64-ubuntu-18.04-nvcc-11.2-cache:
   amd64-alpine-clang-4.0-cache:
   amd64-alpine-clang-5.0-cache:
   amd64-alpine-clang-6.0-cache:
@@ -104,9 +103,8 @@ volumes:
   amd64-alpine-icc-20-cache:
   amd64-alpine-icpx-cache:
   amd64-alpine-icpc-cache:
-  amd64-alpine-nvcc-10-cache:
-  amd64-alpine-nvcc-10.2-cache:
   amd64-alpine-nvcc-11-cache:
+  amd64-alpine-nvcc-11.2-cache:
   arm64v8-ubuntu-18.04-gcc-7-cache:
   arm64v8-alpine-gcc-7-cache:
 

diff --git a/docs/md/building.md b/docs/md/building.md
@@ -145,7 +145,7 @@ which `docker-compose` will read.
 #             clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8,
 #             clang-9, clang-10,
 #             icc-18, icc-19,
-#             nvcc-10, nvcc-11}
+#             nvcc-10, nvcc-11, nvcc-11.2}
 #   REPO=lifflander1/vt
 #   UBUNTU={18.04, 20.04}
 #   ULIMIT_CORE=0

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -60,27 +60,27 @@ cache_name = ubuntu-intel-oneapi-icpc-cache
 output_name = ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
 vt_extended_tests = 0
 
-[PR-tests-nvcc-10-1]
-test_configuration = "nvidia cuda 10.1, ubuntu, mpich"
+[PR-tests-nvcc-11-0]
+test_configuration = "nvidia cuda 11.0, ubuntu, mpich"
 compiler_type = nvidia
-compiler = nvcc-10
+compiler = nvcc-11
 distro = 18.04
-cache_name = ubuntu-nvidia-10-cache
-output_name = ci/azure/azure-nvidia-10-ubuntu-mpich.yml
+cache_name = ubuntu-nvidia-11-cache
+output_name = ci/azure/azure-nvidia-11-ubuntu-mpich.yml
 vt_extended_tests = 0
 job_name = build_optional
+vt_diagnostics = 0
 vt_trace = 1
 vt_pool = 0
-vt_diagnostics = 0
-vt_production_build = 1
+vt_tests_num_nodes = 4
 
-[PR-tests-nvcc-11-0]
-test_configuration = "nvidia cuda 11.0, ubuntu, mpich"
+[PR-tests-nvcc-11-2]
+test_configuration = "nvidia cuda 11.2, ubuntu, mpich"
 compiler_type = nvidia
-compiler = nvcc-11
+compiler = nvcc-11.2
 distro = 18.04
-cache_name = ubuntu-nvidia-11-cache
-output_name = ci/azure/azure-nvidia-11-ubuntu-mpich.yml
+cache_name = ubuntu-nvidia-11.2-cache
+output_name = ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
 vt_extended_tests = 0
 job_name = build_optional
 vt_diagnostics = 0