Add numpy version as a parameter

microsoft · Jan 13, 2024 · 49c8dce · 49c8dce
1 parent 7b2706a
commit 49c8dce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 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
@@ -456,5 +456,6 @@ stages:
       - template: py-win-arm64-qnn.yml
         parameters:
           MACHINE_POOL: 'onnxruntime-qnn-windows-vs-2022-arm64'
+          QNN_SDK: 'qnn-v2.17.0.231124_win'
           PYTHON_VERSION: '3.11'
-          QNN_SDK_PATH_WIN: 'C:\data\qnnsdk\qnn-v2.17.0.231124_win'
+          NUMPY_VERSION: '1.25'
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
@@ -4,10 +4,19 @@ parameters:
   type: string
   default: 'onnxruntime-qnn-windows-vs-2022-arm64'
 
+- name: QNN_SDK
+  displayName: QNN Windows SDK path
+  type: string
+  default: qnn-v2.17.0.231124_win
+
 - name: PYTHON_VERSION
   type: string
   default: '3.11'
 
+- name: NUMPY_VERSION
+  type: string
+  default: '1.25'
+
 - name: ENV_SETUP_SCRIPT
   type: string
   default: ''
@@ -18,11 +27,6 @@ parameters:
   type: string
   default: ''
 
-- name: QNN_SDK_PATH_WIN
-  displayName: QNN Windows SDK path
-  type: string
-  default: C:\data\qnnsdk\qnn-v2.17.0.231124_win
-
 jobs:
 - job: Win_py_arm64_qnn_Wheels_${{ replace(parameters.PYTHON_VERSION,'.','_') }}
   timeoutInMinutes: 120
@@ -33,6 +37,7 @@ jobs:
   variables:
     GRADLE_OPTS: '-Dorg.gradle.daemon=false'
     VSGenerator: 'Visual Studio 17 2022'
+    QNN_SDK_ROOTDIR: 'C:\data\qnnsdk\${{parameters.QNN_SDK}}'
   steps:
       - checkout: self
         clean: true
@@ -70,7 +75,7 @@ jobs:
           scriptSource: inline
           script: |
             import subprocess
-            subprocess.call(['pip', 'install', '-q', 'setuptools', 'wheel', 'numpy==1.25.2'])
+            subprocess.call(['pip', 'install', '-q', 'setuptools', 'wheel', 'numpy==${{parameters.NUMPY_VERSION}}'])
           workingDirectory: '$(Build.BinariesDirectory)'
           displayName: 'Install python modules'
 
@@ -86,10 +91,10 @@ jobs:
             --skip_submodule_sync
             --cmake_generator "$(VSGenerator)"
             --use_qnn
-            --qnn_home ${{ parameters.QNN_SDK_PATH_WIN }}
+            --qnn_home ${{ parameters.QNN_SDK_ROOTDIR }}
             --enable_pybind
             --parallel --update
-            --numpy_version 1.25.2
+            --numpy_version ${{ parameters.NUMPY_VERSION }}
             $(TelemetryOption) ${{ parameters.BUILD_PY_PARAMETERS }}
           workingDirectory: '$(Build.BinariesDirectory)'