onnx2tf 1.29.16__py3-none-any.whl → 1.29.17__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.29.16'
+__version__ = '1.29.17'

onnx2tf/ops/Add.py

@@ -21,6 +21,7 @@ from onnx2tf.utils.common_functions import (
     disable_unnecessary_transpose,
     shape_unmatched_special_avoidance_workaround,
     merge_two_consecutive_identical_ops_into_one,
+    transpose_with_flexing_deterrence,
     deterring_shape_corruption_due_to_broadcast,
     acquisition_of_validation_data,
     onnx_tf_tensor_validation,
@@ -297,6 +298,117 @@ def make_node(
             )
         tf_type = tf.identity
 
+    def _normalize_dim(dim):
+        return int(dim) if isinstance(dim, (int, np.integer)) else None
+
+    def _get_static_shape(tensor):
+        shape = getattr(tensor, 'shape', None)
+        if shape is None or shape == tf.TensorShape(None):
+            return None
+        return [_normalize_dim(dim) for dim in list(shape)]
+
+    def _shape_match_with_none(expected, actual):
+        if expected is None or actual is None:
+            return False
+        if len(expected) != len(actual):
+            return False
+        for e_dim, a_dim in zip(expected, actual):
+            e_dim = _normalize_dim(e_dim)
+            a_dim = _normalize_dim(a_dim)
+            if e_dim is None or a_dim is None:
+                continue
+            if e_dim != a_dim:
+                return False
+        return True
+
+    def _perm_shape(shape, perm):
+        return [shape[i] for i in perm] if shape is not None else None
+
+    def _limited_perms(rank):
+        identity = list(range(rank))
+        perms = [identity]
+        if rank == 3:
+            perms.append([0, 2, 1])
+        elif rank == 4:
+            perms.extend([[0, 2, 3, 1], [0, 3, 1, 2]])
+        elif rank == 5:
+            perms.extend([[0, 2, 3, 4, 1], [0, 4, 1, 2, 3]])
+        return perms
+
+    def _ranked_perms(perms, input_shape, onnx_shape):
+        if input_shape is None or onnx_shape is None:
+            return perms
+        scored = []
+        for perm in perms:
+            score = 0
+            for out_idx, in_idx in enumerate(perm):
+                if out_idx >= len(onnx_shape) or in_idx >= len(input_shape):
+                    continue
+                o_dim = _normalize_dim(onnx_shape[out_idx])
+                i_dim = input_shape[in_idx]
+                if isinstance(o_dim, int) and isinstance(i_dim, int) and o_dim == i_dim:
+                    score += o_dim
+            scored.append((score, 1 if perm == list(range(len(perm))) else 0, perm))
+        scored.sort(key=lambda x: (x[0], x[1]), reverse=True)
+        return [p for _, _, p in scored]
+
+    # Rescue guard for unexpected broadcasted shapes
+    if not enable_gelu:
+        expected_shape = None
+        if graph_node_output_shape is not None:
+            expected_shape = [_normalize_dim(dim) for dim in list(graph_node_output_shape)]
+        output_shape = _get_static_shape(tf_layers_dict[graph_node_output.name]['tf_node'])
+        input_shape_1 = _get_static_shape(input_tensor_1)
+        input_shape_2 = _get_static_shape(input_tensor_2)
+        if expected_shape is not None \
+            and output_shape is not None \
+            and not _shape_match_with_none(expected_shape, output_shape) \
+            and input_shape_1 is not None \
+            and input_shape_2 is not None \
+            and len(input_shape_1) == len(expected_shape) \
+            and len(input_shape_2) == len(expected_shape):
+
+            rank = len(expected_shape)
+            perms = _limited_perms(rank)
+            perm_list_1 = _ranked_perms(perms, input_shape_1, expected_shape)
+            perm_list_2 = _ranked_perms(perms, input_shape_2, expected_shape)
+            rescue_done = False
+            for perm_1 in perm_list_1:
+                for perm_2 in perm_list_2:
+                    try_input_1 = transpose_with_flexing_deterrence(
+                        input_tensor=input_tensor_1,
+                        perm=perm_1,
+                        **kwargs,
+                    )
+                    try_input_2 = transpose_with_flexing_deterrence(
+                        input_tensor=input_tensor_2,
+                        perm=perm_2,
+                        **kwargs,
+                    )
+                    try:
+                        rescue_tensor = tf.math.add(
+                            x=try_input_1 \
+                                if not isinstance(try_input_1, np.ndarray) \
+                                    else tf.convert_to_tensor(try_input_1),
+                            y=try_input_2 \
+                                if not isinstance(try_input_2, np.ndarray) \
+                                    else tf.convert_to_tensor(try_input_2),
+                            name=graph_node.name,
+                        )
+                    except Exception as ex:
+                        continue
+
+                    rescue_shape = _get_static_shape(rescue_tensor)
+                    if _shape_match_with_none(expected_shape, rescue_shape):
+                        input_tensor_1 = try_input_1
+                        input_tensor_2 = try_input_2
+                        tf_layers_dict[graph_node_output.name]['tf_node'] = rescue_tensor
+                        tf_type = tf.math.add
+                        rescue_done = True
+                        break
+                if rescue_done:
+                    break
+
     # Post-process transpose
     tf_layers_dict[graph_node_output.name]['tf_node'] = \
         post_process_transpose(

onnx2tf/ops/Concat.py

@@ -291,6 +291,78 @@ def make_node(
         tf_type = tf.constant
 
     else:
+        def _normalize_dim(dim):
+            return int(dim) if isinstance(dim, (int, np.integer)) else None
+
+        def _get_static_shape(tensor):
+            shape = getattr(tensor, 'shape', None)
+            if shape is None or shape == tf.TensorShape(None):
+                return None
+            return [_normalize_dim(dim) for dim in list(shape)]
+
+        def _shape_match_with_none(onnx_shape, tf_shape):
+            if onnx_shape is None or tf_shape is None:
+                return False
+            if len(onnx_shape) != len(tf_shape):
+                return False
+            for o_dim, t_dim in zip(onnx_shape, tf_shape):
+                o_dim = _normalize_dim(o_dim)
+                t_dim = _normalize_dim(t_dim)
+                if o_dim is None or t_dim is None:
+                    continue
+                if o_dim != t_dim:
+                    return False
+            return True
+
+        def _can_concat_shapes(shapes, axis):
+            if shapes is None or any(s is None for s in shapes):
+                return True
+            rank = len(shapes[0])
+            for idx in range(rank):
+                if idx == axis:
+                    continue
+                dims = [s[idx] for s in shapes]
+                known = [d for d in dims if isinstance(d, int)]
+                if len(known) >= 2 and len(set(known)) != 1:
+                    return False
+            return True
+
+        def _perm_shape(shape, perm):
+            return [shape[i] for i in perm] if shape is not None else None
+
+        def _limited_perms(rank):
+            identity = list(range(rank))
+            perms = [identity]
+            if rank == 3:
+                perms.append([0, 2, 1])
+            elif rank == 4:
+                perms.extend([[0, 2, 3, 1], [0, 3, 1, 2]])
+            elif rank == 5:
+                perms.extend([[0, 2, 3, 4, 1], [0, 4, 1, 2, 3]])
+            return perms
+
+        def _base_perms(rank):
+            if rank <= 1:
+                return [list(range(rank))]
+            return [list(p) for p in itertools.permutations(range(rank))]
+
+        def _ranked_perms(perms, input_shape, axis, onnx_shape):
+            identity = list(range(len(perms[0]))) if perms else []
+            scored = []
+            for perm in perms:
+                score = 0
+                if input_shape is not None and onnx_shape is not None:
+                    for out_idx, in_idx in enumerate(perm):
+                        if out_idx == axis:
+                            continue
+                        o_dim = _normalize_dim(onnx_shape[out_idx]) if out_idx < len(onnx_shape) else None
+                        i_dim = input_shape[in_idx] if in_idx < len(input_shape) else None
+                        if isinstance(o_dim, int) and isinstance(i_dim, int) and o_dim == i_dim:
+                            score += o_dim
+                scored.append((score, 1 if perm == identity else 0, perm))
+            scored.sort(key=lambda x: (x[0], x[1]), reverse=True)
+            return [p for _, _, p in scored]
+
         try:
             # normal concat attempt
             tf_layers_dict[graph_node_output.name]['tf_node'] = \
@@ -301,35 +373,109 @@ def make_node(
                 )
         except:
             # Workaround to reduce error rate when merging tensors with undefined dimensions
-            try:
-                # Attempts to bind with the axis specified in ONNX
-                tf_layers_dict[graph_node_output.name]['tf_node'] = \
-                    tf.concat(
-                        values=values,
-                        axis=int(graph_node.attrs.get('axis', 0)),
-                        name=graph_node.name,
-                    )
-                axis = int(graph_node.attrs.get('axis', 0))
-            except:
-                # If not successful with the same axis as ONNX, try to combine by other axes
-                # Trial in reverse order from the axis at the end
-                value_rank = len(values[0].shape)
-                succeed = False
-                for idx in reversed(range(value_rank)):
+            original_values = values
+            original_shapes = [_get_static_shape(v) for v in original_values]
+            value_rank = getattr(original_values[0].shape, 'rank', None)
+            if value_rank is None:
+                value_rank = len(original_values[0].shape)
+
+            onnx_shape_list = None
+            if onnx_output_shape is not None:
+                onnx_shape_list = [_normalize_dim(dim) for dim in list(onnx_output_shape)]
+
+            onnx_axis = int(graph_node.attrs.get('axis', 0))
+            onnx_axis = onnx_axis + value_rank if onnx_axis < 0 else onnx_axis
+
+            def _axis_score(axis_idx):
+                if onnx_shape_list is not None and axis_idx < len(onnx_shape_list):
+                    onnx_dim = onnx_shape_list[axis_idx]
+                    if isinstance(onnx_dim, int):
+                        return onnx_dim
+                score = 0
+                for shape in original_shapes:
+                    if shape is None or axis_idx >= len(shape):
+                        continue
+                    dim = shape[axis_idx]
+                    if isinstance(dim, int):
+                        score += dim
+                return score
+
+            axis_candidates = list(range(value_rank))
+            axis_candidates.sort(
+                key=lambda a: (_axis_score(a), 1 if a == onnx_axis else 0),
+                reverse=True,
+            )
+
+            base_perms = _base_perms(value_rank)
+            max_combo = 20000
+            if len(base_perms) ** len(original_values) > max_combo:
+                base_perms = _limited_perms(value_rank)
+
+            succeed = False
+            matched = False
+            chosen_axis = None
+            chosen_values = None
+            chosen_tensor = None
+
+            for axis_idx in axis_candidates:
+                perm_lists = [
+                    _ranked_perms(base_perms, shape, axis_idx, onnx_shape_list)
+                    for shape in original_shapes
+                ]
+                for perm_combo in itertools.product(*perm_lists):
+                    permuted_shapes = [
+                        _perm_shape(shape, perm) for shape, perm in zip(original_shapes, perm_combo)
+                    ]
+                    if not _can_concat_shapes(permuted_shapes, axis_idx):
+                        continue
+                    try_values = [
+                        value if perm == list(range(value_rank)) else
+                        transpose_with_flexing_deterrence(
+                            input_tensor=value,
+                            perm=perm,
+                            **kwargs,
+                        )
+                        for value, perm in zip(original_values, perm_combo)
+                    ]
                     try:
-                        tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                        concat_tensor = \
                             tf.concat(
-                                values=values,
-                                axis=idx,
+                                values=try_values,
+                                axis=axis_idx,
                                 name=graph_node.name,
                             )
-                        axis = idx
+                    except:
+                        continue
+
+                    if not succeed:
                         succeed = True
+                        chosen_axis = axis_idx
+                        chosen_values = try_values
+                        chosen_tensor = concat_tensor
+
+                    if onnx_shape_list is None:
+                        matched = True
+                        chosen_axis = axis_idx
+                        chosen_values = try_values
+                        chosen_tensor = concat_tensor
                         break
-                    except:
-                        pass
-                if not succeed:
-                    raise
+
+                    output_shape = _get_static_shape(concat_tensor)
+                    if _shape_match_with_none(onnx_shape_list, output_shape):
+                        matched = True
+                        chosen_axis = axis_idx
+                        chosen_values = try_values
+                        chosen_tensor = concat_tensor
+                        break
+                if matched:
+                    break
+
+            if succeed:
+                tf_layers_dict[graph_node_output.name]['tf_node'] = chosen_tensor
+                axis = chosen_axis
+                values = chosen_values
+            else:
+                raise
 
         # Attempts to force axis correction when the number of axes in the combined tensor do not exactly match.
         # However, if more than 2 patterns of correct answers exist, give up the correction.

{onnx2tf-1.29.16.dist-info → onnx2tf-1.29.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.16
+Version: 1.29.17
 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
@@ -364,7 +364,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.16
+  ghcr.io/pinto0309/onnx2tf:1.29.17
 
   or
 
@@ -372,7 +372,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.16
+  docker.io/pinto0309/onnx2tf:1.29.17
 
   or
 

{onnx2tf-1.29.16.dist-info → onnx2tf-1.29.17.dist-info}/RECORD

@@ -1,10 +1,10 @@
-onnx2tf/__init__.py,sha256=eUTDHQ-QolqzjE7OAU5EnMP1epQf_1sc4vD2dRt8Bj4,67
+onnx2tf/__init__.py,sha256=lBriMyNyUvk8PZzSUDHztzVxIWdVqefvM7BTdwwGAGU,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=y8FewjpNYAFnUs0cjq6JzdYkiXQSm1o_sZ3PXLJzK64,161921
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
 onnx2tf/ops/Acos.py,sha256=Fo8YkFKuWq8Fi2xUrBdKcAH1yJ8r5pjSD0wgLttTNdk,4003
 onnx2tf/ops/Acosh.py,sha256=ATQj2cT5JS_mTfXi0kXqJ1yzSZu5J0zHA5VjV3j7uKY,3588
-onnx2tf/ops/Add.py,sha256=pgJTnV1wZZk3mRaVxxezVkArfmlqlk74DCMZDm6VRJc,12295
+onnx2tf/ops/Add.py,sha256=oSEAuUCPT7lju3R873OH_CDchU4RTDuF8ALJuHyydVc,17106
 onnx2tf/ops/AffineGrid.py,sha256=j_Q0gRoWpQhep7xHQVqyEBiCbe4yiNelIYSsvq0MPXg,6281
 onnx2tf/ops/And.py,sha256=_ubtWa0r8-60x__pS7MEMil1DfBqxiUsk66yRCYS4KY,4591
 onnx2tf/ops/ArgMax.py,sha256=F3PV4EchYQgH1GATJybVGnmY9sGvZkgxCHbNCue9Qns,7278
@@ -29,7 +29,7 @@ onnx2tf/ops/Celu.py,sha256=9g7WNKo4G_jMtUXcoOfpNdLYqEsuyXLPkkyQZxDuL4U,3853
 onnx2tf/ops/Clip.py,sha256=K3Pgt9BXl5_rzg6s-kPFmwElL5COsvolRY1BUTo7UWw,8753
 onnx2tf/ops/Col2Im.py,sha256=MDqck00gURrbsroJAgUDkxmdsGyE9v2ez4NKdvdq5IY,7514
 onnx2tf/ops/Compress.py,sha256=NvDGr9gCNl-8YG41xDBfe3UvhRP03K-ktdtY_MoytBc,3667
-onnx2tf/ops/Concat.py,sha256=M0KSwymMIYR-YOIlylFe708TDdOvWNMxDE6V4UKE1MI,32570
+onnx2tf/ops/Concat.py,sha256=kDk7LN01nHuQyYnEPUEikSQ-M17jguAc-qFtCb9tg9I,38537
 onnx2tf/ops/ConcatFromSequence.py,sha256=z8pNmGQRGq9cxWORW330NZS_0zsmhFudLswMyPn8AXU,3086
 onnx2tf/ops/Constant.py,sha256=BNZLzNI4rK9kXgVWwD-2RFsDsH7mMy7AY2JSgTNXIWk,10696
 onnx2tf/ops/ConstantOfShape.py,sha256=6eYm-niow-6fHVEyNyi81BdrVe3IbcdazCp2nySWExA,2331
@@ -199,7 +199,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.16.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-onnx2tf-1.29.16.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
-onnx2tf-1.29.16.dist-info/METADATA,sha256=2h83lAHOcFRpBz9nj2MaYmQZlNG74IdwlHkah1pZpeI,154244
-onnx2tf-1.29.16.dist-info/RECORD,,
+onnx2tf-1.29.17.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
+onnx2tf-1.29.17.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
+onnx2tf-1.29.17.dist-info/METADATA,sha256=1KG30m7PWIXRFCyU9xrvlttJLm4kZmZCj0BOrf-f_gw,154244
+onnx2tf-1.29.17.dist-info/RECORD,,