Remove CUPY package installation from base image

GridTools · Jul 1, 2024 · a2d0634 · a2d0634
1 parent 4af3cff
commit a2d0634
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ci/base.Dockerfile b/ci/base.Dockerfile
@@ -54,5 +54,4 @@ 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
+RUN pip install --upgrade pip setuptools wheel tox
diff --git a/ci/cscs-ci.yml b/ci/cscs-ci.yml
@@ -41,17 +41,15 @@ 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", "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
 .build_baseimage_aarch64:
   extends: [.container-builder-cscs-gh200, .build_baseimage]
   variables:
     CUDA_VERSION: 12.4.1
-    CUPY_PACKAGE: cupy-cuda12x
 
 build_py311_baseimage_x86_64:
   extends: .build_baseimage_x86_64