Try to get arm64 python from the UsePythonVersion task instead of the…

… local image
microsoft · Sep 16, 2024 · 88a675d · 88a675d
1 parent e93f14e
commit 88a675d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
@@ -514,7 +514,6 @@ stages:
         parameters:
           MACHINE_POOL: 'onnxruntime-qnn-windows-vs-2022-arm64'
           QNN_SDK: ${{ parameters.qnn_sdk_version }}
-          PYTHON_VERSION: '3.11'
           BUILD_PY_PARAMETERS: ${{ parameters.build_py_parameters }}
 
   - ${{ if eq(parameters.enable_windows_arm64ec_qnn, true) }}:

diff --git a/tools/ci_build/github/azure-pipelines/templates/py-win-arm64-qnn.yml b/tools/ci_build/github/azure-pipelines/templates/py-win-arm64-qnn.yml
@@ -9,10 +9,6 @@ parameters:
   type: string
   default: 2.26.0.240828
 
-- name: PYTHON_VERSION
-  type: string
-  default: '3.11'
-
 - name: ENV_SETUP_SCRIPT
   type: string
   default: ''
@@ -24,12 +20,18 @@ parameters:
   default: ''
 
 jobs:
-- job: Win_py_arm64_qnn_Wheels_${{ replace(parameters.PYTHON_VERSION,'.','_') }}
+- job: Win_py_arm64_qnn_Wheels
   timeoutInMinutes: 210
   workspace:
     clean: all
   pool:
     name: ${{ parameters.MACHINE_POOL }}
+  strategy:
+    matrix:
+      Python311_arm64:
+        PythonVersion: '3.11'
+      Python312_arm64:
+        PythonVersion: '3.12'
   variables:
     GRADLE_OPTS: '-Dorg.gradle.daemon=false'
     VSGenerator: 'Visual Studio 17 2022'
@@ -40,18 +42,9 @@ jobs:
 
       - template: telemetry-steps.yml
 
-      - script: |
-          MKDIR $(Agent.ToolsDirectory)\Python\3.11.0\arm64
-          XCOPY /s /y /h /e /c /q "C:\Python\Python311\*.*" $(Agent.ToolsDirectory)\Python\3.11.0\arm64\
-          COPY NUL $(Agent.ToolsDirectory)\Python\3.11.0\arm64.complete
-          DIR $(Agent.ToolsDirectory)\Python
-          DIR $(Agent.ToolsDirectory)\Python\3.11.0
-          DIR $(Agent.ToolsDirectory)\Python\3.11.0\arm64
-        displayName: Copy python 3.11.0 version to agent tools directory
-
       - task: UsePythonVersion@0
         inputs:
-          versionSpec: ${{ parameters.PYTHON_VERSION }}
+          versionSpec: $(PythonVersion)
           addToPath: true
           architecture: 'arm64'