Skip to content

Commit

Permalink
ci: Bump gitlab ci on todi to ubuntu 22.04, cuda 12.6.2, cupy 13.3.0 (#…
Browse files Browse the repository at this point in the history
…1727)

We were using ubuntu 22.04 which shipped with gcc 9.x.x. In order to get
something more recent with proper utf-8 support I bumped to 22.04 on
todi. On daint strange hangs occured so I kept everything as is there.
  • Loading branch information
tehrengruber authored Nov 15, 2024
1 parent aeff1e3 commit ea8d9db
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
10 changes: 6 additions & 4 deletions ci/base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG CUDA_VERSION=12.5.0
FROM docker.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04
ARG CUDA_VERSION=12.6.2
ARG UBUNTU_VERSION=22.04
FROM docker.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION}
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

Expand All @@ -22,7 +23,7 @@ RUN apt-get update -qq && apt-get install -qq -y --no-install-recommends \
tk-dev \
libffi-dev \
liblzma-dev \
python-openssl \
$( [ "${UBUNTU_VERSION}" = "20.04" ] && echo "python-openssl" || echo "python3-openssl" ) \
libreadline-dev \
git \
rustc \
Expand Down Expand Up @@ -55,4 +56,5 @@ RUN pyenv update && \
ENV PATH="/root/.pyenv/shims:${PATH}"

ARG CUPY_PACKAGE=cupy-cuda12x
RUN pip install --upgrade pip setuptools wheel tox ${CUPY_PACKAGE}==12.3.0
ARG CUPY_VERSION=13.3.0
RUN pip install --upgrade pip setuptools wheel tox ${CUPY_PACKAGE}==${CUPY_VERSION}
8 changes: 6 additions & 2 deletions ci/cscs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,21 @@ stages:
DOCKERFILE: ci/base.Dockerfile
# change to 'always' if you want to rebuild, even if target tag exists already (if-not-exists is the default, i.e. we could also skip the variable)
CSCS_REBUILD_POLICY: if-not-exists
DOCKER_BUILD_ARGS: '["CUDA_VERSION=$CUDA_VERSION", "CUPY_PACKAGE=$CUPY_PACKAGE", "PYVERSION=$PYVERSION", "CI_PROJECT_DIR=$CI_PROJECT_DIR"]'
DOCKER_BUILD_ARGS: '["CUDA_VERSION=$CUDA_VERSION", "CUPY_PACKAGE=$CUPY_PACKAGE", "CUPY_VERSION=$CUPY_VERSION", "UBUNTU_VERSION=$UBUNTU_VERSION", "PYVERSION=$PYVERSION", "CI_PROJECT_DIR=$CI_PROJECT_DIR"]'
.build_baseimage_x86_64:
extends: [.container-builder-cscs-zen2, .build_baseimage]
variables:
CUDA_VERSION: 11.2.2
CUPY_PACKAGE: cupy-cuda11x
CUPY_VERSION: 12.3.0 # latest version that supports cuda 11
UBUNTU_VERSION: 20.04 # 22.04 hangs on daint in some tests for unknown reasons.
.build_baseimage_aarch64:
extends: [.container-builder-cscs-gh200, .build_baseimage]
variables:
CUDA_VERSION: 12.4.1
CUDA_VERSION: 12.6.2
CUPY_PACKAGE: cupy-cuda12x
CUPY_VERSION: 13.3.0
UBUNTU_VERSION: 22.04
# TODO: enable CI job when Todi is back in operational state
when: manual

Expand Down

0 comments on commit ea8d9db

Please sign in to comment.