From fdb0ef8af846af647018c480e5e413f330532b63 Mon Sep 17 00:00:00 2001 From: Tom Lin Date: Thu, 7 Apr 2022 23:22:54 +0100 Subject: [PATCH 1/3] Bump CI NVHPC version --- src/ci-prepare-bionic.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ci-prepare-bionic.sh b/src/ci-prepare-bionic.sh index 656d338..0684f35 100755 --- a/src/ci-prepare-bionic.sh +++ b/src/ci-prepare-bionic.sh @@ -133,21 +133,26 @@ setup_aocc() { } setup_nvhpc() { - echo "Preparing Nvidia HPC SDK" - local tarball="nvhpc.tar.gz" -# local url="http://localhost:8000/nvhpc_2021_219_Linux_x86_64_cuda_11.4.tar.gz" - local url="https://developer.download.nvidia.com/hpc-sdk/21.9/nvhpc_2021_219_Linux_x86_64_cuda_11.4.tar.gz" + echo "Preparing Nvidia HPC SDK" + local nvhpc_ver="22.3" + local nvhpc_release="2022_223" + local cuda_ver="11.6" + + local tarball="nvhpc_$nvhpc_ver.tar.gz" + + local url="https://developer.download.nvidia.com/hpc-sdk/$nvhpc_ver/nvhpc_${nvhpc_release}_Linux_x86_64_cuda_$cuda_ver.tar.gz" get_and_untar "$tarball" "$url" - local sdk_dir="$PWD/nvhpc_2021_219_Linux_x86_64_cuda_11.4/install_components/Linux_x86_64/21.9" + local sdk_dir="$PWD/nvhpc_${nvhpc_release}_Linux_x86_64_cuda_$cuda_ver/install_components/Linux_x86_64/$nvhpc_ver" local bin_dir="$sdk_dir/compilers/bin" "$bin_dir/makelocalrc" "$bin_dir" -x export_var NVHPC_SDK_DIR "$sdk_dir" - export_var NVHPC_CUDA_DIR "$sdk_dir/cuda/11.4" + export_var NVHPC_CUDA_DIR "$sdk_dir/cuda/$cuda_ver" export_var NVHPC_NVCXX "$bin_dir/nvc++" - export_var NVHPC_NVCC "$sdk_dir/cuda/11.4/bin/nvcc" + export_var NVHPC_NVCC "$bin_dir/nvcc" +# export_var NVHPC_NVCC "$sdk_dir/cuda/$cuda_ver/bin/nvcc" echo "Installed CUDA versions:" ls "$sdk_dir/cuda" From b27def135e9a1eb46e53c9d45396dea9077be204 Mon Sep 17 00:00:00 2001 From: Tom Lin Date: Fri, 8 Apr 2022 05:34:15 +0100 Subject: [PATCH 2/3] Sync CUDA version with CI runner --- src/ci-prepare-bionic.sh | 1 + src/ci-test-compile.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci-prepare-bionic.sh b/src/ci-prepare-bionic.sh index 0684f35..78bbd33 100755 --- a/src/ci-prepare-bionic.sh +++ b/src/ci-prepare-bionic.sh @@ -152,6 +152,7 @@ setup_nvhpc() { export_var NVHPC_NVCXX "$bin_dir/nvc++" export_var NVHPC_NVCC "$bin_dir/nvcc" + export_var NVHPC_CUDA_VER "$cuda_ver" # export_var NVHPC_NVCC "$sdk_dir/cuda/$cuda_ver/bin/nvcc" echo "Installed CUDA versions:" diff --git a/src/ci-test-compile.sh b/src/ci-test-compile.sh index 9388643..7e17379 100755 --- a/src/ci-test-compile.sh +++ b/src/ci-test-compile.sh @@ -122,7 +122,7 @@ run_build() { AMD_ARCH="gfx_903" NV_ARCH="sm_70" -NV_ARCH_CCXY="cuda11.4,cc80" +NV_ARCH_CCXY="cuda${NVHPC_CUDA_VER:?},cc80" build_gcc() { local name="gcc_build" From 0f264081d75ddf315ecff461af17c8db6e3d4b78 Mon Sep 17 00:00:00 2001 From: Tom Lin Date: Fri, 8 Apr 2022 19:43:15 +0100 Subject: [PATCH 3/3] Fix Thrust/CUB path --- src/ci-test-compile.sh | 8 ++++---- src/thrust/model.cmake | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ci-test-compile.sh b/src/ci-test-compile.sh index 7e17379..a7c5bab 100755 --- a/src/ci-test-compile.sh +++ b/src/ci-test-compile.sh @@ -175,9 +175,9 @@ build_gcc() { local current=$("$CMAKE_BIN" --version | head -n 1 | cut -d ' ' -f3) local required="3.15.0" if [ "$(printf '%s\n' "$required" "$current" | sort -V | head -n1)" = "$required" ]; then - run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/include -DTHRUST_IMPL=CUDA -DBACKEND=CUDA" - run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/include -DTHRUST_IMPL=CUDA -DBACKEND=OMP" - run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/include -DTHRUST_IMPL=CUDA -DBACKEND=CPP" + run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/lib64/cmake -DTHRUST_IMPL=CUDA -DBACKEND=CUDA" + run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/lib64/cmake -DTHRUST_IMPL=CUDA -DBACKEND=OMP" + run_build $name "${GCC_CXX:?}" thrust "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/lib64/cmake -DTHRUST_IMPL=CUDA -DBACKEND=CPP" # FIXME CUDA Thrust + TBB throws the following error: # /usr/lib/gcc/x86_64-linux-gnu/9/include/avx512fintrin.h(9146): error: identifier "__builtin_ia32_rndscaless_round" is undefined @@ -187,7 +187,7 @@ build_gcc() { # /usr/lib/gcc/x86_64-linux-gnu/9/include/avx512dqintrin.h(1365): error: identifier "__builtin_ia32_fpclassss" is undefined # /usr/lib/gcc/x86_64-linux-gnu/9/include/avx512dqintrin.h(1372): error: identifier "__builtin_ia32_fpclasssd" is undefined - # run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/include -DTHRUST_IMPL=CUDA -DBACKEND=TBB" + # run_build $name "${GCC_CXX:?}" THRUST "$cxx -DCMAKE_CUDA_COMPILER=${NVHPC_NVCC:?} -DCUDA_ARCH=$NV_ARCH -DSDK_DIR=$NVHPC_CUDA_DIR/lib64/cmake -DTHRUST_IMPL=CUDA -DBACKEND=TBB" else echo "CMake version ${current} < ${required}, skipping Thrust models" fi diff --git a/src/thrust/model.cmake b/src/thrust/model.cmake index 0c286c2..2d687c7 100644 --- a/src/thrust/model.cmake +++ b/src/thrust/model.cmake @@ -53,6 +53,9 @@ macro(setup) message(STATUS "NVCC flags: ${CMAKE_CUDA_FLAGS} ${CMAKE_CUDA_FLAGS_${BUILD_TYPE}}") + # XXX NVHPC <= 21.9 has cub-config in `Linux_x86_64/21.9/cuda/11.4/include/cub/cmake` + # XXX NVHPC >= 22.3 has cub-config in `Linux_x86_64/22.3/cuda/11.6/lib64/cmake/cub/` + # same thing for thrust if (SDK_DIR) find_package(CUB REQUIRED CONFIG PATHS ${SDK_DIR}/cub) find_package(Thrust REQUIRED CONFIG PATHS ${SDK_DIR}/thrust)