Skip to content

Commit 435ed5f

Browse files
committed
Leverage include to limite the scope.
Signed-off-by: Jay Zhang <[email protected]>
1 parent 0d1b6b8 commit 435ed5f

File tree

5 files changed

+47
-12
lines changed

5 files changed

+47
-12
lines changed

.github/workflows/keras_application_test_core.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
run_tests:
1418
strategy:
19+
fail-fast: false
1520
matrix:
1621
tf_version: ['2.9.0', '2.13.0']
1722
python_version: ['3.8', '3.9']

.github/workflows/keras_unit_test_core.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
run_tests:
1418
strategy:
19+
fail-fast: false
1520
matrix:
1621
tf_version: ['2.9.0', '2.13.0']
1722
python_version: ['3.8', '3.9']

.github/workflows/pretrained_model_tests_core.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,29 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.event_name == 'workflow_dispatch' }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
run_tests:
1418
strategy:
19+
fail-fast: false
1520
matrix:
16-
tf_version: ['2.9.0', '2.13.0']
17-
python_version: ['3.8', '3.9', '3.10']
1821
opset_version: ['18', '15']
1922
ort_version: ['1.16.3']
23+
onnx_version: [''1.16.1']
24+
include:
25+
- tf_version: '2.9.0'
26+
python_version: '3.8'
27+
- tf_version: '2.15.0'
28+
python_version: '3.9'
29+
- tf_version: '1.15.5'
30+
python_version: '3.7'
31+
os: 'ubuntu-latest'
32+
opset_version: '15'
33+
ort_version: '1.14.1'
34+
onnx_version: '1.14.1'
2035

2136
runs-on: ubuntu-latest
2237

@@ -33,7 +48,7 @@ jobs:
3348
shell: bash
3449
run: |
3550
chmod +x ./tests/utils/setup_test_env.sh
36-
./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }}
51+
./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }} ${{ matrix.onnx_version }}
3752
3853
- name: Fix Paths (Windows only)
3954
if: runner.os == 'Windows'

.github/workflows/unit_tests_core.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,22 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
tf_version: ['2.9.0', '2.15.0']
22-
python_version: ['3.8', '3.9']
21+
os: ['ubuntu-latest', 'windows-2022']
2322
opset_version: ['18', '15']
2423
ort_version: ['1.16.3']
25-
os: ['ubuntu-latest', 'windows-2022']
24+
onnx_version: [''1.16.1']
25+
include:
26+
- tf_version: '2.9.0'
27+
python_version: '3.8'
28+
- tf_version: '2.15.0'
29+
python_version: '3.9'
30+
- tf_version: '1.15.5'
31+
python_version: '3.7'
32+
os: 'ubuntu-latest'
33+
opset_version: '15'
34+
ort_version: '1.14.1'
35+
onnx_version: '1.14.1'
2636
runs-on: ${{ matrix.os }}
27-
# if: ${{ matrix.tf_version == '2.9.0' && matrix.python_version == '3.8' }}
28-
if: ${{ matrix.tf_version == '2.9.0' }}
2937

3038
steps:
3139
- name: Set up Python (${{ matrix.python_version }})
@@ -40,7 +48,7 @@ jobs:
4048
shell: bash
4149
run: |
4250
chmod +x ./tests/utils/setup_test_env.sh
43-
./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }}
51+
./tests/utils/setup_test_env.sh ${{ matrix.tf_version }} ${{ matrix.ort_version }} ${{ matrix.onnx_version }}
4452
4553
- name: Fix Paths (Windows only)
4654
if: runner.os == 'Windows'

tests/utils/setup_test_env.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
#!/bin/bash
22

33
# # Check if the argument is provided
4-
if [ "$#" -ne 2 ]; then
5-
echo "Usage: $0 <tensorflow_version> <onnxruntime_version>"
4+
if [ "$#" -ne 3 ]; then
5+
echo "Usage: $0 <tensorflow_version> <onnxruntime_version> <onnx_version>"
66
exit 1
77
fi
88

99
# Assign the argument to a variable
1010
TF_VERSION=$1
1111
ORT_VERSION=$2
12+
ONNX_VERSION=$3
1213

1314
echo "==== TensorFlow version: $TF_VERSION"
1415
echo "==== ONNXRuntime version: $ORT_VERSION"
16+
echo "==== ONNX version: $ONNX_VERSION"
1517

1618
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers timeout-decorator
17-
pip install onnx
19+
pip install onnx==$ONNX_VERSION
1820
pip install onnxruntime==$ORT_VERSION
1921
pip install numpy
2022

0 commit comments

Comments
 (0)