onnx2tf 1.29.21__py3-none-any.whl → 1.29.23__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.29.21'
+__version__ = '1.29.23'

onnx2tf/ops/MaxPool.py

@@ -1,6 +1,7 @@
 import random
 random.seed(0)
 import numpy as np
+import itertools
 np.random.seed(0)
 import tensorflow as tf
 import tf_keras
@@ -119,6 +120,59 @@ def make_node(
                     **kwargs,
                 )
 
+    # Guard: brute-force axis alignment between NCHW and NHWC when batch dim mismatches.
+    # Only trigger when shapes are fully known to avoid destabilizing existing behavior.
+    def _shape_matches(shape_a, shape_b):
+        if shape_a is None or shape_b is None or len(shape_a) != len(shape_b):
+            return False
+        for dim_a, dim_b in zip(shape_a, shape_b):
+            if dim_a is None or dim_b is None:
+                continue
+            if dim_a != dim_b:
+                return False
+        return True
+
+    def _best_perm_to_match(cur_shape, target_shape):
+        rank = len(cur_shape)
+        best_perm = None
+        best_cost = None
+        for perm in itertools.permutations(range(rank)):
+            permuted = [cur_shape[i] for i in perm]
+            if not _shape_matches(permuted, target_shape):
+                continue
+            cost = sum(abs(i - perm[i]) for i in range(rank))
+            if best_cost is None or cost < best_cost:
+                best_cost = cost
+                best_perm = perm
+        return best_perm
+
+    try:
+        current_shape = input_tensor.shape.as_list()
+    except Exception:
+        current_shape = None
+
+    if onnx_input_shape is not None and current_shape is not None:
+        onnx_shape = [
+            dim if isinstance(dim, int) else None for dim in onnx_input_shape
+        ]
+        cur_shape = [
+            dim if isinstance(dim, int) else None for dim in current_shape
+        ]
+        if len(onnx_shape) in (3, 4, 5) \
+            and len(cur_shape) == len(onnx_shape) \
+            and None not in onnx_shape \
+            and None not in cur_shape:
+            expected_shape = [onnx_shape[0]] + onnx_shape[2:] + [onnx_shape[1]]
+            if cur_shape[0] != onnx_shape[0] \
+                and not _shape_matches(cur_shape, expected_shape):
+                perm = _best_perm_to_match(cur_shape, expected_shape)
+                if perm is not None:
+                    input_tensor = transpose_with_flexing_deterrence(
+                        input_tensor=input_tensor,
+                        perm=list(perm),
+                        **kwargs,
+                    )
+
     filter = None
 
     auto_pad = graph_node.attrs.get('auto_pad', 'NOTSET')

onnx2tf/ops/PRelu.py

