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

onnx2tf/__init__.py

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

onnx2tf/ops/BatchNormalization.py

@@ -338,11 +338,17 @@ def make_node(
 
         # Automatic correction of accuracy degradation
         min_abs_err = sys.maxsize
-        min_abs_err_perm_1: List[int] = [idx for idx in range(len(mean.shape))]
+        min_abs_err_perm_1: List[int] = []
+        check_length = 0
+        if input_tensor.shape is not None and mean.shape is not None and len(input_tensor.shape) >= len(mean.shape):
+            check_length = len(input_tensor.shape)
+        else:
+            check_length = len(mean.shape)
+        min_abs_err_perm_1: List[int] = [idx for idx in range(check_length)]
 
         if not disable_strict_mode:
             if onnx_tensor_infos is not None and validation_data is not None:
-                tensor_1_candidate_for_transpositions = list(itertools.permutations(range(len(mean.shape))))
+                tensor_1_candidate_for_transpositions = list(itertools.permutations(range(check_length)))
                 # Search for the axis with the smallest error
                 for tensor_1_candidate_for_transposition in tensor_1_candidate_for_transpositions:
                     try:
@@ -470,71 +476,72 @@ def make_node(
                     except Exception as ex:
                         pass
 
-                tf_layers_dict[Y.name]['tf_node'] = \
-                    tf.nn.batch_normalization(
-                        x=input_tensor,
-                        mean=\
-                            transpose_with_flexing_deterrence(
-                                input_tensor=mean,
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ) if not isinstance(mean, np.ndarray) else \
-                            transpose_with_flexing_deterrence(
-                                input_tensor=tf.convert_to_tensor(mean),
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ),
-                        variance=\
-                            transpose_with_flexing_deterrence(
-                                input_tensor=var,
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ) if not isinstance(var, np.ndarray) else \
-                            transpose_with_flexing_deterrence(
-                                input_tensor=tf.convert_to_tensor(var),
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ),
-                        offset=\
-                            transpose_with_flexing_deterrence(
-                                input_tensor=offset,
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ) if not isinstance(offset, np.ndarray) else \
-                            transpose_with_flexing_deterrence(
-                                input_tensor=tf.convert_to_tensor(offset),
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ),
-                        scale=\
-                            transpose_with_flexing_deterrence(
-                                input_tensor=scale,
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ) if not isinstance(scale, np.ndarray) else \
-                            transpose_with_flexing_deterrence(
-                                input_tensor=tf.convert_to_tensor(scale),
-                                perm=min_abs_err_perm_1,
-                                output_shape=Y.shape \
-                                    if None not in Y.shape and Y.shape != [] else None,
-                                **kwargs,
-                            ),
-                        variance_epsilon=epsilon,
-                    )
+                if min_abs_err_perm_1 != [idx for idx in range(check_length)]:
+                    tf_layers_dict[Y.name]['tf_node'] = \
+                        tf.nn.batch_normalization(
+                            x=input_tensor,
+                            mean=\
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=mean,
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ) if not isinstance(mean, np.ndarray) else \
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=tf.convert_to_tensor(mean),
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ),
+                            variance=\
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=var,
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ) if not isinstance(var, np.ndarray) else \
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=tf.convert_to_tensor(var),
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ),
+                            offset=\
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=offset,
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ) if not isinstance(offset, np.ndarray) else \
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=tf.convert_to_tensor(offset),
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ),
+                            scale=\
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=scale,
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ) if not isinstance(scale, np.ndarray) else \
+                                transpose_with_flexing_deterrence(
+                                    input_tensor=tf.convert_to_tensor(scale),
+                                    perm=min_abs_err_perm_1,
+                                    output_shape=Y.shape \
+                                        if None not in Y.shape and Y.shape != [] else None,
+                                    **kwargs,
+                                ),
+                            variance_epsilon=epsilon,
+                        )
                 tf_type = tf.nn.batch_normalization
 
     # Post-process transpose

onnx2tf/ops/Flatten.py

