Skip to content

Commit 71c7188

Browse files
authored
Merge branch 'main' into add-extract-image-patches
2 parents 4f42d92 + b7a2953 commit 71c7188

File tree

5 files changed

+39
-21
lines changed

5 files changed

+39
-21
lines changed

.github/actions/keras_application_test/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
pip install coloredlogs flatbuffers
3333
pip install tensorflow==${{ inputs.tf_version }}
3434
pip install onnxruntime==${{ inputs.ort_version }}
35-
pip install Pillow==8.2.0
35+
pip install pillow
3636
pip install opencv-python
3737
pip install tqdm
3838
pip install keras-segmentation==0.2.0

.github/workflows/keras_application_test_ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
6767
strategy:
6868
fail-fast: false
69-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-22.04
7070

7171
steps:
7272
- name: Checkout code
@@ -92,15 +92,15 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
name:
95-
- 'py39-tf2.10'
95+
- 'py38-tf2.13'
9696
- 'py39-tf2.15'
9797
os: ['ubuntu-latest', 'windows-2022']
9898
ort_version: ['1.16.3']
9999
onnx_version: ['1.16.1']
100100
include:
101-
- name: 'py39-tf2.10'
102-
tf_version: '2.10.0'
103-
python_version: '3.9'
101+
- name: 'py38-tf2.13'
102+
tf_version: '2.13.0'
103+
python_version: '3.8'
104104
- name: 'py39-tf2.15'
105105
tf_version: '2.15.0'
106106
python_version: '3.9'

.github/workflows/keras_unit_test_ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
6666
strategy:
6767
fail-fast: false
68-
runs-on: ubuntu-latest
68+
runs-on: ubuntu-22.04
6969

7070
steps:
7171
- name: Checkout code

.github/workflows/pretrained_model_test_ci.yml

+31-13
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717

18-
Test_min_py_with_min_tf: # Do not change this name because it is used in Ruleset of this repo.
18+
Test_min_py_with_min_tf: # Do not change this name because it is used in 'publish-test-results' section below.
1919
strategy:
2020
fail-fast: false
2121
runs-on: ubuntu-latest
@@ -42,7 +42,7 @@ jobs:
4242
name: Test Results (Py38-TF2.9-18-ubuntu)
4343
path: ./**/test-results-*.xml
4444

45-
Test_max_py_with_latest_tf: # Do not change this name because it is used in Ruleset of this repo.
45+
Test_max_py_with_latest_tf: # Do not change this name because it is used in 'publish-test-results' section below.
4646
strategy:
4747
fail-fast: false
4848
runs-on: ubuntu-latest
@@ -69,7 +69,33 @@ jobs:
6969
name: Test Results (Py310-TF2.15-18-ubuntu)
7070
path: ./**/test-results-*.xml
7171

72-
Extra_tests:
72+
Test_py37_with_tf1_15: # Do not change this name because it is used in 'publish-test-results' section below.
73+
strategy:
74+
fail-fast: false
75+
runs-on: ubuntu-22.04
76+
77+
steps:
78+
- name: Checkout code
79+
uses: actions/checkout@v4
80+
81+
- name: Run Tests (Py310-TF2.15-18)
82+
uses: ./.github/actions/pretrained_model_test
83+
with:
84+
tf_version: '1.15.5'
85+
python_version: '3.7'
86+
os: 'ubuntu-22.04' # Max ubuntu version supports python 3.7.
87+
opset_version: '15'
88+
ort_version: '1.14.1'
89+
onnx_version: '1.14.1'
90+
91+
- name: Upload Test Results
92+
if: always()
93+
uses: actions/upload-artifact@v3
94+
with:
95+
name: Test Results (Py37-TF1.15-15-ubuntu)
96+
path: ./**/test-results-*.xml
97+
98+
Extra_tests: # Do not change this name because it is used in 'publish-test-results' section below.
7399
strategy:
74100
fail-fast: false
75101
matrix:
@@ -88,15 +114,7 @@ jobs:
88114
- name: 'py39-tf2.15'
89115
tf_version: '2.15.0'
90116
python_version: '3.9'
91-
- name: 'py37-tf1.15'
92-
tf_version: '1.15.5'
93-
python_version: '3.7'
94-
os: 'ubuntu-latest'
95-
opset_version: '15'
96-
ort_version: '1.14.1'
97-
onnx_version: '1.14.1'
98-
99-
runs-on: ubuntu-latest
117+
runs-on: ${{ matrix.os }}
100118

101119
steps:
102120
- name: Checkout code
@@ -121,7 +139,7 @@ jobs:
121139

122140
publish-test-results:
123141
name: "Publish Tests Results to Github"
124-
needs: [Test_min_py_with_min_tf, Test_max_py_with_latest_tf, Extra_tests]
142+
needs: [Test_min_py_with_min_tf, Test_max_py_with_latest_tf, Test_py37_with_tf1_15, Extra_tests]
125143
runs-on: ubuntu-latest
126144
permissions:
127145
checks: write

.github/workflows/unit_test_ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- name: 'py37-tf1.15'
9292
tf_version: '1.15.5'
9393
python_version: '3.7'
94-
os: 'ubuntu-latest'
94+
os: 'ubuntu-22.04' # Max ubuntu version supports python 3.7.
9595
opset_version: '15'
9696
ort_version: '1.14.1'
9797
onnx_version: '1.14.1'

0 commit comments

Comments
 (0)