Skip to content

Commit 8f48ae8

Browse files
committed
Enable more windows tests.
Signed-off-by: Jay Zhang <jiz@microsoft.com>
1 parent 4dd9251 commit 8f48ae8

File tree

2 files changed

+51
-57
lines changed

2 files changed

+51
-57
lines changed

.github/workflows/keras_unit_test_core.yml

Lines changed: 48 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -9,54 +9,54 @@ on:
99
- main
1010

1111
jobs:
12-
run_tests_linux:
13-
strategy:
14-
matrix:
15-
tf_version: ['2.9.0', '2.13.0']
16-
python_version: ['3.8', '3.9', '3.10']
17-
opset_version: ['18', '15']
18-
ort_version: ['1.16.3']
19-
onnx_version: ['1.15.0']
20-
21-
runs-on: ubuntu-latest
22-
23-
steps:
24-
- name: Set up Python (${{ matrix.python_version }})
25-
uses: actions/setup-python@v5
26-
with:
27-
python-version: ${{ matrix.python_version }}
28-
29-
- name: Checkout code
30-
uses: actions/checkout@v4
31-
32-
- name: Install dependencies (tf v${{ matrix.tf_version }})
33-
shell: bash
34-
run: |
35-
python -m pip install --upgrade pip
36-
pip install onnxconverter-common
37-
pip install onnx==${{ matrix.onnx_version }}
38-
pip install h5py==3.7.0
39-
pip install parameterized
40-
pip install timeout-decorator
41-
pip install coloredlogs flatbuffers
42-
pip install tensorflow==${{ matrix.tf_version }}
43-
pip install pytest pytest-cov pytest-runner
44-
pip install onnxruntime==${{ matrix.ort_version }}
45-
pip uninstall -y protobuf
46-
pip install "protobuf~=3.20"
47-
pip install -e .
48-
49-
echo "----- List all of depdencies:"
50-
pip freeze --all
51-
52-
- name: Run keras unit tests
53-
run: |
54-
set -x
55-
status=0
56-
python -c "import onnxruntime"
57-
python -c "import onnxconverter_common"
58-
pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml
59-
exit $status
12+
# run_tests_linux:
13+
# strategy:
14+
# matrix:
15+
# tf_version: ['2.9.0', '2.13.0']
16+
# python_version: ['3.8', '3.9', '3.10']
17+
# opset_version: ['18', '15']
18+
# ort_version: ['1.16.3']
19+
# onnx_version: ['1.15.0']
20+
21+
# runs-on: ubuntu-latest
22+
23+
# steps:
24+
# - name: Set up Python (${{ matrix.python_version }})
25+
# uses: actions/setup-python@v5
26+
# with:
27+
# python-version: ${{ matrix.python_version }}
28+
29+
# - name: Checkout code
30+
# uses: actions/checkout@v4
31+
32+
# - name: Install dependencies (tf v${{ matrix.tf_version }})
33+
# shell: bash
34+
# run: |
35+
# python -m pip install --upgrade pip
36+
# pip install onnxconverter-common
37+
# pip install onnx==${{ matrix.onnx_version }}
38+
# pip install h5py==3.7.0
39+
# pip install parameterized
40+
# pip install timeout-decorator
41+
# pip install coloredlogs flatbuffers
42+
# pip install tensorflow==${{ matrix.tf_version }}
43+
# pip install pytest pytest-cov pytest-runner
44+
# pip install onnxruntime==${{ matrix.ort_version }}
45+
# pip uninstall -y protobuf
46+
# pip install "protobuf~=3.20"
47+
# pip install -e .
48+
49+
# echo "----- List all of depdencies:"
50+
# pip freeze --all
51+
52+
# - name: Run keras unit tests
53+
# run: |
54+
# set -x
55+
# status=0
56+
# python -c "import onnxruntime"
57+
# python -c "import onnxconverter_common"
58+
# pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml
59+
# exit $status
6060

6161
run_tests_windows:
6262
strategy:
@@ -100,13 +100,9 @@ jobs:
100100
101101
- name: Run keras unit tests
102102
run: |
103-
set -x
104-
status=0
105103
python -c "import onnxruntime"
106104
python -c "import onnxconverter_common"
107105
pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml
108-
exit $status
109-
110106
111107
run_tests_linux_TF_15:
112108
strategy:
@@ -201,9 +197,6 @@ jobs:
201197
202198
- name: Run keras unit tests
203199
run: |
204-
set -x
205-
status=0
206200
python -c "import onnxruntime"
207201
python -c "import onnxconverter_common"
208202
pytest tests/keras2onnx_unit_tests --doctest-modules --junitxml=junit/test-results.xml
209-
exit $status

.github/workflows/unit_tests_core.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
python_version: ['3.8', '3.9', '3.10']
1717
opset_version: ['18', '15']
1818
ort_version: ['1.16.3']
19+
os: ['ubuntu-latest', 'windows-2022']
1920

20-
runs-on: ubuntu-latest
21+
runs-on: ${{ matrix.os }}
2122

2223
steps:
2324
- name: Set up Python (${{ matrix.python_version }})
@@ -28,7 +29,7 @@ jobs:
2829
- name: Checkout code
2930
uses: actions/checkout@v4
3031

31-
- name: Install dependencies (tf v${{ matrix.tf_version }})
32+
- name: Install dependencies (tf-v${{ matrix.tf_version }})
3233
shell: bash
3334
run: |
3435
chmod +x ./tests/utils/setup_test_env.sh

0 commit comments

Comments
 (0)