mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-30 03:37:44 +00:00
fix python qnn pipelines issues (#21462)
build_py_params wasn't plumbed through for python qnn pipelines. incorporate fixes for deprecated numpy version option from https://github.com/microsoft/onnxruntime/pull/21459
This commit is contained in:
parent
2b7e2a5bd0
commit
c65afcea55
3 changed files with 5 additions and 9 deletions
|
|
@ -510,7 +510,7 @@ stages:
|
|||
MACHINE_POOL: 'onnxruntime-qnn-windows-vs-2022-arm64'
|
||||
QNN_SDK: ${{ parameters.qnn_sdk_version }}
|
||||
PYTHON_VERSION: '3.11'
|
||||
NUMPY_VERSION: '1.26.4'
|
||||
BUILD_PY_PARAMETERS: ${{ parameters.build_py_parameters }}
|
||||
|
||||
- ${{ if eq(parameters.enable_windows_x64_qnn, true) }}:
|
||||
- stage: Python_Packaging_Windows_x64_QNN
|
||||
|
|
@ -520,3 +520,4 @@ stages:
|
|||
parameters:
|
||||
MACHINE_POOL: 'Onnxruntime-QNNEP-Windows-2022-CPU'
|
||||
QNN_SDK: ${{ parameters.qnn_sdk_version }}
|
||||
BUILD_PY_PARAMETERS: ${{ parameters.build_py_parameters }}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@ parameters:
|
|||
type: string
|
||||
default: '3.11'
|
||||
|
||||
- name: NUMPY_VERSION
|
||||
type: string
|
||||
default: '1.26.4'
|
||||
|
||||
- name: ENV_SETUP_SCRIPT
|
||||
type: string
|
||||
default: ''
|
||||
|
|
@ -70,7 +66,7 @@ jobs:
|
|||
scriptSource: inline
|
||||
script: |
|
||||
import subprocess
|
||||
subprocess.call(['pip', 'install', '-q', 'setuptools', 'wheel', 'numpy==${{parameters.NUMPY_VERSION}}'])
|
||||
subprocess.call(['pip', 'install', '-q', 'setuptools', 'wheel'])
|
||||
workingDirectory: '$(Build.BinariesDirectory)'
|
||||
displayName: 'Install python modules'
|
||||
|
||||
|
|
@ -93,7 +89,6 @@ jobs:
|
|||
--qnn_home $(QnnSDKRootDir)
|
||||
--enable_pybind
|
||||
--parallel --update
|
||||
--numpy_version ${{ parameters.NUMPY_VERSION }}
|
||||
$(TelemetryOption) ${{ parameters.BUILD_PY_PARAMETERS }}
|
||||
workingDirectory: '$(Build.BinariesDirectory)'
|
||||
|
||||
|
|
@ -121,7 +116,7 @@ jobs:
|
|||
displayName: 'Build wheel'
|
||||
inputs:
|
||||
scriptPath: '$(Build.SourcesDirectory)\setup.py'
|
||||
arguments: 'bdist_wheel ${{ parameters.BUILD_PY_PARAMETERS }} $(NightlyBuildOption) --wheel_name_suffix=qnn'
|
||||
arguments: 'bdist_wheel $(NightlyBuildOption) --wheel_name_suffix=qnn'
|
||||
workingDirectory: '$(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo'
|
||||
|
||||
- task: CopyFiles@2
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ jobs:
|
|||
displayName: 'Build wheel'
|
||||
inputs:
|
||||
scriptPath: '$(Build.SourcesDirectory)\setup.py'
|
||||
arguments: 'bdist_wheel ${{ parameters.BUILD_PY_PARAMETERS }} $(NightlyBuildOption) --wheel_name_suffix=qnn'
|
||||
arguments: 'bdist_wheel $(NightlyBuildOption) --wheel_name_suffix=qnn'
|
||||
workingDirectory: '$(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo'
|
||||
|
||||
- task: CopyFiles@2
|
||||
|
|
|
|||
Loading…
Reference in a new issue