From 946a1ec787cd0abe20f90c770663507cbf9a2429 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Mon, 9 Dec 2024 19:32:07 -0500 Subject: [PATCH] update HIP/CUDA dependences to include sparse libraries these are needed by AMReX --- .github/workflows/cuda.yml | 2 +- .../dependencies/dependencies_hip.sh | 5 ++- .../dependencies/dependencies_nvcc11.sh | 34 ------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100755 .github/workflows/dependencies/dependencies_nvcc11.sh diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index fab16b93fe..0e8b2aea54 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -26,7 +26,7 @@ jobs: cd ../.. - name: Dependencies - run: .github/workflows/dependencies/dependencies_nvcc11.sh + run: .github/workflows/dependencies/dependencies_nvcc.sh 11.7 - name: compile test_react (aprox13) run: | diff --git a/.github/workflows/dependencies/dependencies_hip.sh b/.github/workflows/dependencies/dependencies_hip.sh index ab5185ce0a..527379e7e8 100755 --- a/.github/workflows/dependencies/dependencies_hip.sh +++ b/.github/workflows/dependencies/dependencies_hip.sh @@ -40,6 +40,7 @@ echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/r # we should not need to export HIP_PATH=/opt/rocm/hip with those installs +sudo apt-get clean sudo apt-get update # Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#installing-development-packages-for-cross-compilation @@ -56,7 +57,9 @@ sudo apt-get install -y --no-install-recommends \ roctracer-dev \ rocprofiler-dev \ rocrand-dev \ - rocprim-dev + rocfft-dev \ + rocprim-dev \ + rocsparse-dev # hiprand-dev is a new package that does not exist in old versions sudo apt-get install -y --no-install-recommends hiprand-dev || true diff --git a/.github/workflows/dependencies/dependencies_nvcc11.sh b/.github/workflows/dependencies/dependencies_nvcc11.sh deleted file mode 100755 index 143cb0b98f..0000000000 --- a/.github/workflows/dependencies/dependencies_nvcc11.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2020 Axel Huebl -# -# License: BSD-3-Clause-LBNL - -set -eu -o pipefail - -sudo apt-get -qqq update -sudo apt-get install -y \ - build-essential \ - ca-certificates \ - cmake \ - g++ \ - gnupg \ - libopenmpi-dev \ - openmpi-bin \ - pkg-config \ - wget - -sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub -echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64 /" \ - | sudo tee /etc/apt/sources.list.d/cuda.list -sudo apt-get update -sudo apt-get install -y \ - cuda-command-line-tools-11-7 \ - cuda-compiler-11-7 \ - cuda-cupti-dev-11-7 \ - cuda-minimal-build-11-7 \ - cuda-nvml-dev-11-7 \ - cuda-nvtx-11-7 \ - libcurand-dev-11-7 -sudo ln -s cuda-11.7 /usr/local/cuda -