[CI] Update XPU ci test python version to 3.9 (pytorch#134214)

Works for pytorch#114850 Pull Request resolved: pytorch#134214 Approved by: https://github.com/EikanWang, https://github.com/malfet
kashif · Aug 24, 2024 · 6245d5b · 6245d5b
1 parent a63efee
commit 6245d5b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
@@ -308,7 +308,7 @@ case "$image" in
     TRITON=yes
     ;;
   pytorch-linux-jammy-xpu-2024.0-py3)
-    ANACONDA_PYTHON_VERSION=3.8
+    ANACONDA_PYTHON_VERSION=3.9
     GCC_VERSION=11
     PROTOBUF=yes
     DB=yes

diff --git a/.ci/docker/common/install_conda.sh b/.ci/docker/common/install_conda.sh
@@ -78,19 +78,20 @@ fi
     CONDA_COMMON_DEPS="astunparse pyyaml setuptools openblas==0.3.25=*openmp* ninja==1.11.1 scons==4.5.2"
 
     if [ "$ANACONDA_PYTHON_VERSION" = "3.8" ]; then
-      conda_install numpy=1.24.4 ${CONDA_COMMON_DEPS}
+      NUMPY_VERSION=1.24.4
     else
-      conda_install numpy=1.26.2 ${CONDA_COMMON_DEPS}
+      NUMPY_VERSION=1.26.2
     fi
   else
     CONDA_COMMON_DEPS="astunparse pyyaml mkl=2021.4.0 mkl-include=2021.4.0 setuptools"
 
     if [ "$ANACONDA_PYTHON_VERSION" = "3.11" ] || [ "$ANACONDA_PYTHON_VERSION" = "3.12" ] || [ "$ANACONDA_PYTHON_VERSION" = "3.13" ]; then
-      conda_install numpy=1.26.0 ${CONDA_COMMON_DEPS}
+      NUMPY_VERSION=1.26.0
     else
-      conda_install numpy=1.21.2 ${CONDA_COMMON_DEPS}
+      NUMPY_VERSION=1.21.2
     fi
   fi
+  conda_install ${CONDA_COMMON_DEPS}
 
   # Install llvm-8 as it is required to compile llvmlite-0.30.0 from source
   # and libpython-static for torch deploy
@@ -112,7 +113,7 @@ fi
 
   # Install some other packages, including those needed for Python test reporting
   pip_install -r /opt/conda/requirements-ci.txt
-
+  pip_install numpy=="$NUMPY_VERSION"
   pip_install -U scikit-learn
 
   if [ -n "$DOCS" ]; then

diff --git a/.github/workflows/xpu.yml b/.github/workflows/xpu.yml
@@ -21,13 +21,13 @@ jobs:
       curr_branch: ${{ github.head_ref || github.ref_name }}
       curr_ref_type: ${{ github.ref_type }}
 
-  linux-jammy-xpu-py3_8-build:
-    name: linux-jammy-xpu-py3.8
+  linux-jammy-xpu-py3_9-build:
+    name: linux-jammy-xpu-py3.9
     uses: ./.github/workflows/_linux-build.yml
     needs: get-label-type
     with:
       runner_prefix: ${{ needs.get-label-type.outputs.label-type }}
-      build-environment: linux-jammy-xpu-py3.8
+      build-environment: linux-jammy-xpu-py3.9
       docker-image-name: pytorch-linux-jammy-xpu-2024.0-py3
       runner: linux.12xlarge
       test-matrix: |
@@ -38,14 +38,14 @@ jobs:
           { config: "default", shard: 4, num_shards: 4, runner: "linux.idc.xpu" },
         ]}
 
-  linux-jammy-xpu-py3_8-test:
-    name: linux-jammy-xpu-py3.8
+  linux-jammy-xpu-py3_9-test:
+    name: linux-jammy-xpu-py3.9
     uses: ./.github/workflows/_xpu-test.yml
-    needs: linux-jammy-xpu-py3_8-build
+    needs: linux-jammy-xpu-py3_9-build
     permissions:
       id-token: write
       contents: read
     with:
-      build-environment: linux-jammy-xpu-py3.8
-      docker-image: ${{ needs.linux-jammy-xpu-py3_8-build.outputs.docker-image }}
-      test-matrix: ${{ needs.linux-jammy-xpu-py3_8-build.outputs.test-matrix }}
+      build-environment: linux-jammy-xpu-py3.9
+      docker-image: ${{ needs.linux-jammy-xpu-py3_9-build.outputs.docker-image }}
+      test-matrix: ${{ needs.linux-jammy-xpu-py3_9-build.outputs.test-matrix }}