Skip to content

Commit e07e057

Browse files
committed
Merge branch 'main' into freeze-version
2 parents d3875a9 + eeae8d8 commit e07e057

File tree

6 files changed

+32
-33
lines changed

6 files changed

+32
-33
lines changed

CUDA.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ docker build \
6262
--build-arg BASE_IMAGE=ubuntu \
6363
--build-arg BASE_IMAGE_TAG=22.04 \
6464
--build-arg CUDA_IMAGE=nvidia/cuda \
65-
--build-arg CUDA_VERSION=12.6.3 \
65+
--build-arg CUDA_VERSION=12.8.0 \
6666
--build-arg CUDA_IMAGE_SUBTAG=runtime-ubuntu22.04 \
6767
--build-arg PYTHON_VERSION=3.13.1 \
6868
-t cuda/python/ver \
@@ -74,7 +74,7 @@ docker build \
7474
```bash
7575
docker build \
7676
--build-arg BUILD_ON_IMAGE=cuda/python/ver \
77-
--build-arg CUDNN_VERSION=9.5.1.17 \
77+
--build-arg CUDNN_VERSION=9.7.0.66 \
7878
--build-arg CUDNN_CUDA_VERSION_MAJ_MIN=12.0 \
7979
--build-arg CUDA_IMAGE_FLAVOR=runtime \
8080
-t cuda/python/ver \
@@ -131,4 +131,4 @@ docker run -it --rm \
131131
* [`glcr.b-data.ch/cuda/python/base`](https://gitlab.b-data.ch/cuda/python/base/container_registry)
132132
* [`glcr.b-data.ch/cuda/python/scipy`](https://gitlab.b-data.ch/cuda/python/scipy/container_registry)
133133
134-
See [Notes](NOTES.md) for tweaks.
134+
See [CUDA Notes](CUDA_NOTES.md) for tweaks.

CUDA_NOTES.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Notes on CUDA
2+
3+
The CUDA and OS versions are selected as follows:
4+
5+
* CUDA: The lastest version that has image flavour `devel` including cuDNN
6+
available.
7+
* OS: The latest version that has TensortRT libraries for `amd64` available.
8+
:information_source: It is taking quite a long time for these to be available
9+
for `arm64`.
10+
11+
## Tweaks
12+
13+
### Environment variables
14+
15+
**Versions**
16+
17+
* `CUDA_VERSION`
18+
19+
**Miscellaneous**
20+
21+
* `CUDA_IMAGE`: The CUDA image it is derived from.

NOTES.md

-22
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,3 @@ are installed.
3535
The latest Python version is installed at `/usr/local/bin`, regardless of
3636
whether all packages – such as numba, tensorflow, etc. – are already compatible
3737
with it.
38-
39-
# Additional notes on CUDA
40-
41-
The CUDA and OS versions are selected as follows:
42-
43-
* CUDA: The lastest version that has image flavour `devel` including cuDNN
44-
available.
45-
* OS: The latest version that has TensortRT libraries for `amd64` available.
46-
:information_source: It is taking quite a long time for these to be available
47-
for `arm64`.
48-
49-
## Tweaks
50-
51-
### Environment variables
52-
53-
**Versions**
54-
55-
* `CUDA_VERSION`
56-
57-
**Miscellaneous**
58-
59-
* `CUDA_IMAGE`: The CUDA image it is derived from.

base/latest.Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARG BASE_IMAGE=debian
22
ARG BASE_IMAGE_TAG=12
33
ARG BUILD_ON_IMAGE=glcr.b-data.ch/python/ver
44
ARG PYTHON_VERSION
5-
ARG NEOVIM_VERSION=0.10.2
6-
ARG GIT_VERSION=2.47.1
7-
ARG GIT_LFS_VERSION=3.6.0
5+
ARG NEOVIM_VERSION=0.10.4
6+
ARG GIT_VERSION=2.48.1
7+
ARG GIT_LFS_VERSION=3.6.1
88
ARG PANDOC_VERSION=3.4
99

1010
FROM glcr.b-data.ch/neovim/nvsi:${NEOVIM_VERSION} AS nvsi

scipy/latest.Dockerfile

+2-2
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.6.39
3+
ARG QUARTO_VERSION=1.6.40
44
ARG CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
55

66
FROM ${BUILD_ON_IMAGE}${PYTHON_VERSION:+:$PYTHON_VERSION}
@@ -106,7 +106,7 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
106106
#ipympl \
107107
#ipywidgets \
108108
matplotlib \
109-
#numba \
109+
numba \
110110
numexpr \
111111
numpy \
112112
pandas \

ver/.gitlab-ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.env:
22
variables:
33
PYTHON_VERSION: "3.13.1"
4-
CUDA_VERSION: "12.6.3"
5-
CUDNN_VERSION_AMD64: "9.6.0.74"
6-
CUDNN_VERSION_ARM64: "9.6.0.74"
4+
CUDA_VERSION: "12.8.0"
5+
CUDNN_VERSION_AMD64: "9.7.0.66"
6+
CUDNN_VERSION_ARM64: "9.7.0.66"
77
CUDNN_CUDA_VERSION_MAJ_MIN_AMD64: "12.0"
88
CUDNN_CUDA_VERSION_MAJ_MIN_ARM64: "12.0"
99
TAG_VERSION_MAJ_MIN: "false"

0 commit comments

Comments
 (0)