onnx2tf 1.27.4__py3-none-any.whl → 1.27.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- onnx2tf/__init__.py +1 -1
- onnx2tf/onnx2tf.py +2 -1
- onnx2tf/ops/Slice.py +38 -0
- onnx2tf/ops/Unsqueeze.py +9 -0
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/METADATA +3 -3
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/RECORD +11 -11
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/WHEEL +1 -1
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/entry_points.txt +0 -0
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/licenses/LICENSE +0 -0
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/licenses/LICENSE_onnx-tensorflow +0 -0
- {onnx2tf-1.27.4.dist-info → onnx2tf-1.27.6.dist-info}/top_level.txt +0 -0
onnx2tf/__init__.py
CHANGED
onnx2tf/onnx2tf.py
CHANGED
|
@@ -595,10 +595,11 @@ def convert(
|
|
|
595
595
|
with open(param_replacement_file, 'r') as f:
|
|
596
596
|
replacement_parameters = json.load(f)['operations']
|
|
597
597
|
for operations in replacement_parameters:
|
|
598
|
+
operations: Dict
|
|
598
599
|
operations['op_name'] = operations['op_name'].replace(':','_')
|
|
599
600
|
if output_signaturedefs or output_integer_quantized_tflite:
|
|
600
601
|
operations['op_name'] = re.sub('^/', 'wa/', operations['op_name'])
|
|
601
|
-
operations['param_name'] = re.sub('^/', 'wa/', operations
|
|
602
|
+
operations['param_name'] = re.sub('^/', 'wa/', operations.get('param_name', ""))
|
|
602
603
|
except json.decoder.JSONDecodeError as ex:
|
|
603
604
|
error(
|
|
604
605
|
f'The file specified in param_replacement_file is not in JSON format. \n' +
|
onnx2tf/ops/Slice.py
CHANGED
|
@@ -14,6 +14,7 @@ from onnx2tf.utils.common_functions import (
|
|
|
14
14
|
convert_axis,
|
|
15
15
|
replace_max_values_negative_values,
|
|
16
16
|
get_replacement_parameter,
|
|
17
|
+
replace_parameter,
|
|
17
18
|
pre_process_transpose,
|
|
18
19
|
post_process_transpose,
|
|
19
20
|
stridedslice_with_flexing_deterrence,
|
|
@@ -278,6 +279,43 @@ def make_node(
|
|
|
278
279
|
)
|
|
279
280
|
sys.exit(1)
|
|
280
281
|
|
|
282
|
+
# Param replacement - starts
|
|
283
|
+
if len(graph_node.inputs) >= 2:
|
|
284
|
+
starts = replace_parameter(
|
|
285
|
+
value_before_replacement=starts,
|
|
286
|
+
param_target='inputs',
|
|
287
|
+
param_name=graph_node.inputs[1].name,
|
|
288
|
+
**kwargs,
|
|
289
|
+
)
|
|
290
|
+
starts = tf.convert_to_tensor(starts)
|
|
291
|
+
# Param replacement - ends
|
|
292
|
+
if len(graph_node.inputs) >= 3:
|
|
293
|
+
ends = replace_parameter(
|
|
294
|
+
value_before_replacement=ends,
|
|
295
|
+
param_target='inputs',
|
|
296
|
+
param_name=graph_node.inputs[2].name,
|
|
297
|
+
**kwargs,
|
|
298
|
+
)
|
|
299
|
+
ends = tf.convert_to_tensor(ends)
|
|
300
|
+
# Param replacement - axes
|
|
301
|
+
if len(graph_node.inputs) >= 4:
|
|
302
|
+
axes = replace_parameter(
|
|
303
|
+
value_before_replacement=axes,
|
|
304
|
+
param_target='inputs',
|
|
305
|
+
param_name=graph_node.inputs[3].name,
|
|
306
|
+
**kwargs,
|
|
307
|
+
)
|
|
308
|
+
axes = tf.convert_to_tensor(axes)
|
|
309
|
+
# Param replacement - steps
|
|
310
|
+
if len(graph_node.inputs) >= 5:
|
|
311
|
+
steps = replace_parameter(
|
|
312
|
+
value_before_replacement=steps,
|
|
313
|
+
param_target='inputs',
|
|
314
|
+
param_name=graph_node.inputs[4].name,
|
|
315
|
+
**kwargs,
|
|
316
|
+
)
|
|
317
|
+
steps = tf.convert_to_tensor(steps)
|
|
318
|
+
|
|
281
319
|
# Generation of TF OP
|
|
282
320
|
tf_type = None
|
|
283
321
|
if isinstance(graph_node_input, gs.Variable) \
|
onnx2tf/ops/Unsqueeze.py
CHANGED
|
@@ -7,6 +7,7 @@ import tensorflow as tf
|
|
|
7
7
|
import onnx_graphsurgeon as gs
|
|
8
8
|
from onnx2tf.utils.common_functions import (
|
|
9
9
|
get_replacement_parameter,
|
|
10
|
+
replace_parameter,
|
|
10
11
|
get_constant_or_variable,
|
|
11
12
|
convert_axis,
|
|
12
13
|
print_node_info,
|
|
@@ -119,6 +120,14 @@ def make_node(
|
|
|
119
120
|
if axes is not None and isinstance(axes, list) and len(axes) > 0:
|
|
120
121
|
axes.sort()
|
|
121
122
|
|
|
123
|
+
# Param replacement - axes
|
|
124
|
+
axes = replace_parameter(
|
|
125
|
+
value_before_replacement=axes,
|
|
126
|
+
param_target='attributes',
|
|
127
|
+
param_name='axes',
|
|
128
|
+
**kwargs,
|
|
129
|
+
)
|
|
130
|
+
|
|
122
131
|
new_shape = copy.deepcopy(input_tensor_shape)
|
|
123
132
|
for idx in axes:
|
|
124
133
|
new_shape.insert(idx, 1)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: onnx2tf
|
|
3
|
-
Version: 1.27.
|
|
3
|
+
Version: 1.27.6
|
|
4
4
|
Summary: Self-Created Tools to convert ONNX files (NCHW) to TensorFlow/TFLite/Keras format (NHWC). The purpose of this tool is to solve the massive Transpose extrapolation problem in onnx-tensorflow (onnx-tf).
|
|
5
5
|
Home-page: https://github.com/PINTO0309/onnx2tf
|
|
6
6
|
Author: Katsuya Hyodo
|
|
@@ -334,7 +334,7 @@ Video speed is adjusted approximately 50 times slower than actual speed.
|
|
|
334
334
|
docker run --rm -it \
|
|
335
335
|
-v `pwd`:/workdir \
|
|
336
336
|
-w /workdir \
|
|
337
|
-
ghcr.io/pinto0309/onnx2tf:1.27.
|
|
337
|
+
ghcr.io/pinto0309/onnx2tf:1.27.6
|
|
338
338
|
|
|
339
339
|
or
|
|
340
340
|
|
|
@@ -342,7 +342,7 @@ Video speed is adjusted approximately 50 times slower than actual speed.
|
|
|
342
342
|
docker run --rm -it \
|
|
343
343
|
-v `pwd`:/workdir \
|
|
344
344
|
-w /workdir \
|
|
345
|
-
docker.io/pinto0309/onnx2tf:1.27.
|
|
345
|
+
docker.io/pinto0309/onnx2tf:1.27.6
|
|
346
346
|
|
|
347
347
|
or
|
|
348
348
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
onnx2tf/__init__.py,sha256=
|
|
1
|
+
onnx2tf/__init__.py,sha256=BRR6jLGxZsG-5DxMPDGLlQLYc4ijJHyOdt2smyK3gTc,66
|
|
2
2
|
onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
|
|
3
|
-
onnx2tf/onnx2tf.py,sha256=
|
|
3
|
+
onnx2tf/onnx2tf.py,sha256=5JDNLnXV3rnWGLDQIxdiCRgxRi2HmyPAIt6KFI6AhU8,123783
|
|
4
4
|
onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
|
|
5
5
|
onnx2tf/ops/Acos.py,sha256=Fo8YkFKuWq8Fi2xUrBdKcAH1yJ8r5pjSD0wgLttTNdk,4003
|
|
6
6
|
onnx2tf/ops/Acosh.py,sha256=ATQj2cT5JS_mTfXi0kXqJ1yzSZu5J0zHA5VjV3j7uKY,3588
|
|
@@ -157,7 +157,7 @@ onnx2tf/ops/Sign.py,sha256=rJNyo_YTLO5x4yoF_Z_wpaIX4dSOL-vdmKH0SbVDwJc,3585
|
|
|
157
157
|
onnx2tf/ops/Sin.py,sha256=jrv76uQPIfB7UdLGf42MOlRUPM6fQ3GR6BvSybpptFo,3608
|
|
158
158
|
onnx2tf/ops/Sinh.py,sha256=9zXIQWcZiZmu3RnQuQpW-PEgBLOKY51SY0OBu1B5eh8,3706
|
|
159
159
|
onnx2tf/ops/Size.py,sha256=vFD5eae9Jko3tHbBtydj2d3T3tbb4r0xua7OIH40p9M,2665
|
|
160
|
-
onnx2tf/ops/Slice.py,sha256=
|
|
160
|
+
onnx2tf/ops/Slice.py,sha256=6V1r1Dugra5qhrByHH6aDf_0KfrPSpwJYkxTGO7H44M,25046
|
|
161
161
|
onnx2tf/ops/Softmax.py,sha256=CEnHcSm25v1QC4QVDg4fz1NooYY1v-Uq4GORd8dnnr8,14773
|
|
162
162
|
onnx2tf/ops/Softplus.py,sha256=R44YMo8G2Ig15jBO6T2VOI6RhpUmjD70qvSCXFylU-Q,3605
|
|
163
163
|
onnx2tf/ops/Softsign.py,sha256=2ZdKH3KVHZXDzyO7S8f-O_aqRugurbRxd1i2g_fwCos,3600
|
|
@@ -177,7 +177,7 @@ onnx2tf/ops/TopK.py,sha256=f6OG-DcMWneXwSjIkmY935SPyOMD5tMteHnlQHoJwQo,6348
|
|
|
177
177
|
onnx2tf/ops/Transpose.py,sha256=GwJFp7zVqodEsv5mGWviuFqeK93uVM7dbRQ1N8Ua1hg,9774
|
|
178
178
|
onnx2tf/ops/Trilu.py,sha256=uz2TgdErpo9GDp9n4PCe0_koIpNLgBoPCjv3A6VBTl8,4789
|
|
179
179
|
onnx2tf/ops/Unique.py,sha256=GUuOeTO9px22dHmlAn2SOmRHvBgSXo-SaPWm5rYUtPc,4084
|
|
180
|
-
onnx2tf/ops/Unsqueeze.py,sha256=
|
|
180
|
+
onnx2tf/ops/Unsqueeze.py,sha256=uXZTFJYan_okpVU9jQ3ICNOhrz_jiwaY_R3wxA3UAuI,10749
|
|
181
181
|
onnx2tf/ops/Upsample.py,sha256=SX3N_wZHD8G5Z0PLcPgX1ZCzOdct-uTzxKeMhhzeBOw,5304
|
|
182
182
|
onnx2tf/ops/Where.py,sha256=MaCcY9g4mKZQqCgh4xtoylicP-xVu9f4boKiu_q9Ow8,7711
|
|
183
183
|
onnx2tf/ops/Xor.py,sha256=2ceqxHSI1Wtez_CIh8gFfvcu45Xboqfyp1iy3v2vuIs,4590
|
|
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
|
|
|
188
188
|
onnx2tf/utils/common_functions.py,sha256=HTDca3DGXB3xvc1S50RNscgB57TCiq4yC5Nrafs6ka4,241430
|
|
189
189
|
onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
|
|
190
190
|
onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
|
|
191
|
-
onnx2tf-1.27.
|
|
192
|
-
onnx2tf-1.27.
|
|
193
|
-
onnx2tf-1.27.
|
|
194
|
-
onnx2tf-1.27.
|
|
195
|
-
onnx2tf-1.27.
|
|
196
|
-
onnx2tf-1.27.
|
|
197
|
-
onnx2tf-1.27.
|
|
191
|
+
onnx2tf-1.27.6.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
|
|
192
|
+
onnx2tf-1.27.6.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
|
|
193
|
+
onnx2tf-1.27.6.dist-info/METADATA,sha256=zRB3pV3IdIZiGY0JT04-jx9Ydf4Ywr547T_E0G0jX4o,147712
|
|
194
|
+
onnx2tf-1.27.6.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
|
|
195
|
+
onnx2tf-1.27.6.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
|
|
196
|
+
onnx2tf-1.27.6.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
|
|
197
|
+
onnx2tf-1.27.6.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|