onnx2tf 1.27.3__py3-none-any.whl → 1.27.4__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.27.3'
+__version__ = '1.27.4'

onnx2tf/ops/Reshape.py

@@ -136,14 +136,18 @@ def make_node(
             else:
                 transposed_tensor = input_tensor
         except:
-            transposed_tensor = \
-                transpose_with_flexing_deterrence(
-                    input_tensor=input_tensor,
-                    perm=list(perm) if perm is not None else None,
-                    output_shape=transposed_tensor_output_shape if None not in transposed_tensor_output_shape else None,
-                    name=graph_node.name,
-                    **kwargs,
-                )
+            try:
+                transposed_tensor = \
+                    transpose_with_flexing_deterrence(
+                        input_tensor=input_tensor,
+                        perm=list(perm) if perm is not None else None,
+                        output_shape=transposed_tensor_output_shape if None not in transposed_tensor_output_shape else None,
+                        name=graph_node.name,
+                        **kwargs,
+                    )
+            except:
+                transposed_tensor = input_tensor
+
         test_data = None
         if not isinstance(input_tensor, np.ndarray):
             if not isinstance(graph_node_input_1, np.ndarray) \

onnx2tf/ops/Resize.py

@@ -294,14 +294,25 @@ def make_node(
         else:
             h_w_scale = scales[1:input_tensor_rank-1]
             h_w_shape = input_tensor_shape[1:input_tensor_rank-1]
-            new_size = tf.cast(
-                h_w_scale * tf.cast(
-                    h_w_shape,
-                    NUMPY_DTYPES_TO_TF_DTYPES[scales.dtype] \
-                        if isinstance(scales.dtype, np.dtype) else scales.dtype,
-                ),
-                tf.int32,
-            )
+            if None not in h_w_shape:
+                new_size = tf.cast(
+                    h_w_scale * tf.cast(
+                        h_w_shape,
+                        NUMPY_DTYPES_TO_TF_DTYPES[scales.dtype] \
+                            if isinstance(scales.dtype, np.dtype) else scales.dtype,
+                    ),
+                    tf.int32,
+                )
+            else:
+                h_w_shape = tf.shape(input_tensor)[1:input_tensor_rank-1]
+                new_size = tf.cast(
+                    h_w_scale * tf.cast(
+                        h_w_shape,
+                        NUMPY_DTYPES_TO_TF_DTYPES[scales.dtype] \
+                            if isinstance(scales.dtype, np.dtype) else scales.dtype,
+                    ),
+                    tf.int32,
+                )
 
     if hasattr(new_size, '_inferred_value'):
         new_size_values = new_size._inferred_value

{onnx2tf-1.27.3.dist-info → onnx2tf-1.27.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.3
+Version: 1.27.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).
 Home-page: https://github.com/PINTO0309/onnx2tf
 Author: Katsuya Hyodo
@@ -334,7 +334,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.27.3
+  ghcr.io/pinto0309/onnx2tf:1.27.4
 
   or
 
@@ -342,7 +342,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.27.3
+  docker.io/pinto0309/onnx2tf:1.27.4
 
   or
 

{onnx2tf-1.27.3.dist-info → onnx2tf-1.27.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=3DbzaMXeYK7wIGtbngwTKUwmlDhOPHtTzNNbknleFJA,66
+onnx2tf/__init__.py,sha256=gmbApNBlikoE1jGydbqconZ-bEgpuCTCs_Nku2GCJfQ,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=9g8enwecc2e0vZ3dnvE7ukZYEqsCBOo940zdauvN_-M,123738
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -133,8 +133,8 @@ onnx2tf/ops/ReduceProd.py,sha256=I4qqmdfr4t8i1sinuDqZrvndpw6KrpN1B7sFcjRUI9g,124
 onnx2tf/ops/ReduceSum.py,sha256=8vdqR5Qv8ui783ywa0xVuiMm3MNwRzGOD_GYFpsgPmc,12393
 onnx2tf/ops/ReduceSumSquare.py,sha256=X8OFxb5YRl6VU12i35f7Gwzegvf4mXO56dp69n2TZPs,12336
 onnx2tf/ops/Relu.py,sha256=FoCRlHmG-xI3YCPbR_7UlRDbk0Juw6N722iULONkwW0,5627
-onnx2tf/ops/Reshape.py,sha256=4nYvi1BK_8rHHPaFGbKJidc8eAjaN7NEG28T87VDYnQ,25507
-onnx2tf/ops/Resize.py,sha256=QyU4bM9BVCYng-LeBHMm0gqYrcg5epKOPRpzWVvrtNQ,19557
+onnx2tf/ops/Reshape.py,sha256=_oPKYi1uSwt_aVsuAt9v127lt0aR5jnhHTzxKNEKdx0,25626
+onnx2tf/ops/Resize.py,sha256=nvcp8X7daMapWgmpCsjg4ajt8EdTQCzB6xbHCqmEQ9M,20053
 onnx2tf/ops/ReverseSequence.py,sha256=W2w_fBCiUXsD28grIz4AHNIoMjYXx6b6HkgwJTVRxf8,3308
 onnx2tf/ops/RoiAlign.py,sha256=XgLdaJgsI6KX0u8tnQlVsvbpZECZp_TSnEuGR7LTaeM,8360
 onnx2tf/ops/Round.py,sha256=OHdh1G2qgZe5OWlRc-OEOM4eYaA63LAoQ6hPmmUmR6o,3588
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 onnx2tf/utils/common_functions.py,sha256=HTDca3DGXB3xvc1S50RNscgB57TCiq4yC5Nrafs6ka4,241430
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.27.3.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.27.3.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.27.3.dist-info/METADATA,sha256=0cg3hf1dkeJHtdzY7m19q8WBTStgnJBxW9jckrPzTC0,147712
-onnx2tf-1.27.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-onnx2tf-1.27.3.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.27.3.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.27.3.dist-info/RECORD,,
+onnx2tf-1.27.4.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.27.4.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.27.4.dist-info/METADATA,sha256=PE5yD9J4QEnguJyUXPYBxr77XVSuRSRcElbqO8Rya4E,147712
+onnx2tf-1.27.4.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+onnx2tf-1.27.4.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.27.4.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.27.4.dist-info/RECORD,,