Skip to content

Commit 3c22daa

Browse files
authored
disable azure ops from ci/packaging pipelines (#746)
* disable azure ops from ci/packaging pipelines * add the missed files * keep the env variable flag * add python to the path?
1 parent 690bed7 commit 3c22daa

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

.pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ stages:
121121
inputs:
122122
versionSpec: '3.x'
123123
disableDownloadFromRegistry: true
124-
addToPath: false
124+
addToPath: true
125125
architecture: 'x64'
126126

127127
- script: |
@@ -507,7 +507,7 @@ stages:
507507
inputs:
508508
versionSpec: '3.x'
509509
disableDownloadFromRegistry: true
510-
addToPath: false
510+
addToPath: true
511511
architecture: 'x64'
512512
displayName: Use ADO python task
513513

@@ -583,7 +583,7 @@ stages:
583583
inputs:
584584
versionSpec: '3.x'
585585
disableDownloadFromRegistry: true
586-
addToPath: false
586+
addToPath: true
587587
architecture: 'x64'
588588
displayName: Use ADO python task
589589

.pipelines/ci_optional.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ stages:
132132
inputs:
133133
versionSpec: '3.x'
134134
disableDownloadFromRegistry: true
135-
addToPath: false
135+
addToPath: true
136136
architecture: 'x64'
137137
displayName: Use ADO python task
138138

@@ -172,7 +172,7 @@ stages:
172172
inputs:
173173
versionSpec: '3.x'
174174
disableDownloadFromRegistry: true
175-
addToPath: false
175+
addToPath: true
176176
architecture: 'x64'
177177
displayName: Use ADO python task
178178

.pipelines/wheels_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
- name: ExtraEnv
33
displayName: 'Extra env variable set to CIBW_ENVIRONMENT, in form of "A=1 B=2 C=3"'
44
type: string
5-
default: 'OCOS_ENABLE_AZURE=1'
5+
default: 'OCOS_ENABLE_AZURE=0'
66

77
jobs:
88
- job: linux_x86_64

CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@ set(OCOS_ONNXRUNTIME_PKG_URI "" CACHE STRING
9090
"Specify the onnxruntime C++ shared library zip package path, like ./onnxruntime-win-x64-1.16.0.zip")
9191
set(OCOS_BUILD_PRESET "" CACHE STRING
9292
"Specify the build preset cmake settings file path, like 'token_api_only' which includes ./cmake/presets/token_api_only.cmake")
93-
# TODO: Remove the following statements if AzureOp build is enabled by default.
94-
# If build_buildid environment varaible is set, which means this is a CI build, then always enable AzureOp.
95-
# or it is enabled when OCOS_ENABLE_AZURE is set, which means the user explicitly enables it.
96-
if ((DEFINED ENV{BUILD_BUILDID}) OR (DEFINED ENV{OCOS_ENABLE_AZURE}))
93+
94+
# AzureOp can be enabled by environment varaible OCOS_ENABLE_AZURE == 1
95+
if (DEFINED ENV{OCOS_ENABLE_AZURE})
9796
set(OCOS_ENABLE_AZURE ON CACHE INTERNAL "" FORCE)
98-
message(STATUS "=> AzureOp is enabled by default.")
97+
message(STATUS "=> AzureOp is enabled env variable.")
9998
endif()
10099

101100
function(disable_all_operators)

docs/custom_ops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ expect(node, inputs=[text, pattern, rewrite], outputs=[y],
13121312
13131313
13141314
## Azure operators
1315-
1315+
Starting from onnxruntime-extensions 0.12, these Azure operators will be removed from the official onnxruntime-extensions packages. However, they can still be built from source using `cmake -DOCOS_ENABLE_AZURE=ON ...`.
13161316
### OpenAIAudioToText
13171317
13181318
<details>

tools/test_cibuildwheel.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
if "%OCOS_ENABLE_AZURE%"=="1" (
33
pushd %1\test
44
python -m pip install coloredlogs flatbuffers numpy packaging protobuf sympy
5-
python -m pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ ort-nightly==1.16.0.dev20230820005
5+
python -m pip install onnxruntime==1.18
66
python test_azure_ops.py
77
popd
88
)

tools/test_cibuildwheel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if [[ "$OCOS_ENABLE_AZURE" == "1" ]]
44
then
55
pushd $1/test
66
python -m pip install coloredlogs flatbuffers numpy packaging protobuf sympy
7-
python -m pip install -i https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ ort-nightly==1.16.0.dev20230820005
7+
python -m pip install onnxruntime==1.18
88
python ./test_azure_ops.py
99
popd
1010
fi

0 commit comments

Comments
 (0)