Skip to content

Commit cb4809b

Browse files
benz0libenz0li
committed
Merge branch 'main' into freeze-version
2 parents 5181eea + 9eceea5 commit cb4809b

9 files changed

Lines changed: 14 additions & 100 deletions

File tree

‎CUDA.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ docker build \
6161
--build-arg BASE_IMAGE=ubuntu \
6262
--build-arg BASE_IMAGE_TAG=24.04 \
6363
--build-arg CUDA_IMAGE=nvidia/cuda \
64-
--build-arg CUDA_VERSION=13.4.2 \
64+
--build-arg CUDA_VERSION=13.4.3 \
6565
--build-arg CUDA_IMAGE_SUBTAG=runtime-ubuntu24.04 \
66-
--build-arg PYTHON_VERSION=3.14.7 \
66+
--build-arg PYTHON_VERSION=3.15.0 \
6767
-t cuda/python/ver \
6868
-f ver/latest.Dockerfile .
6969
```

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ To install docker, follow the instructions for your platform:
6868

6969
```bash
7070
docker build \
71-
--build-arg PYTHON_VERSION=3.14.7 \
71+
--build-arg PYTHON_VERSION=3.15.0 \
7272
-t python/ver \
7373
-f ver/latest.Dockerfile .
7474
```

‎base/.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
PYTHON_VERSION: "3.14.7"
2+
PYTHON_VERSION: "3.15.0"
33
TAG_VERSION_MAJ_MIN: "false"
44
TAG_VERSION_MAJ: "false"
55

‎base/latest.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=debian
22
ARG BASE_IMAGE_TAG=13
33
ARG BUILD_ON_IMAGE=glcr.b-data.ch/python/ver
44
ARG PYTHON_VERSION
5-
ARG NEOVIM_VERSION=0.12.5
5+
ARG NEOVIM_VERSION=0.12.6
66
ARG GIT_VERSION=2.56.0
77
ARG GIT_LFS_VERSION=3.8.0
88
ARG PANDOC_VERSION=3.10

‎cuda/latest.Dockerfile‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ ARG CUDNN_CUDA_VERSION_MAJ_MIN
55
ARG CUDNN_CUDA_VERSION_MAJ_MIN_AMD64=${CUDNN_CUDA_VERSION_MAJ_MIN}
66
ARG CUDNN_CUDA_VERSION_MAJ_MIN_ARM64=${CUDNN_CUDA_VERSION_MAJ_MIN}
77

8-
ARG NCCL_VERSION
9-
ARG NCCL_VERSION_AMD64=${NCCL_VERSION}
10-
ARG NCCL_VERSION_ARM64=${NCCL_VERSION}
11-
ARG NCCL_CUDA_VERSION_MAJ_MIN
12-
ARG NCCL_CUDA_VERSION_MAJ_MIN_AMD64=${NCCL_CUDA_VERSION_MAJ_MIN}
13-
ARG NCCL_CUDA_VERSION_MAJ_MIN_ARM64=${NCCL_CUDA_VERSION_MAJ_MIN}
14-
158
ARG BUILD_ON_IMAGE
169
ARG CUDNN_VERSION_MAJ=${CUDNN_VERSION%%.*}
1710
ARG CUDNN_VERSION_MAJ=${CUDNN_VERSION_MAJ:-${CUDNN_VERSION_AMD64%%.*}}
@@ -23,47 +16,30 @@ FROM ${BUILD_ON_IMAGE} AS cudnn8-runtime-amd64
2316
ARG CUDNN_VERSION_AMD64
2417
ARG CUDNN_CUDA_VERSION_MAJ_MIN_AMD64
2518

26-
ARG NCCL_VERSION_AMD64
27-
ARG NCCL_CUDA_VERSION_MAJ_MIN_AMD64
28-
2919
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_AMD64}"
3020

3121
ENV CUDNN_VERSION=${CUDNN_VERSION_AMD64}
3222
ENV NV_CUDNN_PACKAGE_VERSION=${CUDNN_VERSION_AMD64}
3323
ENV NV_CUDNN_PACKAGE_NAME=libcudnn${NV_CUDNN_PACKAGE_VERSION%%.*}
3424
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_AMD64}"
3525

36-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
37-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
38-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
39-
4026
FROM ${BUILD_ON_IMAGE} AS cudnn8-runtime-arm64
4127

4228
ARG CUDNN_VERSION_ARM64
4329
ARG CUDNN_CUDA_VERSION_MAJ_MIN_ARM64
4430

45-
ARG NCCL_VERSION_ARM64
46-
ARG NCCL_CUDA_VERSION_MAJ_MIN_ARM64
47-
4831
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_ARM64}"
4932

5033
ENV CUDNN_VERSION=${CUDNN_VERSION_ARM64}
5134
ENV NV_CUDNN_PACKAGE_VERSION=${CUDNN_VERSION_ARM64}
5235
ENV NV_CUDNN_PACKAGE_NAME=libcudnn${NV_CUDNN_PACKAGE_VERSION%%.*}
5336
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_ARM64}"
5437

55-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
56-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
57-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
58-
5938
FROM ${BUILD_ON_IMAGE} AS cudnn8-devel-amd64
6039

6140
ARG CUDNN_VERSION_AMD64
6241
ARG CUDNN_CUDA_VERSION_MAJ_MIN_AMD64
6342

64-
ARG NCCL_VERSION_AMD64
65-
ARG NCCL_CUDA_VERSION_MAJ_MIN_AMD64
66-
6743
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_AMD64}"
6844

6945
ENV CUDNN_VERSION=${CUDNN_VERSION_AMD64}
@@ -74,22 +50,11 @@ ENV NV_CUDNN_DEV_PACKAGE_NAME=libcudnn${NV_CUDNN_DEV_PACKAGE_VERSION%%.*}-dev
7450
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_AMD64}"
7551
ENV NV_CUDNN_DEV_PACKAGE="${NV_CUDNN_DEV_PACKAGE_NAME}=${NV_CUDNN_DEV_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_AMD64}"
7652

77-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
78-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
79-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
80-
81-
ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-dev
82-
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
83-
ENV NV_LIBNCCL_DEV_PACKAGE="${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
84-
8553
FROM ${BUILD_ON_IMAGE} AS cudnn8-devel-arm64
8654

8755
ARG CUDNN_VERSION_ARM64
8856
ARG CUDNN_CUDA_VERSION_MAJ_MIN_ARM64
8957

90-
ARG NCCL_VERSION_ARM64
91-
ARG NCCL_CUDA_VERSION_MAJ_MIN_ARM64
92-
9358
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_ARM64}"
9459

9560
ENV CUDNN_VERSION=${CUDNN_VERSION_ARM64}
@@ -100,60 +65,35 @@ ENV NV_CUDNN_DEV_PACKAGE_NAME=libcudnn${NV_CUDNN_DEV_PACKAGE_VERSION%%.*}-dev
10065
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_ARM64}"
10166
ENV NV_CUDNN_DEV_PACKAGE="${NV_CUDNN_DEV_PACKAGE_NAME}=${NV_CUDNN_DEV_PACKAGE_VERSION}-1+cuda${CUDNN_CUDA_VERSION_MAJ_MIN_ARM64}"
10267

103-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
104-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
105-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
106-
107-
ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-dev
108-
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
109-
ENV NV_LIBNCCL_DEV_PACKAGE="${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
110-
11168
FROM ${BUILD_ON_IMAGE} AS cudnn9-runtime-amd64
11269

11370
ARG CUDNN_VERSION_AMD64
11471
ARG CUDNN_CUDA_VERSION_MAJ_MIN_AMD64
11572

116-
ARG NCCL_VERSION_AMD64
117-
ARG NCCL_CUDA_VERSION_MAJ_MIN_AMD64
118-
11973
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_AMD64}"
12074

12175
ENV CUDNN_VERSION=${CUDNN_VERSION_AMD64}
12276
ENV NV_CUDNN_PACKAGE_VERSION=${CUDNN_VERSION_AMD64}
12377
ENV NV_CUDNN_PACKAGE_NAME=libcudnn${NV_CUDNN_PACKAGE_VERSION%%.*}-cuda-${CUDNN_CUDA_VERSION_MAJ_MIN_AMD64%%.*}
12478
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1"
12579

126-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
127-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
128-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
129-
13080
FROM ${BUILD_ON_IMAGE} AS cudnn9-runtime-arm64
13181

13282
ARG CUDNN_VERSION_ARM64
13383
ARG CUDNN_CUDA_VERSION_MAJ_MIN_ARM64
13484

135-
ARG NCCL_VERSION_ARM64
136-
ARG NCCL_CUDA_VERSION_MAJ_MIN_ARM64
137-
13885
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_ARM64}"
13986

14087
ENV CUDNN_VERSION=${CUDNN_VERSION_ARM64}
14188
ENV NV_CUDNN_PACKAGE_VERSION=${CUDNN_VERSION_ARM64}
14289
ENV NV_CUDNN_PACKAGE_NAME=libcudnn${NV_CUDNN_PACKAGE_VERSION%%.*}-cuda-${CUDNN_CUDA_VERSION_MAJ_MIN_ARM64%%.*}
14390
ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1"
14491

145-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
146-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
147-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
148-
14992
FROM ${BUILD_ON_IMAGE} AS cudnn9-devel-amd64
15093

15194
ARG CUDNN_VERSION_AMD64
15295
ARG CUDNN_CUDA_VERSION_MAJ_MIN_AMD64
15396

154-
ARG NCCL_VERSION_AMD64
155-
ARG NCCL_CUDA_VERSION_MAJ_MIN_AMD64
156-
15797
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_AMD64}"
15898

15999
ENV CUDNN_VERSION=${CUDNN_VERSION_AMD64}
@@ -167,22 +107,11 @@ ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1"
167107
ENV NV_CUDNN_DEV_PACKAGE="${NV_CUDNN_DEV_PACKAGE_NAME}=${NV_CUDNN_DEV_PACKAGE_VERSION}-1"
168108
ENV NV_CUDNN_HEADERS_PACKAGE="${NV_CUDNN_HEADERS_PACKAGE_NAME}=${NV_CUDNN_HEADERS_PACKAGE_VERSION}-1"
169109

170-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
171-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
172-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
173-
174-
ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-dev
175-
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=${NCCL_VERSION_AMD64}
176-
ENV NV_LIBNCCL_DEV_PACKAGE="${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_AMD64}"
177-
178110
FROM ${BUILD_ON_IMAGE} AS cudnn9-devel-arm64
179111

180112
ARG CUDNN_VERSION_ARM64
181113
ARG CUDNN_CUDA_VERSION_MAJ_MIN_ARM64
182114

183-
ARG NCCL_VERSION_ARM64
184-
ARG NCCL_CUDA_VERSION_MAJ_MIN_ARM64
185-
186115
LABEL com.nvidia.cudnn.version="${CUDNN_VERSION_ARM64}"
187116

188117
ENV CUDNN_VERSION=${CUDNN_VERSION_ARM64}
@@ -196,14 +125,6 @@ ENV NV_CUDNN_PACKAGE="${NV_CUDNN_PACKAGE_NAME}=${NV_CUDNN_PACKAGE_VERSION}-1"
196125
ENV NV_CUDNN_DEV_PACKAGE="${NV_CUDNN_DEV_PACKAGE_NAME}=${NV_CUDNN_DEV_PACKAGE_VERSION}-1"
197126
ENV NV_CUDNN_HEADERS_PACKAGE="${NV_CUDNN_HEADERS_PACKAGE_NAME}=${NV_CUDNN_HEADERS_PACKAGE_VERSION}-1"
198127

199-
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl2
200-
ENV NV_LIBNCCL_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
201-
ENV NV_LIBNCCL_PACKAGE="${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
202-
203-
ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-dev
204-
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=${NCCL_VERSION_ARM64}
205-
ENV NV_LIBNCCL_DEV_PACKAGE="${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}-1+cuda${NCCL_CUDA_VERSION_MAJ_MIN_ARM64}"
206-
207128
FROM cudnn${CUDNN_VERSION_MAJ}-${CUDA_IMAGE_FLAVOR}-${TARGETARCH}
208129

209130
ARG DEBIAN_FRONTEND=noninteractive
@@ -255,13 +176,5 @@ RUN cpuBlasLib="$(update-alternatives --query \
255176
${NV_CUDNN_PACKAGE_NAME} \
256177
${NV_CUDNN_DEV_PACKAGE_NAME} \
257178
${NV_CUDNN_HEADERS_PACKAGE_NAME} \
258-
## Install NCCL
259-
&& apt-get -y install --no-install-recommends \
260-
${NV_LIBNCCL_PACKAGE} \
261-
${NV_LIBNCCL_DEV_PACKAGE} \
262-
## Keep apt from auto upgrading the NCCL package
263-
&& apt-mark hold \
264-
${NV_LIBNCCL_PACKAGE_NAME} \
265-
${NV_LIBNCCL_DEV_PACKAGE_NAME} \
266179
## Clean up
267180
&& rm -rf /var/lib/apt/lists/*

‎scipy/.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
PYTHON_VERSION: "3.14.7"
2+
PYTHON_VERSION: "3.15.0"
33
CTAN_REPO_BUILD_LATEST: "https://mirror.init7.net/ctan/systems/texlive/tlnet"
44
TAG_VERSION_MAJ_MIN: "false"
55
TAG_VERSION_MAJ: "false"

‎scipy/latest.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BUILD_ON_IMAGE=glcr.b-data.ch/python/base
22
ARG PYTHON_VERSION
3-
ARG QUARTO_VERSION=1.10.18
3+
ARG QUARTO_VERSION=1.10.19
44
ARG CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
55

66
FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:$PYTHON_VERSION}

‎ver/.gitlab-ci.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
variables:
2-
PYTHON_VERSION: "3.14.7"
3-
CUDA_VERSION: "13.4.2"
2+
PYTHON_VERSION: "3.15.0"
3+
CUDA_VERSION: "13.4.3"
44
CUDNN_VERSION_AMD64: "9.27.0.42"
55
CUDNN_VERSION_ARM64: "9.27.0.42"
66
CUDNN_CUDA_VERSION_MAJ_MIN_AMD64: "13.4"
77
CUDNN_CUDA_VERSION_MAJ_MIN_ARM64: "13.4"
8-
NCCL_VERSION_AMD64: "2.31.2"
9-
NCCL_VERSION_ARM64: "2.31.2"
10-
NCCL_CUDA_VERSION_MAJ_MIN_AMD64: "13.4"
11-
NCCL_CUDA_VERSION_MAJ_MIN_ARM64: "13.4"
128
TAG_VERSION_MAJ_MIN: "false"
139
TAG_VERSION_MAJ: "false"
1410

‎ver/latest.Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,18 @@ RUN apt-get update \
5656
libncurses-dev \
5757
${BLAS} \
5858
libreadline-dev \
59+
libsqlite3-dev \
5960
locales \
6061
netbase \
6162
pkg-config \
6263
tzdata \
6364
unzip \
6465
zip \
6566
zlib1g-dev \
67+
&& if ([ "${BASE_IMAGE%:*}" = "debian" ] && dpkg --compare-versions "${BASE_IMAGE#*:}" ge "13") \
68+
|| ([ "${BASE_IMAGE%:*}" = "ubuntu" ] && dpkg --compare-versions "${BASE_IMAGE#*:}" ge "26"); then \
69+
apt-get install -y --no-install-recommends libmpdec-dev; \
70+
fi \
6671
&& if [ -z "$PYTHON_VERSION" ]; then \
6772
## Install system Python
6873
apt-get -y install --no-install-recommends \

0 commit comments

Comments
 (0)