Skip to content

Commit 5a6f767

Browse files
committed
Fix container workflow.
[ci skip]
1 parent b4d4284 commit 5a6f767

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

.github/workflows/Container.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727

2828
strategy:
2929
matrix:
30-
julia: ["1.10", "1.11"]
31-
cuda: ["11.8", "12.6"]
30+
julia: ["1.11", "1.12"]
31+
cuda: ["11.8", "12.9", "13.2"]
3232
platform: ["linux/amd64"]
3333
os: ["ubuntu-24.04"]
3434
include:
35-
- julia: "1.11"
36-
cuda: "12.6"
35+
- julia: "1.12"
36+
cuda: "13.2"
3737
platform: "linux/amd64"
3838
os: "ubuntu-24.04"
3939
default: true
40-
- julia: "1.11"
41-
cuda: "12.6"
40+
- julia: "1.12"
41+
cuda: "13.2"
4242
platform: "linux/arm64"
4343
os: "ubuntu-24.04-arm"
4444
default: true
@@ -48,12 +48,8 @@ jobs:
4848
steps:
4949
- name: Check out the repo
5050
uses: actions/checkout@v6
51-
52-
- name: Check out the package
53-
uses: actions/checkout@v6
5451
with:
55-
ref: ${{ inputs.ref || github.ref_name }}
56-
path: package
52+
ref: ${{ inputs.tag || github.ref_name }}
5753

5854
- name: Get package spec
5955
id: pkg
@@ -69,7 +65,7 @@ jobs:
6965
echo "name=dev" >> $GITHUB_OUTPUT
7066
fi
7167
72-
VERSION=$(grep "^version = " package/Project.toml | cut -d'"' -f2)
68+
VERSION=$(grep "^version = " Project.toml | cut -d'"' -f2)
7369
echo "version=$VERSION" >> $GITHUB_OUTPUT
7470
7571
- name: Get CUDA major version
@@ -115,12 +111,12 @@ jobs:
115111
with:
116112
context: .
117113
push: true
118-
provenance: false # the build fetches the repo again, so provenance tracking is not useful
114+
provenance: false
119115
platforms: ${{ matrix.platform }}
120116
tags: ${{ steps.meta.outputs.tags }}
121117
labels: ${{ steps.meta.outputs.labels }}
122118
build-args: |
123119
JULIA_VERSION=${{ matrix.julia }}
124120
CUDA_VERSION=${{ matrix.cuda }}
125-
PACKAGE_SPEC=CUDA#${{ steps.pkg.outputs.ref }}
121+
PACKAGE_REF=${{ steps.pkg.outputs.ref }}
126122
JULIA_CPU_TARGET=${{ steps.cpu_target.outputs.target }}

Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV JULIA_CPU_TARGET=${JULIA_CPU_TARGET}
1515

1616
ARG CUDA_VERSION=12.6
1717

18-
ARG PACKAGE_SPEC=CUDA
18+
ARG PACKAGE_REF=master
1919

2020
LABEL org.opencontainers.image.authors="Tim Besard <tim.besard@gmail.com>" \
2121
org.opencontainers.image.description="A CUDA.jl container with CUDA ${CUDA_VERSION} and Julia ${JULIA_VERSION}" \
@@ -54,8 +54,17 @@ RUN julia -e '#= make bundled depot non-writable (JuliaLang/Pkg.jl#4120) =# \
5454
find -exec touch -h -d "@0" {} + && \
5555
touch -h -d "@0" /usr/local/share
5656

57-
# install CUDA.jl itself
58-
RUN julia -e 'using Pkg; pkg"add '${PACKAGE_SPEC}'"; \
57+
# install CUDA.jl and all subpackages
58+
ARG PACKAGE_REF
59+
RUN julia -e 'using Pkg; \
60+
url = "https://github.com/JuliaGPU/CUDA.jl.git"; \
61+
rev = ENV["PACKAGE_REF"]; \
62+
Pkg.add([PackageSpec(; url, rev, subdir) for subdir in \
63+
["CUDACore", \
64+
"lib/cublas", "lib/cusparse", "lib/cusolver", \
65+
"lib/cufft", "lib/curand", \
66+
"lib/cudnn", "lib/cutensor", "lib/cutensornet", "lib/custatevec", \
67+
""]]); \
5968
using CUDA; CUDA.precompile_runtime()' && \
6069
#= remove useless stuff =# \
6170
cd /usr/local/share/julia && \

0 commit comments

Comments
 (0)