@@ -124,22 +124,55 @@ def make_node(
         tf_layers_dict[graph_node_output.name].pop('nhwc')
 
     # Generation of TF OP
-    if replace_prelu_to_pseudo_prelu:
-        pos = tf.nn.relu(input_tensor)
-        neg = (input_tensor - abs(input_tensor)) * (slope * 0.5)
-        tf_layers_dict[graph_node_output.name]['tf_node'] = pos + neg
-    else:
+    shared_axes = None
+    input_shape = input_tensor.shape
+    slope_shape = slope.shape if hasattr(slope, 'shape') else None
+    if input_shape is not None and slope_shape is not None:
+        input_rank = len(input_shape)
+        if len(slope_shape) == input_rank - 1:
+            shared_axes = [
+                i + 1 for i, dim in enumerate(slope_shape)
+                if dim is not None and dim == 1
+            ]
+        elif len(slope_shape) == 1 and input_rank >= 3:
+            slope_dim = slope_shape[0]
+            channel_axis = None
+            if isinstance(slope_dim, int):
+                if input_shape[1] == slope_dim:
+                    channel_axis = 1
+                elif input_shape[-1] == slope_dim:
+                    channel_axis = input_rank - 1
+            if channel_axis is not None:
+                shared_axes = [ax for ax in range(1, input_rank) if ax != channel_axis]
+
+    if shared_axes is None:
         if slope.shape is not None \
             and len(slope.shape) > 0 \
             and sum([1 if dim is not None and dim == 1 else 0 for dim in slope.shape]) == len(slope.shape):
             shared_axes = [val + 1 for val in range(len(input_tensor.shape) - 1)]
         else:
-            shared_axes = [val + 1 for val in range(len(input_tensor.shape) - 2)]
-        tf_layers_dict[graph_node_output.name]['tf_node'] = \
-            PReLU(
-                weights=slope,
-                shared_axes=shared_axes,
-            )(input_tensor)
+            input_nhwc = tf_layers_dict.get(graph_node_output.name, {}).get('nhwc', False)
+            if input_nhwc:
+                shared_axes = [val + 1 for val in range(len(input_tensor.shape) - 2)]
+            else:
+                shared_axes = [val + 2 for val in range(len(input_tensor.shape) - 2)]
+
+    use_native_prelu = not replace_prelu_to_pseudo_prelu
+    if not use_native_prelu:
+        pos = tf.nn.relu(input_tensor)
+        neg = (input_tensor - abs(input_tensor)) * (slope * 0.5)
+        tf_layers_dict[graph_node_output.name]['tf_node'] = pos + neg
+    else:
+        try:
+            tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                PReLU(
+                    weights=slope,
+                    shared_axes=shared_axes,
+                )(input_tensor)
+        except Exception:
+            pos = tf.nn.relu(input_tensor)
+            neg = (input_tensor - abs(input_tensor)) * (slope * 0.5)
+            tf_layers_dict[graph_node_output.name]['tf_node'] = pos + neg
 
     # Post-process transpose
     before_trans_shape = tf_layers_dict[graph_node_output.name]['tf_node'].shape

onnx2tf/ops/ScatterElements.py

@@ -146,6 +146,48 @@ def make_node(
         axis=axis,
         indices=indices_tensor,
     )
+    indices_rank = None
+    if hasattr(indices_tensor, "shape") and indices_tensor.shape is not None:
+        try:
+            indices_rank = len(indices_tensor.shape)
+        except TypeError:
+            indices_rank = indices_tensor.shape.rank
+    updates_rank = updates_tensor_rank
+    broadcast_shape = None
+    pad_rank = 0
+
+    def _pad_and_broadcast(target_tensor, pad_rank, target_shape):
+        tensor = target_tensor
+        if isinstance(tensor, np.ndarray):
+            tensor = tf.convert_to_tensor(tensor)
+        if pad_rank <= 0:
+            return tf.broadcast_to(tensor, target_shape)
+        tensor_shape = tf.shape(tensor)
+        new_shape = tf.concat(
+            [tf.ones([pad_rank], dtype=tf.int32), tensor_shape],
+            axis=0,
+        )
+        tensor = tf.reshape(tensor, new_shape)
+        return tf.broadcast_to(tensor, target_shape)
+
+    updates_tensor_for_scatter = updates_tensor
+    if indices_rank is not None and updates_rank is not None and indices_rank != updates_rank:
+        if indices_rank > updates_rank:
+            broadcast_shape = tf.shape(indices_tensor)
+            pad_rank = indices_rank - updates_rank
+            updates_tensor_for_scatter = _pad_and_broadcast(
+                updates_tensor,
+                pad_rank,
+                broadcast_shape,
+            )
+        else:
+            broadcast_shape = tf.shape(updates_tensor)
+            pad_rank = updates_rank - indices_rank
+            indices_tensor = _pad_and_broadcast(
+                indices_tensor,
+                pad_rank,
+                broadcast_shape,
+            )
     sparsified_dense_idx_shape = updates_tensor_shape
 
     if None not in sparsified_dense_idx_shape:
@@ -160,6 +202,13 @@ def make_node(
         ]
 
     idx_tensors_per_axis = tf.meshgrid(*idx_tensors_per_axis, indexing='ij')
+    if indices_rank is not None \
+        and updates_rank is not None \
+        and indices_rank > updates_rank:
+        idx_tensors_per_axis = [
+            _pad_and_broadcast(idx_tensor, pad_rank, broadcast_shape)
+            for idx_tensor in idx_tensors_per_axis
+        ]
     idx_tensors_per_axis[axis] = indices_tensor
     dim_expanded_idx_tensors_per_axis = [
         tf.expand_dims(idx_tensor, axis=-1)
@@ -194,7 +243,7 @@ def make_node(
     )
 
     indices = tf.reshape(coordinate, [-1, input_tensor_rank])
-    updates = tf.reshape(updates_tensor, [-1])
+    updates = tf.reshape(updates_tensor_for_scatter, [-1])
     output = tf.tensor_scatter_nd_update(
         tensor=input_tensor,
         indices=indices,

onnx2tf/ops/Unique.py

@@ -14,6 +14,7 @@ from onnx2tf.utils.common_functions import (
     make_tf_node_info,
     get_replacement_parameter,
     pre_process_transpose,
+    convert_axis,
 )
 from onnx2tf.utils.logging import Color
 
@@ -69,8 +70,20 @@ def make_node(
         **kwargs,
     )
 
+    input_tensor_shape = input_tensor.shape
+    tensor_rank = len(input_tensor_shape) \
+        if input_tensor_shape != tf.TensorShape(None) else 1
+
     axis = graph_node.attrs.get('axis', None)
     sorted = graph_node.attrs.get('sorted', 1)
+    if axis is not None:
+        if isinstance(axis, np.ndarray) and axis.shape == ():
+            axis = int(axis)
+        axis = convert_axis(
+            axis=int(axis),
+            tensor_rank=tensor_rank,
+            before_op_output_shape_trans=before_op_output_shape_trans,
+        )
 
     # Preserving Graph Structure (Dict)
     for graph_node_output in graph_node_outputs:
@@ -101,17 +114,64 @@ def make_node(
 
     # tf unique returns unsorted tensor, need to sort if option is enabled
     if sorted:
-        # TODO: implement sort
-        error_msg = f'' + \
-                    Color.RED(f'WARNING:') + ' ' + \
-                    f'Sort option in Unique ops is not implemented yet.'
-        print(error_msg)
-        assert False, error_msg
-
-    tf_layers_dict[graph_node_outputs[0].name]['tf_node'] = y
-    tf_layers_dict[graph_node_outputs[1].name]['tf_node'] = indices
-    tf_layers_dict[graph_node_outputs[2].name]['tf_node'] = inverse_indices
-    tf_layers_dict[graph_node_outputs[3].name]['tf_node'] = count
+        # Sort unique outputs to match ONNX sorted behavior.
+        def _argsort_supported(dtype):
+            return dtype.is_floating or dtype.is_integer or dtype == tf.bool
+
+        y_rank = y.shape.rank
+        axis_ = axis
+        if axis_ is None:
+            axis_ = 0
+        if axis_ < 0 and y_rank is not None:
+            axis_ = axis_ + y_rank
+
+        def _lexsort_perm(flat_2d):
+            if not _argsort_supported(flat_2d.dtype):
+                return None
+            cols = flat_2d.shape[1]
+            if cols is None:
+                return None
+            order = tf.range(tf.shape(flat_2d)[0])
+            for col in reversed(range(cols)):
+                col_vals = tf.gather(flat_2d, order)[:, col]
+                if col_vals.dtype == tf.bool:
+                    col_vals = tf.cast(col_vals, tf.int32)
+                order = tf.gather(order, tf.argsort(col_vals, stable=True))
+            return order
+
+        order = None
+        if y_rank is not None and y_rank == 1:
+            if _argsort_supported(y.dtype):
+                sort_vals = y
+                if sort_vals.dtype == tf.bool:
+                    sort_vals = tf.cast(sort_vals, tf.int32)
+                order = tf.argsort(sort_vals, stable=True)
+        elif y_rank is not None and axis_ is not None and 0 <= axis_ < y_rank:
+            perm = [axis_] + [i for i in range(y_rank) if i != axis_]
+            y_t = tf.transpose(y, perm)
+            flat = tf.reshape(y_t, [tf.shape(y_t)[0], -1])
+            order = _lexsort_perm(flat)
+
+        if order is None:
+            warn_msg = f'' + \
+                       Color.YELLOW(f'WARNING:') + ' ' + \
+                       f'Unique sort fallback to unsorted due to dynamic shape or unsupported dtype.'
+            print(warn_msg)
+        else:
+            y = tf.gather(y, order, axis=axis_)
+            count = tf.gather(count, order)
+            indices = tf.gather(indices, order)
+            inv_order = tf.argsort(order)
+            inverse_indices = tf.gather(inv_order, inverse_indices)
+
+    if len(graph_node_outputs) >= 1:
+        tf_layers_dict[graph_node_outputs[0].name]['tf_node'] = y
+    if len(graph_node_outputs) >= 2:
+        tf_layers_dict[graph_node_outputs[1].name]['tf_node'] = indices
+    if len(graph_node_outputs) >= 3:
+        tf_layers_dict[graph_node_outputs[2].name]['tf_node'] = inverse_indices
+    if len(graph_node_outputs) >= 4:
+        tf_layers_dict[graph_node_outputs[3].name]['tf_node'] = count
 
     # Generation of Debug Info
     tf_outputs = {f"output{idx}": value for idx, value in enumerate([y, indices, inverse_indices, count])}

{onnx2tf-1.29.21.dist-info → onnx2tf-1.29.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.21
+Version: 1.29.23
 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).
 Keywords: onnx,tensorflow,tflite,keras,deep-learning,machine-learning
 Author: Katsuya Hyodo
@@ -365,7 +365,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.29.21
+  ghcr.io/pinto0309/onnx2tf:1.29.23
 
   or
 
@@ -373,7 +373,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.29.21
+  docker.io/pinto0309/onnx2tf:1.29.23
 
   or
 
@@ -493,13 +493,20 @@ onnx2tf -i resnet18-v1-7.onnx -v info
 # without input OP name.
 # Note that if there are multiple input OPs, the zero dimension of all input OPs is
 # forced to be rewritten.
-# The `-ois` option allows undefined dimensions in all dimensions, including
-# the zero dimensionality, to be overwritten to a static shape, but requires
+# The `-sh/--shape-hints` option provides shape hints for input tensors with undefined
+# dimensions, significantly improving the conversion success rate for models with dynamic
+# input shapes. Specifying this option in combination with the `-b` option will further
+# improve the success rate of model conversion. The `-sh` option does not change ONNX
+# input OPs to static shapes.
+# The `-ois/--overwrite_input_shape` option allows undefined dimensions in all dimensions,
+# including the zero dimensionality, to be overwritten to a static shape, but requires
 # the input OP name to be specified.
 # e.g. -ois data1:1,3,224,224 data2:1,255 data3:1,224,6
 wget https://github.com/PINTO0309/onnx2tf/releases/download/0.0.2/resnet18-v1-7.onnx
 onnx2tf -i resnet18-v1-7.onnx -b 1
 or
+onnx2tf -i resnet18-v1-7.onnx -sh data:1,3,224,224 -b 1
+or
 onnx2tf -i resnet18-v1-7.onnx -ois data:1,3,224,224
 
 # Suppress automatic transposition of input OPs from NCW, NCHW, NCDHW to NWC, NHWC, NDHWC.

{onnx2tf-1.29.21.dist-info → onnx2tf-1.29.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=oN6Sb7PL3XQhFQGL8NsC07srojuozSUJPFJDOv1ST2k,67
+onnx2tf/__init__.py,sha256=UHUGx_MsU6r_wJE0gjKBbArcku-dgsuNhDOnc8lkSn0,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=BC-BFMf8QUG7PtOvpwglhe1sc4FhTO8AMrdlxKUN5jc,208204
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -98,7 +98,7 @@ onnx2tf/ops/LpPool.py,sha256=96eI1FaDgW0M_USWBCHFedvtojHTLL28_lb3mcEV55A,10470
 onnx2tf/ops/MatMul.py,sha256=X9cQSD4BCogkDP6D4YZEZmOWnsceGL8ppN8E4kqyjB0,23926
 onnx2tf/ops/MatMulInteger.py,sha256=qHqzdJNI9SeJDbW8pR90baYCdGN6FdOez4hi9EzwXoc,6538
 onnx2tf/ops/Max.py,sha256=w5nMciO_6ApYUobHuwMGuS3xhuza7eSvKDRhvMPgAuo,3256
-onnx2tf/ops/MaxPool.py,sha256=_JC4eqBTh-qLkZCMG8RZhthRZ8D2d821zaFMWeGMEWc,15775
+onnx2tf/ops/MaxPool.py,sha256=0zO5gNfcwAhXAVxIbURiXAlLQ56oJvtpcyLm4leZVsM,17948
 onnx2tf/ops/MaxRoiPool.py,sha256=RYZyjnINqJd6k7KLFJ-D9iHjA2vR-m7WvhrumD9cmDk,8490
 onnx2tf/ops/MaxUnpool.py,sha256=dGIEvC45rFuWoeG1S9j4sjEdEUqiWs_xdY5DZH6X7b4,5743
 onnx2tf/ops/Mean.py,sha256=xfTjKpQntJB8uXAkgDLS77oLXy2yQh1Hlz0K2GltMh0,3132
@@ -118,7 +118,7 @@ onnx2tf/ops/OneHot.py,sha256=OThLm1MF1X75zx7gep_qdnRHsTRZX_tqZxjt6pAVi7E,6489
 onnx2tf/ops/OptionalGetElement.py,sha256=Qg8Lix1_rdGtVWC-UNC91ekx3ztB-5_UtWkg67M2Z5E,3031
 onnx2tf/ops/OptionalHasElement.py,sha256=fyZMPBWvLVohsm8J5FLMlYGBDr6HVq5lh9jL-yKp-tk,3031
 onnx2tf/ops/Or.py,sha256=7gyUSgbEVVQBp2t3G93pZlHNn0ejJfZ3rbSDOnFgUi0,4586
-onnx2tf/ops/PRelu.py,sha256=pHbsffhb2rLZPPb9NdKUT4f5-lC0TXmbZVafookXo90,6314
+onnx2tf/ops/PRelu.py,sha256=DxLBUgxQdO5IL1--xA5lbGq7dI-kr8UKn2Mf-4j8L5Q,7769
 onnx2tf/ops/Pad.py,sha256=xZOkZK-53sXU-d0nADAjR1wOpKqfzHeJjTmzwon6G4A,11883
 onnx2tf/ops/Pow.py,sha256=DZjrWQSyLw_BPXrKyoTqT9KJIxPfNxnYVcoTDBagDgM,7056
 onnx2tf/ops/QLinearAdd.py,sha256=OssQI0pd8KXdnCC8urCPKP8bpcvSX0D76bS7q4-xMSY,5027
@@ -160,7 +160,7 @@ onnx2tf/ops/STFT.py,sha256=LDKN309_dBu4v9AYpz70uMJbNjRFiOte9O3wUL4bIJw,4463
 onnx2tf/ops/ScaleAndTranslate.py,sha256=VQDDhSs9TyMLQy0mF7n8pZ2TuvoKY-Lhlzd7Inf4UdI,11989
 onnx2tf/ops/Scan.py,sha256=hfN-DX6Gp-dG5158WMoHRrDWZAra3VSbsjsiphNqRIQ,16293
 onnx2tf/ops/Scatter.py,sha256=5_rTM60FPCq8unyNPDO-BZXcuz6w9Uyl2Xqx-zJTpgg,746
-onnx2tf/ops/ScatterElements.py,sha256=mp-TmswDTA9Nv0B3G3b-khOCPCKHnhCI97jDRofoEM0,8561
+onnx2tf/ops/ScatterElements.py,sha256=vXURNSkorfm7iQ_HA5vY9nf6YIkrAdqmB7sdEtWnUCo,10452
 onnx2tf/ops/ScatterND.py,sha256=-mVbxXjQor2T6HVHSJy5e0FHQmEfaHknaKPuSc3Oz4o,11005
 onnx2tf/ops/Selu.py,sha256=CD0SqQlTTe0chO7lebkrdfDFSk6Cg9zLhvrKomsSH4Y,3799
 onnx2tf/ops/SequenceAt.py,sha256=jpjl9gVJFagtg223YY26I0pUUEgEFjJGvSZWwbo2-mQ,3278
@@ -199,7 +199,7 @@ onnx2tf/ops/Tile.py,sha256=xkprg6yTaykivcHFJ644opzVPctaeplu-Ed-OpS98Gg,12720
 onnx2tf/ops/TopK.py,sha256=f6OG-DcMWneXwSjIkmY935SPyOMD5tMteHnlQHoJwQo,6348
 onnx2tf/ops/Transpose.py,sha256=GwJFp7zVqodEsv5mGWviuFqeK93uVM7dbRQ1N8Ua1hg,9774
 onnx2tf/ops/Trilu.py,sha256=uz2TgdErpo9GDp9n4PCe0_koIpNLgBoPCjv3A6VBTl8,4789
-onnx2tf/ops/Unique.py,sha256=GUuOeTO9px22dHmlAn2SOmRHvBgSXo-SaPWm5rYUtPc,4084
+onnx2tf/ops/Unique.py,sha256=Dms8Pi3uo8dyBFBddc-83_x4JSJ21pbaWhxzXzYotr4,6507
 onnx2tf/ops/Unsqueeze.py,sha256=UJun_DYfg7aQaHoeAvWlB85oRtDWq2lP7kvb0njcaC0,12219
 onnx2tf/ops/Upsample.py,sha256=SX3N_wZHD8G5Z0PLcPgX1ZCzOdct-uTzxKeMhhzeBOw,5304
 onnx2tf/ops/Where.py,sha256=MaCcY9g4mKZQqCgh4xtoylicP-xVu9f4boKiu_q9Ow8,7711
@@ -211,7 +211,7 @@ onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/iterative_json_optimizer.py,sha256=qqeIxWGxrhcCYk8-ebWnblnOkzDCwi-nseipHzHR_bk,10436
 onnx2tf/utils/json_auto_generator.py,sha256=OC-SfKtUg7zUxaXTAg6kT0ShzIc3ByjDa3FNp173DtA,60302
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.29.21.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-onnx2tf-1.29.21.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
-onnx2tf-1.29.21.dist-info/METADATA,sha256=LKRmQIHHTw23h1BZd-KhyHQz46BWSK9ib2WaUvgyld8,156067
-onnx2tf-1.29.21.dist-info/RECORD,,
+onnx2tf-1.29.23.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+onnx2tf-1.29.23.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
+onnx2tf-1.29.23.dist-info/METADATA,sha256=ZMCERN7Q5orWmi94swf-4tt_Y3AkAI2em3tF_sQGR7g,156531
+onnx2tf-1.29.23.dist-info/RECORD,,