From af2e922782ab86c1cac06a00fcaa34ea1c16839a Mon Sep 17 00:00:00 2001 From: philsippl Date: Thu, 18 Jul 2024 14:17:26 +0000 Subject: [PATCH 1/3] cuda 12.2 --- .github/workflows/test-gpu.yaml | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-gpu.yaml b/.github/workflows/test-gpu.yaml index c2fb219f7..50edac846 100644 --- a/.github/workflows/test-gpu.yaml +++ b/.github/workflows/test-gpu.yaml @@ -31,8 +31,8 @@ jobs: env: DEBIAN_FRONTEND: noninteractive run: | - wget -q https://developer.download.nvidia.com/compute/cuda/12.1.0/local_installers/cuda_12.1.0_530.30.02_linux.run - sudo sh cuda_12.1.0_530.30.02_linux.run --silent --toolkit + wget -q https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run + sudo sh cuda_12.2.0_535.54.03_linux.run --silent --toolkit echo 'export PATH=/usr/local/cuda-12.1/bin:$PATH' >> ~/.bashrc echo 'export LD_LIBRARY_PATH=/usr/local/cuda-12.1/lib64:$LD_LIBRARY_PATH' >> ~/.bashrc source ~/.bashrc diff --git a/Cargo.toml b/Cargo.toml index a1f9796f4..fb5ec2fa3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ bytemuck = "1.16" config = "0.14.0" clap = { version = "4.5.9", features = ["derive", "env"] } cudarc = { git = "https://github.com/rw0x0/cudarc.git", rev = "origin/transmute", features = [ - "cuda-12010", + "cuda-12020", ] } eyre = "0.6.12" float_eq = "1.0.1" From a65150af8c11fca9783fc178036dd564a7411d53 Mon Sep 17 00:00:00 2001 From: philsippl Date: Thu, 18 Jul 2024 15:18:14 +0000 Subject: [PATCH 2/3] up --- .github/workflows/test-gpu.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-gpu.yaml b/.github/workflows/test-gpu.yaml index 50edac846..390b1d976 100644 --- a/.github/workflows/test-gpu.yaml +++ b/.github/workflows/test-gpu.yaml @@ -18,8 +18,8 @@ jobs: uses: actions/cache@v3 id: cache-cuda-nccl with: - path: /usr/local/cuda-12.1 - key: cuda-nccl-${{ runner.os }}-12.1 + path: /usr/local/cuda-12.2 + key: cuda-nccl-${{ runner.os }}-12.2 restore-keys: | cuda-nccl-${{ runner.os }}- @@ -33,10 +33,10 @@ jobs: run: | wget -q https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run sudo sh cuda_12.2.0_535.54.03_linux.run --silent --toolkit - echo 'export PATH=/usr/local/cuda-12.1/bin:$PATH' >> ~/.bashrc - echo 'export LD_LIBRARY_PATH=/usr/local/cuda-12.1/lib64:$LD_LIBRARY_PATH' >> ~/.bashrc + echo 'export PATH=/usr/local/cuda-12.2/bin:$PATH' >> ~/.bashrc + echo 'export LD_LIBRARY_PATH=/usr/local/cuda-12.2/lib64:$LD_LIBRARY_PATH' >> ~/.bashrc source ~/.bashrc - /usr/local/cuda-12.1/bin/nvcc --version + /usr/local/cuda-12.2/bin/nvcc --version wget 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 update @@ -62,9 +62,9 @@ jobs: - name: E2E Tests run: | - export LD_LIBRARY_PATH=/usr/local/cuda-12.1/lib64:$LD_LIBRARY_PATH - export CUDA_HOME=/usr/local/cuda-12.1 - /usr/local/cuda-12.1/bin/nvcc --version + export LD_LIBRARY_PATH=/usr/local/cuda-12.2/lib64:$LD_LIBRARY_PATH + export CUDA_HOME=/usr/local/cuda-12.2 + /usr/local/cuda-12.2/bin/nvcc --version cargo test --release e2e shell: bash env: From cc224d2072b03afdbc22ab69b5c8f0bfd5db4759 Mon Sep 17 00:00:00 2001 From: philsippl Date: Thu, 18 Jul 2024 15:50:41 +0000 Subject: [PATCH 3/3] up --- .github/workflows/test-gpu.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-gpu.yaml b/.github/workflows/test-gpu.yaml index 390b1d976..e57e64ce6 100644 --- a/.github/workflows/test-gpu.yaml +++ b/.github/workflows/test-gpu.yaml @@ -42,7 +42,17 @@ jobs: sudo apt update sudo apt install -y libnccl2 libnccl-dev shell: bash - + + - name: Set up CUDA environment + run: | + echo "/usr/local/cuda-12.2/lib64" | sudo tee /etc/ld.so.conf.d/cuda.conf + sudo ldconfig + export PATH=/usr/local/cuda-12.2/bin:$PATH + export LD_LIBRARY_PATH=/usr/local/cuda-12.2/lib64:$LD_LIBRARY_PATH + echo 'export PATH=/usr/local/cuda-12.2/bin:$PATH' >> $GITHUB_ENV + echo 'export LD_LIBRARY_PATH=/usr/local/cuda-12.2/lib64:$LD_LIBRARY_PATH' >> $GITHUB_ENV + shell: bash + - name: Cache Rust build uses: actions/cache@v3 id: cache-rust @@ -62,8 +72,7 @@ jobs: - name: E2E Tests run: | - export LD_LIBRARY_PATH=/usr/local/cuda-12.2/lib64:$LD_LIBRARY_PATH - export CUDA_HOME=/usr/local/cuda-12.2 + source ~/.bashrc /usr/local/cuda-12.2/bin/nvcc --version cargo test --release e2e shell: bash