From 9f8dd406c58847265c660fcc919be0584b517be3 Mon Sep 17 00:00:00 2001 From: Jacob Domagala Date: Mon, 18 Dec 2023 16:31:12 +0100 Subject: [PATCH] #2216: Bump version of cuda image, since 11.2.0 is no longer available on dockerhub --- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 2 +- ci/docker/ubuntu-nvidia-cpp.dockerfile | 2 ++ cmake/load_bundled_libraries.cmake | 2 +- scripts/workflows-azure.ini | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index ceac2d45ee..ff45790505 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -27,7 +27,7 @@ variables: ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: nvidia - COMPILER: 11.2.0 + COMPILER: 11.2.2 HOST_COMPILER: gcc-9 BUILD_TYPE: release ULIMIT_CORE: 0 diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile index 46687c29d7..dd7190c28e 100644 --- a/ci/docker/ubuntu-nvidia-cpp.dockerfile +++ b/ci/docker/ubuntu-nvidia-cpp.dockerfile @@ -53,7 +53,9 @@ RUN ./mpich.sh 3.3.2 -j4 ARG external_fmt COPY ./ci/deps/fmt.sh fmt.sh + RUN if test ${external_fmt} -eq 1; then \ + chmod +x ./fmt.sh && \ ./fmt.sh 7.1.3 -j4; \ fi diff --git a/cmake/load_bundled_libraries.cmake b/cmake/load_bundled_libraries.cmake index debb47f108..cc613eaae1 100644 --- a/cmake/load_bundled_libraries.cmake +++ b/cmake/load_bundled_libraries.cmake @@ -28,7 +28,7 @@ if(${vt_external_fmt}) else() message(STATUS "vt_external_fmt = ON but fmt_DIR is not provided!") endif() - find_package(fmt 9.1.0 REQUIRED) + find_package(fmt 7.1.0 REQUIRED) else() set(FMT_LIBRARY fmt) diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 6949077547..834e18ba2b 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -79,7 +79,7 @@ vt_tests_num_nodes = 4 [PR-tests-nvcc-11-2-gcc-9] test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich" compiler_type = nvidia -compiler = 11.2.0 +compiler = 11.2.2 host_compiler = gcc-9 distro = 20.04 cache_name = ubuntu-nvidia-11.2-cache