@@ -57,14 +57,17 @@ def make_node(
     output_shape = graph_node_output.shape
     dtype = graph_node_output.dtype
 
-    axis = graph_node.attrs.get("axis", 0)
-    if graph_node_input.shape is not None \
-        and axis < input_tensor_rank:
-        axis = convert_axis(
-            axis=axis,
-            tensor_rank=len(graph_node_input.shape),
-            before_op_output_shape_trans=before_op_output_shape_trans,
-        )
+    axis = graph_node.attrs.get("axis", None)
+    if axis is not None:
+        if graph_node_input.shape is not None \
+            and axis < input_tensor_rank:
+            axis = convert_axis(
+                axis=axis,
+                tensor_rank=len(graph_node_input.shape),
+                before_op_output_shape_trans=before_op_output_shape_trans,
+            )
+    else:
+        axis = input_tensor_rank - 1
 
     # Preserving Graph Structure (Dict)
     tf_layers_dict[graph_node_output.name] = {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx2tf
-Version: 1.25.10
+Version: 1.25.12
 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.10
+  ghcr.io/pinto0309/onnx2tf:1.25.12
 
   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.10
+  docker.io/pinto0309/onnx2tf:1.25.12
 
   or
 
@@ -419,7 +419,7 @@ The given SavedModel SignatureDef contains the following input(s):
 The given SavedModel SignatureDef contains the following output(s):
   outputs['output_0'] tensor_info:
       dtype: DT_FLOAT
-      shape: (1, 1000) # <-- Model design bug in resnet18-v1-7.onnx
+      shape: (-1, 1000)
       name: PartitionedCall:0
 Method name is: tensorflow/serving/predict
 

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

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=1LHRsx2l2mQIIDQxnFqokQBOhqkzgY49KD3D8Gq1KIA,67
+onnx2tf/__init__.py,sha256=627_ZeFqdp2iujcX3skUp2qZkqtcJ-iZUtUzhaWBmUU,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
@@ -13,7 +13,7 @@ onnx2tf/ops/Asinh.py,sha256=74ZzTEkpxZY4CGfJT2JJU-SHXYL5KZeUkWY2v7hsMMw,3588
 onnx2tf/ops/Atan.py,sha256=D24XDMxEwXFtJheQAr3V3IWOUOc6Q5M0-b_83bmGGMM,3981
 onnx2tf/ops/Atanh.py,sha256=VsUYopBWWPoo4gta1_aqvUL6NrVXuVkGid4SqDqYJ9Q,3588
 onnx2tf/ops/AveragePool.py,sha256=p9R4k87FO1yKZMQ699FIftXGUNKxb5yu0vYfzPlpsMA,14701
-onnx2tf/ops/BatchNormalization.py,sha256=tOSBgEEV7eZJiYNSt6wuW2-dS4fGoFT6srl0MtA-WBU,25998
+onnx2tf/ops/BatchNormalization.py,sha256=_hlf2-5-j3MCJHEoE2oMNQ8YhCm7ad9h2fwPpTo3i7g,26624
 onnx2tf/ops/Bernoulli.py,sha256=PM0xS0n1q4bnT_9PnbcKW8_Qj8dJYYBQR8kb2X-wIp4,3670
 onnx2tf/ops/BitShift.py,sha256=a28_E9hwA8yfjvtsrSKCZCeeMPB5RBQbjB3cmaNGN6k,3861
 onnx2tf/ops/Cast.py,sha256=iVSqSm1l_MXHtxUBRdQPJlzOTNRHcqMAPKi_LWaPYuc,4357
@@ -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=skiXNi4cbh3XRzSm8eaT1vyjQ_8GdWDMT2mf3mB4eO8,6148
+onnx2tf/ops/Flatten.py,sha256=vXRd295Ro7V6p6TwL1xzE1IxI7PSA3iLvugYQJ8UYTA,6251
 onnx2tf/ops/Floor.py,sha256=8izJrNmw8wNmjF_YabIpLs4jm82J-gKcyAQbwV7Yqpc,3589
 onnx2tf/ops/FusedConv.py,sha256=gslI50V3yvt4l0mmodnyHFAu0cORx1J_ZL5cE0rZ8qs,4523
 onnx2tf/ops/GRU.py,sha256=kBHiZlhlPIV2DQCoFYFHxCTwOATeguJy1MSfj2kxqDM,30732
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 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.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.12.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.25.12.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.25.12.dist-info/METADATA,sha256=rnNHfLpnT2aW8Zbbdc2rGwQj7-t6Z5rXP2uu7YkNLnY,146147
+onnx2tf-1.25.12.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+onnx2tf-1.25.12.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.25.12.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.25.12.dist-info/RECORD,,