Skip to content

Commit 9856aad

Browse files
adamcavendishadamcavendish
authored
feat(ci): Split Linux CI workflow and add container images pipeline (#188)
Added a new workflow, container_images.yml, to automate building and pushing CI container images to GitHub Container Registry, ensuring consistent environments for CI runs across Linux distributions. Added a dedicated CI workflow for Linux to streamline testing across multiple CUDA and OS configurations. It reuses the images built from container_images.yml workflow to avoid installing CUDA toolkits every time to save time. Key changes: - Matrix configurations for Ubuntu 22/24, RockyLinux 9 with CUDA 12.8.1 - Dockerfiles updated with required dependencies (clang, CUDA toolchains, etc.) to support bindgen and build examples. - Removed redundant CI steps from `rust.yml` now handled in `ci_linux.yml`
1 parent 0f9bc16 commit 9856aad

File tree

9 files changed

+184
-68
lines changed

9 files changed

+184
-68
lines changed

‎.github/workflows/ci_linux.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: CI on Linux
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- "**.md"
7+
push:
8+
paths-ignore:
9+
- "**.md"
10+
env:
11+
RUST_LOG: info
12+
RUST_BACKTRACE: 1
13+
jobs:
14+
build:
15+
name: ${{ matrix.variance.name }}
16+
runs-on: ubuntu-latest
17+
container:
18+
image: ${{ matrix.variance.image }}
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
variance:
23+
# - name: Ubuntu-22.04/CUDA-11.8.0
24+
# image: "ghcr.io/rust-gpu/rust-cuda-ubuntu22-cuda11:latest"
25+
- name: Ubuntu-22.04/CUDA-12.8.1
26+
image: "ghcr.io/rust-gpu/rust-cuda-ubuntu22-cuda12:latest"
27+
- name: Ubuntu-24.04/CUDA-12.8.1
28+
image: "ghcr.io/rust-gpu/rust-cuda-ubuntu24-cuda12:latest"
29+
- name: RockyLinux-9/CUDA-12.8.1
30+
image: "ghcr.io/rust-gpu/rust-cuda-rockylinux9-cuda12:latest"
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v4
34+
- name: Verify CUDA, Rust installation
35+
run: |
36+
nvcc --version
37+
rustup show
38+
- name: Load Rust cache
39+
uses: Swatinem/rust-cache@v2
40+
with:
41+
key: ${{ matrix.variance.name }}
42+
- name: Rustfmt
43+
run: cargo fmt --all -- --check
44+
- name: Clippy
45+
env:
46+
RUSTFLAGS: -Dwarnings
47+
run: cargo clippy --workspace --exclude "optix*" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*" --exclude "cudnn*"
48+
- name: Build
49+
run: cargo build --workspace --exclude "optix*" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*" --exclude "cudnn*"
50+
- name: Check documentation
51+
env:
52+
RUSTDOCFLAGS: -Dwarnings
53+
run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude "optix*" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*" --exclude "cudnn*" --exclude "cust_raw"

‎.github/workflows/container_images.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Build CI Container Images
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
paths:
7+
- ".github/workflows/container_images.yml"
8+
- "container/**"
9+
push:
10+
paths:
11+
- ".github/workflows/container_images.yml"
12+
- "container/**"
13+
env:
14+
REGISTRY: ghcr.io
15+
jobs:
16+
build-images:
17+
name: ${{ matrix.variance.name }}
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: read
21+
packages: write
22+
attestations: write
23+
id-token: write
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
variance:
28+
- name: Ubuntu-22.04/CUDA-11.8.0
29+
image: "${{ github.repository }}-ubuntu22-cuda11"
30+
dockerfile: ./container/ubuntu22-cuda11/Dockerfile
31+
- name: Ubuntu-22.04/CUDA-12.8.1
32+
image: "${{ github.repository }}-ubuntu22-cuda12"
33+
dockerfile: ./container/ubuntu22-cuda12/Dockerfile
34+
- name: Ubuntu-24.04/CUDA-12.8.1
35+
image: "${{ github.repository }}-ubuntu24-cuda12"
36+
dockerfile: ./container/ubuntu24-cuda12/Dockerfile
37+
- name: RockyLinux-9/CUDA-12.8.1
38+
image: "${{ github.repository }}-rockylinux9-cuda12"
39+
dockerfile: ./container/rockylinux9-cuda12/Dockerfile
40+
steps:
41+
- name: Checkout repository
42+
uses: actions/checkout@v4
43+
- name: Log in to the Container registry
44+
uses: docker/login-action@v3
45+
with:
46+
registry: ${{ env.REGISTRY }}
47+
username: ${{ github.actor }}
48+
password: ${{ secrets.GITHUB_TOKEN }}
49+
- name: Extract metadata (tags, labels) for containers
50+
id: meta
51+
uses: docker/metadata-action@v5
52+
with:
53+
images: ${{ env.REGISTRY }}/${{ matrix.variance.image }}
54+
tags: |
55+
type=ref,event=branch
56+
type=sha,format=short
57+
type=raw,value=latest
58+
- name: Set up Docker Buildx
59+
uses: docker/setup-buildx-action@v3
60+
- name: Build and push container images
61+
id: push
62+
uses: docker/build-push-action@v6
63+
with:
64+
context: .
65+
file: ${{ matrix.variance.dockerfile }}
66+
tags: ${{ steps.meta.outputs.tags }}
67+
labels: ${{ steps.meta.outputs.labels }}
68+
push: ${{ github.event_name != 'pull_request' }}
69+
- name: Generate artifact attestation
70+
uses: actions/attest-build-provenance@v2
71+
with:
72+
subject-name: ${{ env.REGISTRY }}/${{ matrix.variance.image }}
73+
subject-digest: ${{ steps.push.outputs.digest }}
74+
push-to-registry: true

‎.github/workflows/rust.yml

+1-53
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
include:
25-
- os: ubuntu-20.04
26-
target: x86_64-unknown-linux-gnu
27-
cuda: "11.2.2"
28-
linux-local-args: ["--toolkit"]
29-
sub-packages: []
30-
- os: ubuntu-24.04
31-
target: x86_64-unknown-linux-gnu
32-
cuda: "12.8.1"
33-
linux-local-args: ["--toolkit"]
34-
sub-packages: []
35-
- os: windows-latest
36-
target: x86_64-pc-windows-msvc
37-
cuda: "11.2.2"
38-
linux-local-args: []
39-
sub-packages: ["nvcc", "nvrtc", "nvrtc_dev", "cudart", "cublas", "cublas_dev", "curand", "curand_dev"]
4025
- os: windows-latest
4126
target: x86_64-pc-windows-msvc
4227
cuda: "12.8.1"
@@ -61,12 +46,7 @@ jobs:
6146
- name: Verify CUDA installation
6247
run: nvcc --version
6348

64-
- name: List CUDA_PATH files (Linux)
65-
if: runner.os == 'Linux'
66-
run: find "$CUDA_PATH" -type f
67-
68-
- name: List CUDA_PATH files (Windows)
69-
if: runner.os == 'Windows'
49+
- name: List CUDA_PATH files
7050
shell: pwsh
7151
run: Get-ChildItem -Path $env:CUDA_PATH -Recurse | ForEach-Object { $_.FullName }
7252

@@ -77,50 +57,18 @@ jobs:
7757
- name: Add rustup components
7858
run: rustup component add rustfmt clippy
7959

80-
- name: Install dependencies for LLVM 7
81-
if: matrix.os == 'ubuntu-24.04'
82-
run: |
83-
wget -O libffi7.deb http://security.ubuntu.com/ubuntu/pool/universe/libf/libffi7/libffi7_3.3-5ubuntu1_amd64.deb
84-
sudo apt-get update
85-
sudo apt-get install -y ./*.deb
86-
sudo apt-get install -y liblzma-dev
87-
sudo apt-get install -y libssl-dev
88-
sudo apt-get install -y libcurl4-openssl-dev
89-
90-
- name: Install LLVM 7
91-
if: contains(matrix.os, 'ubuntu')
92-
run: |
93-
mkdir -p ~/llvm7 && cd ~/llvm7
94-
wget http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7_7.0.1-12_amd64.deb \
95-
http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-dev_7.0.1-12_amd64.deb \
96-
http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/libllvm7_7.0.1-12_amd64.deb \
97-
http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7-runtime_7.0.1-12_amd64.deb
98-
sudo apt-get update
99-
sudo apt-get install -y ./*.deb
100-
sudo ln -s /usr/bin/llvm-config-7 /usr/local/bin/llvm-config
101-
10260
- name: Load Rust Cache
10361
uses: Swatinem/[email protected]
10462
with:
10563
key: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.cuda }}
10664

107-
- name: Rustfmt
108-
if: contains(matrix.os, 'ubuntu')
109-
run: cargo fmt --all -- --check
110-
11165
- name: Build
11266
run: cargo build --workspace --exclude "optix*" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*" --exclude "cudnn*"
11367

11468
# Don't currently test because many tests rely on the system having a CUDA GPU
11569
# - name: Test
11670
# run: cargo test --workspace
11771

118-
- name: Clippy
119-
if: contains(matrix.os, 'ubuntu')
120-
env:
121-
RUSTFLAGS: -Dwarnings
122-
run: cargo clippy --workspace --exclude "optix*" --exclude "path_tracer" --exclude "denoiser" --exclude "add" --exclude "ex*" --exclude "cudnn*"
123-
12472
- name: Check documentation
12573
env:
12674
RUSTDOCFLAGS: -Dwarnings

‎container/rockylinux9-cuda12/Dockerfile

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
FROM nvidia/cuda:12.8.1-cudnn-devel-rockylinux9
22

33
RUN dnf -y install \
4+
clang \
45
openssl-devel \
56
pkgconfig \
67
redhat-rpm-config \
78
which \
89
xz \
910
zlib-devel
1011

12+
# Needed to build `path_tracer`, `optix/ex03_window` example
13+
RUN dnf -y install \
14+
cmake \
15+
fontconfig-devel \
16+
libX11-devel \
17+
libXcursor-devel \
18+
libXi-devel \
19+
libXrandr-devel
20+
1121
# Get LLVM 7 & libffi.so.6
1222
WORKDIR /data/llvm7
1323
RUN curl -sSf -L -O https://dl.fedoraproject.org/pub/epel/9/Everything/x86_64/Packages/l/libffi3.1-3.1-36.el9.x86_64.rpm
@@ -23,9 +33,10 @@ RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
2333
ENV PATH="/root/.cargo/bin:${PATH}"
2434

2535
# Setup the workspace
26-
ADD . /data/Rust-CUDA
36+
ADD ./rust-toolchain.toml /data/Rust-CUDA/
2737
WORKDIR /data/Rust-CUDA
2838
RUN rustup show
39+
RUN rm -f "rust-toolchain.toml"
2940

3041
ENV LLVM_LINK_STATIC=1
3142
ENV RUST_LOG=info

‎container/ubuntu20-cuda12/Dockerfile renamed to ‎container/ubuntu22-cuda11/Dockerfile

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
FROM nvidia/cuda:12.8.1-cudnn-devel-ubuntu20.04
1+
FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
22

33
RUN apt-get update
44
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
55
build-essential \
66
curl \
7+
clang \
78
libssl-dev \
89
libtinfo-dev \
910
pkg-config \
1011
xz-utils \
1112
zlib1g-dev
1213

14+
# Needed to build `path_tracer`, `optix/ex03_window` example
15+
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
16+
cmake \
17+
libfontconfig-dev \
18+
libx11-xcb-dev \
19+
libxcursor-dev \
20+
libxi-dev \
21+
libxinerama-dev \
22+
libxrandr-dev
23+
1324
# Get LLVM 7
1425
WORKDIR /data/llvm7
1526
RUN curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7_7.0.1-12_amd64.deb
@@ -24,9 +35,10 @@ RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
2435
ENV PATH="/root/.cargo/bin:${PATH}"
2536

2637
# Setup the workspace
27-
ADD . /data/Rust-CUDA
38+
ADD ./rust-toolchain.toml /data/Rust-CUDA/
2839
WORKDIR /data/Rust-CUDA
2940
RUN rustup show
41+
RUN rm -f "rust-toolchain.toml"
3042

3143
ENV LLVM_LINK_STATIC=1
3244
ENV RUST_LOG=info

‎container/ubuntu20-cuda11/Dockerfile renamed to ‎container/ubuntu22-cuda12/Dockerfile

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04
1+
FROM nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04
22

33
RUN apt-get update
44
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
55
build-essential \
66
curl \
7+
clang \
78
libssl-dev \
89
libtinfo-dev \
910
pkg-config \
1011
xz-utils \
1112
zlib1g-dev
1213

14+
# Needed to build `path_tracer`, `optix/ex03_window` example
15+
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
16+
cmake \
17+
libfontconfig-dev \
18+
libx11-xcb-dev \
19+
libxcursor-dev \
20+
libxi-dev \
21+
libxinerama-dev \
22+
libxrandr-dev
23+
1324
# Get LLVM 7
1425
WORKDIR /data/llvm7
1526
RUN curl -sSf -L -O http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-7/llvm-7_7.0.1-12_amd64.deb
@@ -24,9 +35,10 @@ RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
2435
ENV PATH="/root/.cargo/bin:${PATH}"
2536

2637
# Setup the workspace
27-
ADD . /data/Rust-CUDA
38+
ADD ./rust-toolchain.toml /data/Rust-CUDA/
2839
WORKDIR /data/Rust-CUDA
2940
RUN rustup show
41+
RUN rm -f "rust-toolchain.toml"
3042

3143
ENV LLVM_LINK_STATIC=1
3244
ENV RUST_LOG=info

‎container/ubuntu24-cuda12/Dockerfile

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,24 @@ FROM nvidia/cuda:12.8.1-cudnn-devel-ubuntu24.04
33
RUN apt-get update
44
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
55
build-essential \
6+
clang \
67
curl \
78
libssl-dev \
89
libtinfo-dev \
910
pkg-config \
1011
xz-utils \
1112
zlib1g-dev
1213

14+
# Needed to build `path_tracer`, `optix/ex03_window` example
15+
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \
16+
cmake \
17+
libfontconfig-dev \
18+
libx11-xcb-dev \
19+
libxcursor-dev \
20+
libxi-dev \
21+
libxinerama-dev \
22+
libxrandr-dev
23+
1324
# Get LLVM 7 & libffi7
1425
WORKDIR /data/llvm7
1526
RUN curl -sSf -L -O http://security.ubuntu.com/ubuntu/pool/universe/libf/libffi7/libffi7_3.3-5ubuntu1_amd64.deb
@@ -25,9 +36,10 @@ RUN curl -sSf -L https://sh.rustup.rs | bash -s -- -y
2536
ENV PATH="/root/.cargo/bin:${PATH}"
2637

2738
# Setup the workspace
28-
ADD . /data/Rust-CUDA
39+
ADD ./rust-toolchain.toml /data/Rust-CUDA/
2940
WORKDIR /data/Rust-CUDA
3041
RUN rustup show
42+
RUN rm -f "rust-toolchain.toml"
3143

3244
ENV LLVM_LINK_STATIC=1
3345
ENV RUST_LOG=info

‎rust-toolchain

-9
This file was deleted.

‎rust-toolchain.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "nightly-2025-03-02"
3+
components = ["clippy", "llvm-tools-preview", "rust-src", "rustc-dev", "rustfmt"]

0 commit comments

Comments
 (0)