onnx2tf 1.27.3__tar.gz → 1.27.5__tar.gz

{onnx2tf-1.27.3/onnx2tf.egg-info → onnx2tf-1.27.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.3
+Version: 1.27.5
 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.5
 
   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.5
 
   or
 

{onnx2tf-1.27.3 → onnx2tf-1.27.5}/README.md

@@ -309,7 +309,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.5
 
   or
 
@@ -317,7 +317,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.5
 
   or
 

{onnx2tf-1.27.3 → onnx2tf-1.27.5}/onnx2tf/__init__.py

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

{onnx2tf-1.27.3 → onnx2tf-1.27.5}/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-1.27.3 → onnx2tf-1.27.5}/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 → onnx2tf-1.27.5}/onnx2tf/ops/Slice.py

@@ -14,6 +14,7 @@ from onnx2tf.utils.common_functions import (
     convert_axis,
     replace_max_values_negative_values,
     get_replacement_parameter,
+    replace_parameter,
     pre_process_transpose,
     post_process_transpose,
     stridedslice_with_flexing_deterrence,
@@ -278,6 +279,43 @@ def make_node(
                 )
                 sys.exit(1)
 
+    # Param replacement - starts
+    if len(graph_node.inputs) >= 2:
+        starts = replace_parameter(
+            value_before_replacement=starts,
+            param_target='inputs',
+            param_name=graph_node.inputs[1].name,
+            **kwargs,
+        )
+    starts = tf.convert_to_tensor(starts)
+    # Param replacement - ends
+    if len(graph_node.inputs) >= 3:
+        ends = replace_parameter(
+            value_before_replacement=ends,
+            param_target='inputs',
+            param_name=graph_node.inputs[2].name,
+            **kwargs,
+        )
+        ends = tf.convert_to_tensor(ends)
+    # Param replacement - axes
+    if len(graph_node.inputs) >= 4:
+        axes = replace_parameter(
+            value_before_replacement=axes,
+            param_target='inputs',
+            param_name=graph_node.inputs[3].name,
+            **kwargs,
+        )
+        axes = tf.convert_to_tensor(axes)
+    # Param replacement - steps
+    if len(graph_node.inputs) >= 5:
+        steps = replace_parameter(
+            value_before_replacement=steps,
+            param_target='inputs',
+            param_name=graph_node.inputs[4].name,
+            **kwargs,
+        )
+        steps = tf.convert_to_tensor(steps)
+
     # Generation of TF OP
     tf_type = None
     if isinstance(graph_node_input, gs.Variable) \

{onnx2tf-1.27.3 → onnx2tf-1.27.5}/onnx2tf/ops/Unsqueeze.py

@@ -7,6 +7,7 @@ import tensorflow as tf
 import onnx_graphsurgeon as gs
 from onnx2tf.utils.common_functions import (
     get_replacement_parameter,
+    replace_parameter,
     get_constant_or_variable,
     convert_axis,
     print_node_info,
@@ -119,6 +120,14 @@ def make_node(
     if axes is not None and isinstance(axes, list) and len(axes) > 0:
         axes.sort()
 
+    # Param replacement - axes
+    axes = replace_parameter(
+        value_before_replacement=axes,
+        param_target='attributes',
+        param_name='axes',
+        **kwargs,
+    )
+
     new_shape = copy.deepcopy(input_tensor_shape)
     for idx in axes:
         new_shape.insert(idx, 1)

{onnx2tf-1.27.3 → onnx2tf-1.27.5/onnx2tf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.3
+Version: 1.27.5
 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.5
 
   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.5
 
   or