Skip to content

Commit 04d0b80

Browse files
xaduprexadupre
committed
remove 3.12
Signed-off-by: xadupre <[email protected]>
1 parent 30edd9b commit 04d0b80

14 files changed

+32
-132
lines changed

‎.github/workflows/keras_application_test_ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
- 'py39-tf2.15'
9797
- 'py310-tf2.18'
9898
- 'py311-tf2.18'
99-
- 'py312-tf2.18'
10099
os: ['ubuntu-latest', 'windows-2022']
101100
include:
102101
- name: 'py38-tf2.13'
@@ -119,11 +118,6 @@ jobs:
119118
python_version: '3.11'
120119
ort_version: '1.20.1'
121120
onnx_version: '1.17.0'
122-
- name: 'py312-tf2.18'
123-
tf_version: '2.18.0'
124-
python_version: '3.12'
125-
ort_version: '1.20.1'
126-
onnx_version: '1.17.0'
127121
runs-on: ${{ matrix.os }}
128122

129123
steps:

‎.github/workflows/keras_unit_test_ci.yml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -86,30 +86,6 @@ jobs:
8686
name: Test Results (Py311-TF2.18-ubuntu)
8787
path: ./**/test-results-*.xml
8888

89-
Test2_py312_tf2_18: # Do not change this name because it is used in Ruleset of this repo.
90-
strategy:
91-
fail-fast: false
92-
runs-on: ubuntu-latest
93-
94-
steps:
95-
- name: Checkout code
96-
uses: actions/checkout@v4
97-
98-
- name: Run Tests (Py312-TF2.18)
99-
uses: ./.github/actions/keras_unit_test
100-
with:
101-
tf_version: '2.18.0'
102-
python_version: '3.12'
103-
ort_version: '1.20.1'
104-
onnx_version: '1.17.0'
105-
106-
- name: Upload Test Results
107-
if: always()
108-
uses: actions/upload-artifact@v4
109-
with:
110-
name: Test Results (Py312-TF2.18-ubuntu)
111-
path: ./**/test-results-*.xml
112-
11389
Test2_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
11490
strategy:
11591
fail-fast: false
@@ -143,7 +119,6 @@ jobs:
143119
- 'py39-tf2.15'
144120
- 'py310-tf2.18'
145121
- 'py311-tf2.18'
146-
- 'py312-tf2.18'
147122
os: ['ubuntu-latest', 'windows-2022']
148123
include:
149124
- name: 'py38-tf2.13'
@@ -166,11 +141,6 @@ jobs:
166141
python_version: '3.11'
167142
ort_version: '1.20.1'
168143
onnx_version: '1.17.0'
169-
- name: 'py312-tf2.18'
170-
tf_version: '2.18.0'
171-
python_version: '3.12'
172-
ort_version: '1.20.1'
173-
onnx_version: '1.17.0'
174144
runs-on: ${{ matrix.os }}
175145

176146
steps:
@@ -193,7 +163,7 @@ jobs:
193163

194164
publish-test-results:
195165
name: "Publish Tests Results to Github"
196-
needs: [Test2_py38_tf2_9, Test2_py310_tf2_18, Test2_py311_tf2_18, Test2_py312_tf2_18, Test2_py37_with_tf1_15, Extra_tests2]
166+
needs: [Test2_py38_tf2_9, Test2_py310_tf2_18, Test2_py311_tf2_18, Test2_py37_with_tf1_15, Extra_tests2]
197167
runs-on: ubuntu-latest
198168
permissions:
199169
checks: write

‎.github/workflows/pretrained_model_test_ci.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,33 +69,6 @@ jobs:
6969
name: Test Results (Py310-TF2.18-18-ubuntu)
7070
path: ./**/test-results-*.xml
7171

