onnx2tf 1.29.7__py3-none-any.whl → 1.29.9__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.29.7'
+__version__ = '1.29.9'

onnx2tf/ops/Unsqueeze.py

@@ -69,52 +69,58 @@ def make_node(
         if isinstance(graph_node_input_1, gs.Variable) \
             and 'nhwc' in tf_layers_dict[graph_node_input_1.name].keys() else False
 
+    input_tensor_shape = None
+    tensor_rank = None
     if input_tensor.shape != tf.TensorShape(None):
         input_tensor_shape = list(input_tensor.shape)
-        tensor_rank = len(input_tensor_shape)
-    elif graph_node_output.shape is not None:
+    elif graph_node_output.shape is not None and axes is not None:
         input_tensor_shape = [
             dim for idx, dim in enumerate(graph_node_output.shape) if idx not in axes
         ]
         input_tensor_shape = [
             dim if not isinstance(dim, str) else None for dim in input_tensor_shape
         ]
+    if input_tensor_shape is not None:
         tensor_rank = len(input_tensor_shape)
 
     if isinstance(axes, list) or (isinstance(axes, np.ndarray) and len(axes.shape) > 0):
-        if nhwc:
-            axes = [
-                convert_axis(
-                    axis=idx,
-                    tensor_rank=tensor_rank+len(axes),
-                    before_op_output_shape_trans=True,
-                ) for idx in axes
-            ]
-        elif not nhwc and (isinstance(axes, list) and len(axes) == 1 or isinstance(axes, np.ndarray) and len(axes.shape) == 1) and axes[0] == -1:
-            axes = [
-                convert_axis(
-                    axis=idx,
-                    tensor_rank=tensor_rank+len(axes),
-                    before_op_output_shape_trans=before_op_output_shape_trans,
-                ) for idx in axes
-            ]
+        if tensor_rank is not None:
+            if nhwc:
+                axes = [
+                    convert_axis(
+                        axis=idx,
+                        tensor_rank=tensor_rank+len(axes),
+                        before_op_output_shape_trans=True,
+                    ) for idx in axes
+                ]
+            elif not nhwc and (isinstance(axes, list) and len(axes) == 1 or isinstance(axes, np.ndarray) and len(axes.shape) == 1) and axes[0] == -1:
+                axes = [
+                    convert_axis(
+                        axis=idx,
+                        tensor_rank=tensor_rank+len(axes),
+                        before_op_output_shape_trans=before_op_output_shape_trans,
+                    ) for idx in axes
+                ]
+            else:
+                axes = [idx for idx in axes]
         else:
-            axes = [idx for idx in axes]
+            axes = [int(idx) for idx in axes]
     elif axes is not None and isinstance(axes, np.ndarray) and len(axes.shape) == 0:
-        if nhwc:
-            axes = convert_axis(
-                axis=axes,
-                tensor_rank=tensor_rank+1,
-                before_op_output_shape_trans=True,
-            )
-        elif not nhwc and (isinstance(axes, list) and len(axes) == 1 or isinstance(axes, np.ndarray) and len(axes.shape) == 1) and axes[0] == -1:
-            axes = [
-                convert_axis(
-                    axis=idx,
-                    tensor_rank=tensor_rank+len(axes),
-                    before_op_output_shape_trans=before_op_output_shape_trans,
-                ) for idx in axes
-            ]
+        if tensor_rank is not None:
+            if nhwc:
+                axes = convert_axis(
+                    axis=axes,
+                    tensor_rank=tensor_rank+1,
+                    before_op_output_shape_trans=True,
+                )
+            elif not nhwc and (isinstance(axes, list) and len(axes) == 1 or isinstance(axes, np.ndarray) and len(axes.shape) == 1) and axes[0] == -1:
+                axes = [
+                    convert_axis(
+                        axis=idx,
+                        tensor_rank=tensor_rank+len(axes),
+                        before_op_output_shape_trans=before_op_output_shape_trans,
+                    ) for idx in axes
+                ]
         axes = list(axes[np.newaxis])
 
     if axes is not None and isinstance(axes, list) and len(axes) > 0:
@@ -128,11 +134,13 @@ def make_node(
         **kwargs,
     )
 
-    new_shape = copy.deepcopy(input_tensor_shape)
-    for idx in axes:
-        new_shape.insert(idx, 1)
+    new_shape = None
+    if input_tensor_shape is not None and axes is not None:
+        new_shape = copy.deepcopy(input_tensor_shape)
+        for idx in axes:
+            new_shape.insert(idx, 1)
 
-    new_shape = [dim if dim is not None else -1 for dim in new_shape]
+        new_shape = [dim if dim is not None else -1 for dim in new_shape]
 
     # Preserving Graph Structure (Dict)
     tf_layers_dict[graph_node_output.name] = {
@@ -234,6 +242,29 @@ def make_node(
             tf.identity(input=input_tensor)
         tf_type = tf.identity
 
+    elif not shape_replaced \
+        and new_shape is None:
+        axes_list = axes
+        if axes_list is None:
+            axes_list = []
+        elif isinstance(axes_list, np.ndarray):
+            axes_list = axes_list.tolist() if axes_list.shape != () else [int(axes_list)]
+        elif not isinstance(axes_list, list):
+            axes_list = [int(axes_list)]
+
+        unsqueeze_tensor = input_tensor
+        for axis_idx, axis in enumerate(axes_list):
+            axis_val = int(axis) if isinstance(axis, (np.integer, np.int64, np.int32)) else axis
+            if isinstance(axis_val, int) and axis_val < 0:
+                axis_val = tf.rank(unsqueeze_tensor) + axis_val + 1
+            unsqueeze_tensor = tf.expand_dims(
+                input=unsqueeze_tensor,
+                axis=axis_val,
+                name=graph_node.name if axis_idx == len(axes_list) - 1 else None,
+            )
+        tf_layers_dict[graph_node_output.name]['tf_node'] = unsqueeze_tensor
+        tf_type = tf.expand_dims
+
     elif not shape_replaced \
         and nhwc \
         and len(axes) == 1 \
@@ -247,6 +278,7 @@ def make_node(
         tf_type = tf.expand_dims
 
     elif not shape_replaced \
+        and new_shape is not None \
         and len(new_shape) >= 2 \
         and len([dim for dim in new_shape if dim is None or dim == -1]) >= 2 \
         and not isinstance(axes, int) \

{onnx2tf-1.29.7.dist-info → onnx2tf-1.29.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.7
+Version: 1.29.9
 Summary: Self-Created Tools to convert ONNX files (NCHW) to TensorFlow/TFLite/Keras format (NHWC).
 Home-page: https://github.com/PINTO0309/onnx2tf
 Author: Katsuya Hyodo
@@ -16,7 +16,8 @@ Requires-Dist: numpy==1.26.4
 Requires-Dist: onnx==1.19.0
 Requires-Dist: onnxruntime==1.23.0
 Requires-Dist: opencv-python==4.11.0.86
-Requires-Dist: onnxsim==0.4.30
+Requires-Dist: onnxsim==0.4.36
+Requires-Dist: onnxoptimizer==0.4.2
 Requires-Dist: ai-edge-litert==2.1.0
 Requires-Dist: tensorflow==2.19.0
 Requires-Dist: tf-keras==2.19.0
@@ -306,10 +307,11 @@ Video speed is adjusted approximately 50 times slower than actual speed.
 - Linux / Windows
 - onnx==1.19.0
 - onnxruntime==1.23.0
-- onnx-simplifier==0.4.33 or 0.4.30 `(onnx.onnx_cpp2py_export.shape_inference.InferenceError: [ShapeInferenceError] (op_type:Slice, node name: /xxxx/Slice): [ShapeInferenceError] Inferred shape and existing shape differ in rank: (x) vs (y))`
+- onnxsim==0.4.36
+- onnxoptimizer==0.4.2
 - onnx_graphsurgeon==0.5.8
 - simple_onnx_processing_tools==1.1.32
-- tensorflow==2.19.0, Special bugs: [#436](https://github.com/PINTO0309/onnx2tf/issues/436)
+- tensorflow==2.19.0
 - tf-keras==2.19.0
 - ai-edge-litert==1.2.0
 - psutil==5.9.5
@@ -357,7 +359,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.7
+  ghcr.io/pinto0309/onnx2tf:1.29.9
 
   or
 
@@ -365,14 +367,15 @@ 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.7
+  docker.io/pinto0309/onnx2tf:1.29.9
 
   or
 
   pip install -U onnx==1.19.0 \
   && pip install -U onnx-graphsurgeon==0.5.8 \
   && pip install -U onnxruntime==1.23.0 \
-  && pip install -U onnxsim==0.4.33 \
+  && pip install -U onnxsim==0.4.36 \
+  && pip install -U onnxoptimizer==0.4.2 \
   && pip install -U simple_onnx_processing_tools==1.1.32 \
   && pip install -U sne4onnx>=1.0.13 \
   && pip install -U sng4onnx>=1.0.4 \

{onnx2tf-1.29.7.dist-info → onnx2tf-1.29.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=knP_P2W7jk-XqY8ebkyeA4xA5ZC_5WiqL_rZg3pdctY,66
+onnx2tf/__init__.py,sha256=0iOZ-E1Mv5pU4CHm_29h1gNBG_KtKmxjV5sHtV-0DKI,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=wdBA-lgCEu-ZfUAKIUQgLe8hSP8ifE7rS6nWAq6iF6o,151519
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -185,7 +185,7 @@ 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/Unsqueeze.py,sha256=uXZTFJYan_okpVU9jQ3ICNOhrz_jiwaY_R3wxA3UAuI,10749
+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
 onnx2tf/ops/Xor.py,sha256=2ceqxHSI1Wtez_CIh8gFfvcu45Xboqfyp1iy3v2vuIs,4590
@@ -198,9 +198,9 @@ 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.7.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.29.7.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.29.7.dist-info/METADATA,sha256=uWJ8kHjVfJXkyb9mJVIylYLy_aj6zNOBuRp9Qt6fIDY,153697
-onnx2tf-1.29.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-onnx2tf-1.29.7.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.29.7.dist-info/RECORD,,
+onnx2tf-1.29.9.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.29.9.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.29.9.dist-info/METADATA,sha256=_Rhg96G54IqDYqigqKQjYlFIzp3SRB2wpRrt03eeZ1w,153504
+onnx2tf-1.29.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+onnx2tf-1.29.9.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.29.9.dist-info/RECORD,,