Merge branch 'main' into freeze-version

Author: benz0li

CUDA.md

@@ -64,7 +64,7 @@ docker build \
   --build-arg CUDA_IMAGE=nvidia/cuda \
   --build-arg CUDA_VERSION=12.6.3 \
   --build-arg CUDA_IMAGE_SUBTAG=runtime-ubuntu22.04 \
-  --build-arg PYTHON_VERSION=3.13.0 \
+  --build-arg PYTHON_VERSION=3.13.1 \
   -t cuda/python/ver \
   -f ver/latest.Dockerfile .
 ```

README.md

@@ -68,7 +68,7 @@ To install docker, follow the instructions for your platform:
 
 ```bash
 docker build \
-  --build-arg PYTHON_VERSION=3.13.0 \
+  --build-arg PYTHON_VERSION=3.13.1 \
   -t python/ver \
   -f ver/latest.Dockerfile .
 ```

base/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 .env:
   variables:
-    PYTHON_VERSION: "3.13.0"
+    PYTHON_VERSION: "3.13.1"
     TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"
 

scipy/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 .env:
   variables:
-    PYTHON_VERSION: "3.13.0"
+    PYTHON_VERSION: "3.13.1"
     CTAN_REPO_BUILD_LATEST: "https://mirror.init7.net/ctan/systems/texlive/tlnet"
     TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"

ver/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 .env:
   variables:
-    PYTHON_VERSION: "3.13.0"
+    PYTHON_VERSION: "3.13.1"
     CUDA_VERSION: "12.6.3"
     CUDNN_VERSION_AMD64: "9.6.0.74"
     CUDNN_VERSION_ARM64: "9.6.0.74"
@@ -12,7 +12,7 @@
 .before-script-all: &before-script-all
   - |
     if [[ ! -z "$CUDA_IMAGE_SUBTAG" ]]; then
-      export CUDA_IMAGE_FLAVOR=`echo $CUDA_IMAGE_SUBTAG | grep -o "runtime\|devel"`
+      export CUDA_IMAGE_FLAVOR=`echo $CUDA_IMAGE_SUBTAG | grep -o "base\|runtime\|devel"`
       if [[ "$CUDA_IMAGE_FLAVOR" == "devel" ]]; then
         export CUPTI_AVAILABLE=1
       fi
@@ -84,7 +84,7 @@ build:latest-linux-amd64:
       -t $CI_APP_REPO:latest${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-amd64
       -f ver/latest.Dockerfile .
     - |
-      if [[ ! -z "$CUDA_IMAGE" ]]; then
+      if [[ ! -z "$CUDA_IMAGE" && "$CUDA_IMAGE_SUBTAG" != *"base"* ]]; then
         docker build \
         --build-arg CUDNN_VERSION_AMD64 \
         --build-arg CUDNN_CUDA_VERSION_MAJ_MIN_AMD64 \
@@ -125,7 +125,7 @@ build:latest-linux-arm64v8:
       -t $CI_APP_REPO:latest${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-arm64v8
       -f ver/latest.Dockerfile .
     - |
-      if [[ ! -z "$CUDA_IMAGE" ]]; then
+      if [[ ! -z "$CUDA_IMAGE" && "$CUDA_IMAGE_SUBTAG" != *"base"* ]]; then
         docker build \
         --build-arg CUDNN_VERSION_ARM64 \
         --build-arg CUDNN_CUDA_VERSION_MAJ_MIN_ARM64 \
@@ -163,7 +163,7 @@ build:version-linux-amd64:
       -t $CI_APP_REPO:$CI_APP_TAG${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-amd64
       -f ver/$PYTHON_VERSION.Dockerfile .
     - |
-      if [[ ! -z "$CUDA_IMAGE" ]]; then
+      if [[ ! -z "$CUDA_IMAGE" && "$CUDA_IMAGE_SUBTAG" != *"base"* ]]; then
         docker build \
         --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-amd64 \
         --build-arg CUDA_IMAGE_FLAVOR \
@@ -195,7 +195,7 @@ build:version-linux-arm64v8:
       -t $CI_APP_REPO:$CI_APP_TAG${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-arm64v8
       -f ver/$PYTHON_VERSION.Dockerfile .
     - |
-      if [[ ! -z "$CUDA_IMAGE" ]]; then
+      if [[ ! -z "$CUDA_IMAGE" && "$CUDA_IMAGE_SUBTAG" != *"base"* ]]; then
         docker build \
         --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG${CUDA_IMAGE_FLAVOR:+-}$CUDA_IMAGE_FLAVOR-linux-arm64v8 \
         --build-arg CUDA_IMAGE_FLAVOR \
@@ -409,29 +409,31 @@ trigger-version-cuda-build:
       changes:
         - ver/$PYTHON_VERSION.Dockerfile
 
-trigger-latest-cuda-devel-build:
+trigger-latest-cuda-self-build:
   extends: .post
   stage: .post
   needs: ["build-manifest:latest-linux-multiarch"]
   before_script:
     - apk upgrade --no-cache
     - apk add --update --no-cache curl
   script:
+    - curl -X POST -F token=$CUDA_PYTHON_VER -F ref=main -F "variables[CUDA_IMAGE_SUBTAG]=$CUDA_IMAGE_BASE_SUBTAG" https://gitlab.b-data.ch/api/v4/projects/318/trigger/pipeline
     - curl -X POST -F token=$CUDA_PYTHON_VER -F ref=main -F "variables[CUDA_IMAGE_SUBTAG]=$CUDA_IMAGE_DEVEL_SUBTAG" https://gitlab.b-data.ch/api/v4/projects/318/trigger/pipeline
   rules:
     - if: $CI_COMMIT_BRANCH == "main" && $CUDA_IMAGE_SUBTAG =~ /runtime/
       changes:
         - ver/latest.Dockerfile
         - cuda/latest.Dockerfile
 
-trigger-version-cuda-devel-build:
+trigger-version-cuda-self-build:
   extends: .post
   stage: .post
   needs: ["build-manifest:version-linux-multiarch"]
   before_script:
     - apk upgrade --no-cache
     - apk add --update --no-cache curl
   script:
+    - curl -X POST -F token=$CUDA_PYTHON_VER -F ref=freeze-version -F "variables[CUDA_IMAGE_SUBTAG]=$CUDA_IMAGE_BASE_SUBTAG" https://gitlab.b-data.ch/api/v4/projects/318/trigger/pipeline
     - curl -X POST -F token=$CUDA_PYTHON_VER -F ref=freeze-version -F "variables[CUDA_IMAGE_SUBTAG]=$CUDA_IMAGE_DEVEL_SUBTAG" https://gitlab.b-data.ch/api/v4/projects/318/trigger/pipeline
   rules:
     - if: $CI_COMMIT_BRANCH == "freeze-version" && $CUDA_IMAGE_SUBTAG =~ /runtime/