Skip to content

Commit

Permalink
CI: Remove redundancy in nvcc dependencies files (#3387)
Browse files Browse the repository at this point in the history
Hi @ax3l, @WeiqunZhang,

I hope you're enjoying your time in Switzerland. :)

I've removed some redundancy around the nvcc dependencies files, mostly
for consistency with the changes I did to the hip dependencies file in
#3341. It should all be pretty self-explanatory.

Cheers,
-Nuno
  • Loading branch information
nmnobre authored Aug 12, 2023
1 parent a12d498 commit 9bceb99
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 92 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ concurrency:
cancel-in-progress: true

jobs:
# Build libamrex and all tests with CUDA 11.0.2 (recent supported)
# Build libamrex and all tests with CUDA 11.2
tests-cuda11:
name: [email protected] [email protected] C++17 Release [tests]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies_nvcc11.sh
.github/workflows/dependencies/dependencies_nvcc.sh 11.2
.github/workflows/dependencies/dependencies_ccache.sh
- name: Set Up Cache
uses: actions/cache@v3
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v3
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies_llvm_cuda11_ubuntu22.sh
.github/workflows/dependencies/dependencies_llvm_cuda11_clang15.sh
.github/workflows/dependencies/dependencies_ccache.sh
- name: Set Up Cache
uses: actions/cache@v3
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
- uses: actions/checkout@v3
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies_nvcc11.sh
.github/workflows/dependencies/dependencies_nvcc.sh 11.2
.github/workflows/dependencies/dependencies_ccache.sh
- name: Set Up Cache
uses: actions/cache@v3
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/dependencies/dependencies_llvm_cuda11_clang15.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash
#
# Copyright 2020-2022 Axel Huebl
#
# License: BSD-3-Clause-LBNL

set -eu -o pipefail

sudo apt-get -qqq update
sudo apt-get install -y \
libunwind-15 \
libunwind-15-dev \
clang-15 \
libc++-15-dev \
libc++abi-15-dev \
libc++1-15 \
libc++abi1-15

.github/workflows/dependencies/dependencies_nvcc.sh 11.7

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ sudo apt-get install -y \
pkg-config \
wget

VERSION_DOTTED=${1-12.0} && VERSION_DASHED=$(sed 's/\./-/' <<< $VERSION_DOTTED)
curl -O https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
sudo dpkg -i cuda-keyring_1.0-1_all.deb
sudo apt-get update
sudo apt-get install -y \
cuda-command-line-tools-11-2 \
cuda-compiler-11-2 \
cuda-cupti-dev-11-2 \
cuda-minimal-build-11-2 \
cuda-nvml-dev-11-2 \
cuda-nvtx-11-2 \
libcurand-dev-11-2
sudo ln -s cuda-11.2 /usr/local/cuda

cuda-command-line-tools-$VERSION_DASHED \
cuda-compiler-$VERSION_DASHED \
cuda-cupti-dev-$VERSION_DASHED \
cuda-minimal-build-$VERSION_DASHED \
cuda-nvml-dev-$VERSION_DASHED \
cuda-nvtx-$VERSION_DASHED \
libcurand-dev-$VERSION_DASHED
sudo ln -s cuda-$VERSION_DOTTED /usr/local/cuda
38 changes: 0 additions & 38 deletions .github/workflows/dependencies/dependencies_nvcc12.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/hypre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies_nvcc11.sh
.github/workflows/dependencies/dependencies_nvcc.sh 11.2
sudo apt-get install -y libcublas-dev-11-2 libcusparse-dev-11-2
.github/workflows/dependencies/dependencies_ccache.sh
- name: Set Up Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Dependencies
if: ${{ env.CODEPLAYTOKEN != '' }}
run: |
.github/workflows/dependencies/dependencies_nvcc12.sh
.github/workflows/dependencies/dependencies_nvcc.sh
.github/workflows/dependencies/dependencies_dpcpp.sh
.github/workflows/dependencies/dependencies_codeplay.sh ${{ env.CODEPLAYTOKEN }}
.github/workflows/dependencies/dependencies_ccache.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sundials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v3
- name: Dependencies
run: |
.github/workflows/dependencies/dependencies_nvcc12.sh
.github/workflows/dependencies/dependencies_nvcc.sh
.github/workflows/dependencies/dependencies_ccache.sh
- name: Set Up Cache
uses: actions/cache@v3
Expand Down

0 comments on commit 9bceb99

Please sign in to comment.