onnx2tf 1.25.8__py3-none-any.whl → 1.25.10__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.25.8'
+__version__ = '1.25.10'

onnx2tf/ops/Flatten.py

@@ -87,8 +87,20 @@ def make_node(
         cal_shape = (1, -1)
     elif axis >= input_tensor_rank:
         cal_shape = (-1, 1)
-    elif graph_node_output.shape is not None and len(graph_node_output.shape) == 2 and axis == input_tensor_rank - 1:
-        cal_shape = (1, -1)
+    elif graph_node_output.shape is not None \
+        and len(graph_node_output.shape) == 2 \
+        and axis == input_tensor_rank - 1 \
+        and not isinstance(graph_node_output.shape[0], str):
+        cal_shape = (graph_node_output.shape[0], -1)
+    elif graph_node_output.shape is not None \
+        and len(graph_node_output.shape) == 2 \
+        and axis == input_tensor_rank - 1 \
+        and isinstance(graph_node_output.shape[0], str):
+        try:
+            dim_prod = int(np.prod(graph_node_output.shape[1:]))
+            cal_shape = (-1, dim_prod)
+        except:
+            cal_shape = (1, -1)
     elif input_tensor_rank >= 2 \
         and input_tensor_shape[0] is None \
         and len([idx for idx in input_tensor_shape[1:] if idx is not None]) == input_tensor_rank - 1 \

onnx2tf/utils/common_functions.py

@@ -5202,7 +5202,19 @@ def merge_two_consecutive_identical_ops_into_one(
                 tf_type = tf.math.divide
 
     elif tf_func == 'Sub':
-        if (
+        if isinstance(input_tensor_1, np.ndarray) or hasattr(input_tensor_1, 'numpy'):
+            tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                tf.math.subtract(
+                    x=input_tensor_1 \
+                        if not isinstance(input_tensor_1, np.ndarray) \
+                            else tf.convert_to_tensor(input_tensor_1),
+                    y=input_tensor_2 \
+                        if not isinstance(input_tensor_2, np.ndarray) \
+                            else tf.convert_to_tensor(input_tensor_2),
+                    name=graph_node.name,
+                )
+            tf_type = tf.math.subtract
+        elif (
             not isinstance(graph_node_input_1, np.ndarray) \
                 and 'merge_sub' in tf_layers_dict[graph_node_input_1.name] \
                 and tf_layers_dict[graph_node_input_1.name]['merge_sub']
@@ -5411,12 +5423,7 @@ def merge_two_consecutive_identical_ops_into_one(
                         elif next_graph_node_o_op == 'Sub':
                             # 8. `Add` -> `Sub` to `Single-Add`  : `10 + 5 - 8 -> 10 - 3`
                             if isinstance(next_graph_node_input_1, np.ndarray) or hasattr(next_graph_node_input_1, 'numpy'):
-                                if isinstance(input_tensor_1, np.ndarray) or hasattr(input_tensor_1, 'numpy'):
-                                    input_tensor_1 = (input_tensor_1 - next_graph_node_input_1)
-                                elif isinstance(input_tensor_2, np.ndarray) or hasattr(input_tensor_2, 'numpy'):
-                                    input_tensor_2 = (input_tensor_2 - next_graph_node_input_1)
-                                tf_layers_dict[graph_node_output.name]['merge_add'] = True
-                                tf_type = tf.identity
+                                tf_type = tf.math.add
                             elif isinstance(next_graph_node_input_2, np.ndarray) or hasattr(next_graph_node_input_2, 'numpy'):
                                 if isinstance(input_tensor_1, np.ndarray) or hasattr(input_tensor_1, 'numpy'):
                                     input_tensor_1 = (input_tensor_1 - next_graph_node_input_2)

{onnx2tf-1.25.8.dist-info → onnx2tf-1.25.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx2tf
-Version: 1.25.8
+Version: 1.25.10
 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).
 Home-page: https://github.com/PINTO0309/onnx2tf
 Author: Katsuya Hyodo
@@ -314,7 +314,7 @@ Video speed is adjusted approximately 50 times slower than actual speed.
   docker run --rm -it \
   -v `pwd`:/workdir \
   -w /workdir \
-  ghcr.io/pinto0309/onnx2tf:1.25.8
+  ghcr.io/pinto0309/onnx2tf:1.25.10
 
   or
 
@@ -322,7 +322,7 @@ Video speed is adjusted approximately 50 times slower than actual speed.
   docker run --rm -it \
   -v `pwd`:/workdir \
   -w /workdir \
-  docker.io/pinto0309/onnx2tf:1.25.8
+  docker.io/pinto0309/onnx2tf:1.25.10
 
   or
 

{onnx2tf-1.25.8.dist-info → onnx2tf-1.25.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=7lrJY-ibzxjv2QManCrRQ_ZqYbALChNxgSWXuM5_7pk,66
+onnx2tf/__init__.py,sha256=1LHRsx2l2mQIIDQxnFqokQBOhqkzgY49KD3D8Gq1KIA,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=v7juKPrl_0h9SQyck-Ol4B59QXWSSePVC3AUu3fmvII,122750
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -45,7 +45,7 @@ onnx2tf/ops/Erf.py,sha256=ayvSp8Pr9h-VYuIiMorwOC0r9aQ4i4S1Uvaho9R6PYo,4962
 onnx2tf/ops/Exp.py,sha256=MM_Osse7UbJgld2u0fGMcjniJCs40uDztuOodVUqWMU,3583
 onnx2tf/ops/Expand.py,sha256=MGsby7IhTqKv1K-1INQPHcI5l3Wx-jjJ1FnulpCZsag,14761
 onnx2tf/ops/EyeLike.py,sha256=VHRlr_WpIGVpZSqfjN7zWQF6XT2KjNVJnjVccxB4P6U,5877
-onnx2tf/ops/Flatten.py,sha256=0D37kbODpOOEnMfdZhyap2zCFKav5zhQJL01qe-8RW4,5680
+onnx2tf/ops/Flatten.py,sha256=skiXNi4cbh3XRzSm8eaT1vyjQ_8GdWDMT2mf3mB4eO8,6148
 onnx2tf/ops/Floor.py,sha256=8izJrNmw8wNmjF_YabIpLs4jm82J-gKcyAQbwV7Yqpc,3589
 onnx2tf/ops/FusedConv.py,sha256=gslI50V3yvt4l0mmodnyHFAu0cORx1J_ZL5cE0rZ8qs,4523
 onnx2tf/ops/GRU.py,sha256=kBHiZlhlPIV2DQCoFYFHxCTwOATeguJy1MSfj2kxqDM,30732
@@ -185,13 +185,13 @@ onnx2tf/ops/_Loop.py,sha256=eo5sNfrfOnKV6_I737AWsM5LJTY9DVOxQEvhanxtP4g,11322
 onnx2tf/ops/__Loop.py,sha256=ClwMcbNS4hqUtW_pzwjMa9Cqg7ONvz9aplke55A0uJ0,19704
 onnx2tf/ops/__init__.py,sha256=jnmUWWa-3dHzBZV9bmPzXu6eoz2dumJTzO7i8JdcgSM,25
 onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
-onnx2tf/utils/common_functions.py,sha256=niht_akJvovSNm2bB0edGYpU9uoeckiWL4QjfC9tFMg,240546
+onnx2tf/utils/common_functions.py,sha256=gCpAe11EcX-gYOMu68saIpIj20pDmLld-6jybnc_0aY,240691
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.25.8.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.25.8.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.25.8.dist-info/METADATA,sha256=7W4bQgPd85ZbXhJQZMDfg7eTYkZRkIeQzy7vxIoiK_4,146188
-onnx2tf-1.25.8.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-onnx2tf-1.25.8.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.25.8.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.25.8.dist-info/RECORD,,
+onnx2tf-1.25.10.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.25.10.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.25.10.dist-info/METADATA,sha256=DXGvuW621kGBqw1ZSO6lNZVmnU-TltYJCjJERZ4GFDc,146191
+onnx2tf-1.25.10.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+onnx2tf-1.25.10.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.25.10.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.25.10.dist-info/RECORD,,

{onnx2tf-1.25.8.dist-info → onnx2tf-1.25.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any