Skip to content

Commit 08c6bcd

Browse files
committed
Simplify CUDA setup with existing scripts.
1 parent 706f873 commit 08c6bcd

File tree

5 files changed

+13
-51
lines changed

5 files changed

+13
-51
lines changed

.github/workflows/linux-build-base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
GTest_SOURCE: BUNDLED
4040
simdjson_SOURCE: BUNDLED
4141
xsimd_SOURCE: BUNDLED
42-
CUDA_VERSION: "12.4"
42+
CUDA_VERSION: "12.8"
4343
USE_CLANG: "${{ inputs.use-clang && 'true' || 'false' }}"
4444
steps:
4545
- uses: actions/checkout@v4

scripts/adapters.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ FROM $image
1717

1818
COPY scripts/setup-helper-functions.sh /
1919
COPY scripts/setup-adapters.sh /
20-
COPY scripts/setup-cuda.sh /
20+
COPY scripts/setup-centos9.sh /
2121
RUN mkdir build && \
2222
( \
2323
cd build && \
2424
source /opt/rh/gcc-toolset-12/enable && \
2525
bash /setup-adapters.sh && \
26-
bash /setup-cuda.sh \
26+
bash /setup-centos9.sh install_cuda \
2727
) && \
2828
rm -rf build && dnf remove -y conda && dnf clean all
2929

scripts/setup-centos9.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,11 @@ function install_cuda {
232232
# See https://developer.nvidia.com/cuda-downloads
233233
dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo
234234
local dashed="$(echo $1 | tr '.' '-')"
235-
dnf install -y cuda-nvcc-$dashed cuda-cudart-devel-$dashed cuda-nvrtc-devel-$dashed cuda-driver-devel-$dashed
235+
dnf install -y \
236+
cuda-compat-$dashed \
237+
cuda-driver-devel-$dashed \
238+
cuda-minimal-build-$dashed \
239+
cuda-nvrtc-devel-$dashed
236240
}
237241

238242
function install_velox_deps {

scripts/setup-cuda.sh

-46
This file was deleted.

scripts/setup-ubuntu.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ function install_cuda {
291291
$SUDO apt update
292292
fi
293293
local dashed="$(echo $1 | tr '.' '-')"
294-
$SUDO apt install -y cuda-nvcc-$dashed cuda-cudart-dev-$dashed cuda-nvrtc-dev-$dashed cuda-driver-dev-$dashed
294+
$SUDO apt install -y \
295+
cuda-compat-$dashed \
296+
cuda-driver-dev-$dashed \
297+
cuda-minimal-build-$dashed \
298+
cuda-nvrtc-dev-$dashed
295299
}
296300

297301
function install_velox_deps {

0 commit comments

Comments
 (0)