Skip to content

Commit 2b60af5

Browse files
sayanshaw24Sayan Shaw
andauthored
Fix CI Pipeline Issues (#1003)
* update requirements * install hdf5 for macos python ci * skip tf-text for python 3.10 --------- Co-authored-by: Sayan Shaw <sayanshaw@microsoft.com>
1 parent 2894132 commit 2b60af5

File tree

4 files changed

+22
-57
lines changed

4 files changed

+22
-57
lines changed

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
- uses: gradle/wrapper-validation-action@v1
14+
- uses: gradle/wrapper-validation-action@v2

.pipelines/ci.yml

Lines changed: 16 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ stages:
2424

2525
- stage: LinuxBuilds
2626
dependsOn: []
27+
variables:
28+
torch.packages: 'torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1'
2729
jobs:
2830

2931
#######
@@ -37,24 +39,10 @@ stages:
3739
matrix:
3840
py312-1192:
3941
python.version: '3.12'
40-
torch.version: 'torch torchvision torchaudio'
4142
ort.version: '1.19.2'
4243
py311-1181:
43-
python.version: '3.12'
44-
torch.version: 'torch torchvision torchaudio'
45-
ort.version: '1.18.1'
46-
py311-1171:
4744
python.version: '3.11'
48-
torch.version: 'torch torchvision torchaudio'
49-
ort.version: '1.17.1'
50-
py310-1163:
51-
python.version: '3.10'
52-
torch.version: 'torch torchvision torchaudio'
53-
ort.version: '1.16.3'
54-
py39-1151:
55-
python.version: '3.9'
56-
torch.version: 'torch torchvision torchaudio'
57-
ort.version: '1.15.1'
45+
ort.version: '1.18.1'
5846

5947
steps:
6048
- task: DownloadGitHubRelease@0
@@ -99,7 +87,7 @@ stages:
9987
CPU_NUMBER=8 python -m pip install .
10088
displayName: Build the library and tests
10189
102-
- script: python -m pip install $(torch.version)
90+
- script: python -m pip install $(torch.packages)
10391
displayName: Install pytorch
10492

10593
- script: |
@@ -121,7 +109,7 @@ stages:
121109
steps:
122110
- task: UsePythonVersion@0
123111
inputs:
124-
versionSpec: '3.10'
112+
versionSpec: '3.12'
125113
addToPath: true
126114
architecture: 'x64'
127115

@@ -134,7 +122,7 @@ stages:
134122
displayName: Build the python library in editable mode
135123
136124
- script: |
137-
python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
125+
python -m pip install $(torch.packages) --index-url https://download.pytorch.org/whl/cpu
138126
python -m pip install -r requirements-dev.txt
139127
displayName: Install requirements-dev.txt
140128
@@ -213,6 +201,8 @@ stages:
213201
214202
- stage: MacOSBuilds
215203
dependsOn: []
204+
variables:
205+
torch.packages: 'torch==2.2.2 torchvision==0.17.2 torchaudio==2.2.2'
216206
jobs:
217207

218208
###########
@@ -298,24 +288,10 @@ stages:
298288
matrix:
299289
py312-1192:
300290
python.version: '3.12'
301-
torch.version: 'torch torchvision torchaudio'
302291
ort.version: '1.19.2'
303-
py312-1181:
304-
python.version: '3.12'
305-
torch.version: 'torch torchvision torchaudio'
306-
ort.version: '1.18.1'
307-
py311-1171:
292+
py311-1181:
308293
python.version: '3.11'
309-
torch.version: 'torch torchvision torchaudio'
310-
ort.version: '1.17.1'
311-
py310-1163:
312-
python.version: '3.10'
313-
torch.version: 'torch torchvision torchaudio'
314-
ort.version: '1.16.3'
315-
py39-1151:
316-
python.version: '3.9'
317-
torch.version: 'torch torchvision torchaudio'
318-
ort.version: '1.15.1'
294+
ort.version: '1.18.1'
319295

320296
steps:
321297
- template: templates/use-xcode-version.yml
@@ -345,7 +321,7 @@ stages:
345321
- script: python -m pip install -r requirements-dev.txt
346322
displayName: Install requirements-dev.txt
347323

348-
- script: python -m pip install $(torch.version)
324+
- script: python -m pip install $(torch.packages)
349325
displayName: Install pytorch
350326

351327
- script: cd test && python -m pytest . --verbose
@@ -354,6 +330,8 @@ stages:
354330

355331
- stage: WindowsBuilds
356332
dependsOn: []
333+
variables:
334+
torch.packages: 'torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1'
357335
jobs:
358336

359337
#########
@@ -447,26 +425,12 @@ stages:
447425

448426
strategy:
449427
matrix:
450-
py312-1201:
451-
python.version: '3.12'
452-
torch.version: 'torch torchvision torchaudio'
453-
ort.version: '1.20.1'
454428
py312-1192:
455429
python.version: '3.12'
456-
torch.version: 'torch torchvision torchaudio'
457430
ort.version: '1.19.2'
458431
py311-1181:
459432
python.version: '3.11'
460-
torch.version: 'torch torchvision torchaudio'
461433
ort.version: '1.18.1'
462-
py310-1171:
463-
python.version: '3.10'
464-
torch.version: 'torch torchvision torchaudio'
465-
ort.version: '1.17.1'
466-
py310-1163:
467-
python.version: '3.10'
468-
torch.version: 'torch torchvision torchaudio'
469-
ort.version: '1.16.3'
470434

471435
steps:
472436
- task: UsePythonVersion@0
@@ -489,7 +453,7 @@ stages:
489453
displayName: Build the wheel
490454
491455
- script: |
492-
python -m pip install $(torch.version)
456+
python -m pip install $(torch.packages)
493457
displayName: Install pytorch
494458
495459
- script: |
@@ -524,7 +488,7 @@ stages:
524488
525489
- script: |
526490
python -m pip install -r requirements-dev.txt
527-
python -m pip install torch torchvision torchaudio
491+
python -m pip install torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1
528492
displayName: Install dependencies for pytest
529493
530494
- script: |
@@ -621,7 +585,7 @@ stages:
621585
timeoutInMinutes: 120
622586
variables:
623587
ORT_VERSION: '1.17.1'
624-
TORCH_VERSION: 'torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118'
588+
TORCH_VERSION: 'torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1'
625589
steps:
626590
- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
627591
displayName: 'Clean Agent Directories'

.pipelines/ci_optional.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ stages:
145145
146146
- script: |
147147
python -m pip install -r requirements-dev.txt
148-
python -m pip install torch torchvision torchaudio
148+
python -m pip install torch==2.4.1 torchvision==0.19.1 torchaudio==2.4.1
149149
displayName: Install dependencies for pytest
150150
151151
- script: |

requirements-dev.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
pyreadline3
22
pytest
33
numpy < 2.0.0
4-
onnx >=1.9.0
5-
protobuf < 4.0.0
4+
onnx ==1.17.0
5+
protobuf ==4.25.8
66
# multiple versions of onnxruntime are supported, but only one can be installed at a time
7-
onnxruntime >=1.12.0
7+
onnxruntime >=1.18.0
8+
onnxscript ==0.1.0
89
safetensors < 0.4.3
910
transformers < 4.50.0
1011
tensorflow_text >=2.5.0;python_version < '3.11'

0 commit comments

Comments
 (0)