72-
Test3_py312_tf2_18: # 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-latest
76-
77-
steps:
78-
- name: Checkout code
79-
uses: actions/checkout@v4
80-
81-
- name: Run Tests (Py312-TF2.18-18)
82-
uses: ./.github/actions/pretrained_model_test
83-
with:
84-
os: 'ubuntu-latest'
85-
tf_version: '2.18.0'
86-
python_version: '3.12'
87-
ort_version: '1.20.1'
88-
onnx_version: '1.17.0'
89-
opset_version: '18'
90-
skip_tflite: 'False'
91-
92-
- name: Upload Test Results
93-
if: always()
94-
uses: actions/upload-artifact@v4
95-
with:
96-
name: Test Results (Py312-TF2.18-18-ubuntu)
97-
path: ./**/test-results-*.xml
98-
9972
Test3_py37_with_tf1_15: # Do not change this name because it is used in 'publish-test-results' section below.
10073
strategy:
10174
fail-fast: false
@@ -131,7 +104,6 @@ jobs:
131104
- 'py39-tf2.15'
132105
- 'py310-tf2.18'
133106
- 'py311-tf2.18'
134-
- 'py312-tf2.18'
135107
os: ['ubuntu-latest', 'windows-2022']
136108
opset_version: ['18', '15']
137109
skip_tflite: ['False']
@@ -156,11 +128,6 @@ jobs:
156128
python_version: '3.11'
157129
ort_version: '1.20.1'
158130
onnx_version: '1.17.0'
159-
- name: 'py312-tf2.18'
160-
tf_version: '2.18.0'
161-
python_version: '3.12'
162-
ort_version: '1.20.1'
163-
onnx_version: '1.17.0'
164131
runs-on: ${{ matrix.os }}
165132

166133
steps:
@@ -186,7 +153,7 @@ jobs:
186153

187154
publish-test-results:
188155
name: "Publish Tests Results to Github"
189-
needs: [Test3_py38_tf2_9, Test3_py310_tf2_18, Test3_py312_tf2_18, Test3_py37_with_tf1_15, Extra_tests3]
156+
needs: [Test3_py38_tf2_9, Test3_py310_tf2_18, Test3_py37_with_tf1_15, Extra_tests3]
190157
runs-on: ubuntu-latest
191158
permissions:
192159
checks: write

‎.github/workflows/unit_test_ci.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -96,33 +96,6 @@ jobs:
9696
name: Test Results (Py311-TF2.18-18-ubuntu)
9797
path: ./**/test-results-*.xml
9898

99-
Test4_py312_tf2_18: # Do not change this name because it is used in Ruleset of this repo.
100-
strategy:
101-
fail-fast: false
102-
runs-on: ubuntu-latest
103-
104-
steps:
105-
- name: Checkout code
106-
uses: actions/checkout@v4
107-
108-
- name: Run Tests (Py312-TF2.18-18)
109-
uses: ./.github/actions/unit_test
110-
with:
111-
os: 'ubuntu-latest'
112-
tf_version: '2.18.0'
113-
python_version: '3.12'
114-
ort_version: '1.20.1'
115-
onnx_version: '1.17.0'
116-
opset_version: '18'
117-
skip_tflite: 'False'
118-
119-
- name: Upload Test Results
120-
if: always()
121-
uses: actions/upload-artifact@v4
122-
with:
123-
name: Test Results (Py312-TF2.18-18-ubuntu)
124-
path: ./**/test-results-*.xml
125-
12699
Extra_tests4:
127100
strategy:
128101
fail-fast: false
@@ -132,16 +105,10 @@ jobs:
132105
- 'py39-tf2.15'
133106
- 'py310-tf2.18'
134107
- 'py311-tf2.18'
135-
- 'py312-tf2.18'
136108
os: ['ubuntu-latest', 'windows-2022']
137109
opset_version: ['18', '15']
138110
skip_tflite: ['False']
139111
include:
140-
- name: 'py312-tf2.18'
141-
tf_version: '2.18.0'
142-
python_version: '3.12'
143-
ort_version: '1.20.1'
144-
onnx_version: '1.17.0'
145112
- name: 'py311-tf2.18'
146113
tf_version: '2.18.0'
147114
python_version: '3.11'
@@ -196,7 +163,7 @@ jobs:
196163

197164
publish-test-results:
198165
name: "Publish Tests Results to Github"
199-
needs: [Test4_py38_tf2_9, Test4_py310_tf2_18, Test4_py311_tf2_18, Test4_py312_tf2_18, Extra_tests4]
166+
needs: [Test4_py38_tf2_9, Test4_py310_tf2_18, Test4_py311_tf2_18, Extra_tests4]
200167
runs-on: ubuntu-latest
201168
permissions:
202169
checks: write

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr
1717

