diff --git a/ci/azure/azure-nvidia-11-4-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml similarity index 98% rename from ci/azure/azure-nvidia-11-4-ubuntu-mpich.yml rename to ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 5809720569..000e3d6704 100644 --- a/ci/azure/azure-nvidia-11-4-ubuntu-mpich.yml +++ b/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 11.4, 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-11.4 + COMPILER: nvcc-11.2 BUILD_TYPE: release ULIMIT_CORE: 0 CODE_COVERAGE: 0 @@ -55,7 +55,7 @@ variables: CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" - cache_name: ubuntu-nvidia-11.4-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 index 7d7a91124c..deb85ae801 100644 --- a/ci/docker/ubuntu-nvidia-cpp.dockerfile +++ b/ci/docker/ubuntu-nvidia-cpp.dockerfile @@ -70,15 +70,15 @@ RUN if test ${compiler} = "nvcc-10"; then \ 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.4.0/local_installers/cuda-repo-ubuntu1804-11-4-local_11.4.0-470.42.01-1_amd64.deb && \ - dpkg -i cuda-repo-ubuntu1804-11-4-local_11.4.0-470.42.01-1_amd64.deb && \ - apt-key add /var/cuda-repo-ubuntu1804-11-4-local/7fa2af80.pub && \ + 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-4 && \ + apt-get -y install cuda-nvcc-11-2 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - rm -rf cuda-repo-ubuntu1804-11-4-local_11.4.0-470.42.01-1_amd64.deb && \ - ln -s /usr/local/cuda-11.4 /usr/local/cuda-versioned; \ + 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 index 3f65c8ac64..752609dc91 100644 --- 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.4} +# nvcc-10, nvcc-10.2, nvcc-11, nvcc-11.2} # REPO=lifflander1/vt # UBUNTU={18.04, 20.04} # ULIMIT_CORE=0 @@ -87,7 +87,7 @@ volumes: 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.4-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: @@ -108,7 +108,7 @@ volumes: amd64-alpine-nvcc-10-cache: amd64-alpine-nvcc-10.2-cache: amd64-alpine-nvcc-11-cache: - amd64-alpine-nvcc-11.4-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 index f276314961..77cea6e7d1 100644 --- 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-11.4} +# 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 index 25e93b7120..e8a304f7ee 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -88,13 +88,13 @@ vt_trace = 1 vt_pool = 0 vt_tests_num_nodes = 4 -[PR-tests-nvcc-11-4] -test_configuration = "nvidia cuda 11.4, ubuntu, mpich" +[PR-tests-nvcc-11-2] +test_configuration = "nvidia cuda 11.2, ubuntu, mpich" compiler_type = nvidia -compiler = nvcc-11.4 +compiler = nvcc-11.2 distro = 18.04 -cache_name = ubuntu-nvidia-11.4-cache -output_name = ci/azure/azure-nvidia-11-4-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