1818
| Build Type | OS | Python | TensorFlow | ONNX opset | Status |
1919
| --- | --- | --- | --- | --- | --- |
20-
| Unit Test - Basic | Linux, Windows | 3.7-3.12 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
21-
| Unit Test - Full | Linux, Windows | 3.7-3.12 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
20+
| Unit Test - Basic | Linux, Windows | 3.7-3.11 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=main) |
21+
| Unit Test - Full | Linux, Windows | 3.7-3.11 | 1.15, 2.9-2.15 | 14-18 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=main)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=main) | |
2222
<br/>
2323

2424
## Supported Versions
@@ -42,7 +42,7 @@ You can install tf2onnx on top of tf-1.x or tf-2.x.
4242

4343
### Python
4444

45-
We support Python ```3.7-3.12```.
45+
We support Python ```3.7-3.11```.
4646

4747
## Prerequisites
4848

‎setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def run(self):
8282
author='ONNX',
8383
author_email='[email protected]',
8484
url='https://github.com/onnx/tensorflow-onnx',
85-
install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers>=1.12', 'protobuf~=3.20'],
85+
install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers>=1.12'],
8686
classifiers=[
8787
'Development Status :: 5 - Production/Stable',
8888
'Intended Audience :: Developers',
@@ -98,5 +98,7 @@ def run(self):
9898
'Programming Language :: Python :: 3.7',
9999
'Programming Language :: Python :: 3.8',
100100
'Programming Language :: Python :: 3.9',
101-
'Programming Language :: Python :: 3.10']
101+
'Programming Language :: Python :: 3.10',
102+
'Programming Language :: Python :: 3.11',
103+
]
102104
)

‎tests/test_cudnn_compatible_gru.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# pylint: disable=missing-docstring,invalid-name,unused-argument,using-constant-test,cell-var-from-loop
1717

1818
if is_tf2():
19-
MultiRNNCell = tf.compat.v1.nn.rnn_cell.MultiRNNCell
19+
MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
2020
dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
2121
bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
2222
else:

‎tests/test_custom_rnncell.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
# pylint: disable=abstract-method,arguments-differ
1717

1818
if is_tf2():
19-
BasicLSTMCell = tf.compat.v1.nn.rnn_cell.BasicLSTMCell
20-
LSTMCell = tf.compat.v1.nn.rnn_cell.LSTMCell
21-
GRUCell = tf.compat.v1.nn.rnn_cell.GRUCell
22-
RNNCell = tf.compat.v1.nn.rnn_cell.RNNCell
23-
MultiRNNCell = tf.compat.v1.nn.rnn_cell.MultiRNNCell
19+
BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
20+
LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
21+
GRUCell = getattr(tf.compat.v1.nn.rnn_cell, "GRUCell", None)
22+
RNNCell = getattr(tf.compat.v1.nn.rnn_cell, "RNNCell", None)
23+
MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
2424
dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
2525
bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
2626
else:

‎tests/test_gru.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
if is_tf2():
3636
# There is no LSTMBlockCell in tf-2.x
37-
BasicLSTMCell = tf.compat.v1.nn.rnn_cell.BasicLSTMCell
38-
LSTMCell = tf.compat.v1.nn.rnn_cell.LSTMCell
39-
GRUCell = tf.compat.v1.nn.rnn_cell.GRUCell
40-
MultiRNNCell = tf.compat.v1.nn.rnn_cell.MultiRNNCell
37+
BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
38+
LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
39+
GRUCell = getattr(tf.compat.v1.nn.rnn_cell, "GRUCell", None)
40+
MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
4141
dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
4242
bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
4343
else:

‎tests/test_grublock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# pylint: disable=invalid-name
1818

1919
if is_tf2():
20-
MultiRNNCell = tf.compat.v1.nn.rnn_cell.MultiRNNCell
20+
MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
2121
dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
2222
bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
2323
else:

0 commit comments

Comments
 (0)