onnx2tf 1.27.2__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.2'
+__version__ = '1.27.4'

onnx2tf/onnx2tf.py

@@ -1259,11 +1259,6 @@ def convert(
                 if len(msg_list) > 0:
                     for s in msg_list:
                         if 'Unable to serialize VariableSpec' in s:
-                            warn(
-                                f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                                f'but is not output because h5 does not support GroupConvolution. ' +
-                                f'If h5 is needed, specify --disable_group_convolution to retransform the model.'
-                            )
                             break
                 else:
                     error(e)
@@ -1285,11 +1280,6 @@ def convert(
                 if len(msg_list) > 0:
                     for s in msg_list:
                         if 'Unable to serialize VariableSpec' in s:
-                            warn(
-                                f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                                f'but is not output because keras_v3 does not support GroupConvolution. ' +
-                                f'If keras_v3 is needed, specify --disable_group_convolution to retransform the model.'
-                            )
                             break
                 else:
                     error(e)
@@ -1404,10 +1394,7 @@ def convert(
                 )
                 info(Color.GREEN(f'TFv1 .pb output complete!'))
             except KeyError as e:
-                warn(
-                    f'Probably due to GroupConvolution, saved_model could not be generated successfully, ' +
-                    f'so onnx2tf skip the output of TensorFlow v1 pb.'
-                )
+                pass
             except Exception as e:
                 error(e)
                 import traceback

onnx2tf/ops/Conv.py

@@ -468,12 +468,6 @@ def make_node(
                 error_check_tf_op_type = 'conv_bias'
 
             else:
-                if kernel_size in (1, 2, 3) and not disable_group_convolution:
-                    warn(
-                        f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                        f'but is not output because saved_model does not support GroupConvolution. ' +
-                        f'If saved_model is needed, specify --disable_group_convolution to retransform the model.'
-                    )
                 # GroupedConvolution - Conv1D, Conv2D, Conv3D - Bias Add
                 if kernel_size == 1 and not disable_group_convolution:
                     tf_layers_dict[graph_node_output.name]['tf_node'] = \
@@ -571,12 +565,6 @@ def make_node(
                 error_check_tf_op_type = 'conv_nobias'
 
             else:
-                if kernel_size in (1, 2, 3) and not disable_group_convolution:
-                    warn(
-                        f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                        f'but is not output because saved_model does not support GroupConvolution. ' +
-                        f'If saved_model is needed, specify --disable_group_convolution to retransform the model.'
-                    )
                 # GroupedConvolution - Conv1D, Conv2D, Conv3D - No Bias
                 if kernel_size == 1 and not disable_group_convolution:
                     tf_layers_dict[graph_node_output.name]['tf_node'] = \

onnx2tf/ops/ConvInteger.py

@@ -417,12 +417,6 @@ def make_node(
             error_check_tf_op_type = 'conv_nobias'
 
         else:
-            if kernel_size in (1, 2, 3) and not disable_group_convolution:
-                warn(
-                    f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                    f'but is not output because saved_model does not support GroupConvolution. ' +
-                    f'If saved_model is needed, specify --disable_group_convolution to retransform the model.'
-                )
             # GroupedConvolution - Conv1D, Conv2D, Conv3D - No Bias
             if kernel_size == 1 and not disable_group_convolution:
                 tf_layers_dict[graph_node_output.name]['tf_node'] = \

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.2.dist-info → onnx2tf-1.27.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.2
+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.2
+  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.2
+  docker.io/pinto0309/onnx2tf:1.27.4
 
   or
 

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

@@ -1,6 +1,6 @@
-onnx2tf/__init__.py,sha256=hu7TZkPbwUCwf8zZcrp1NGR2aMUiIbLW_oqR1se7KzI,66
+onnx2tf/__init__.py,sha256=gmbApNBlikoE1jGydbqconZ-bEgpuCTCs_Nku2GCJfQ,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
-onnx2tf/onnx2tf.py,sha256=IEnfIs3Dy8Y5F3iJ4HY7bWkn3QuB6lq_gHa1q5E3tMI,124745
+onnx2tf/onnx2tf.py,sha256=9g8enwecc2e0vZ3dnvE7ukZYEqsCBOo940zdauvN_-M,123738
 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
@@ -26,8 +26,8 @@ onnx2tf/ops/Concat.py,sha256=CKfJbiAwP7h9sFFVyueHJCbwMkUo3NXqkTuRc8v7Tw8,31215
 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
-onnx2tf/ops/Conv.py,sha256=2BPHrEFWSWONDFp4Mrs8V426ybKANxUmjFscM8PXXD4,38791
-onnx2tf/ops/ConvInteger.py,sha256=Njw7nJhfZcbo4ofC3UMry5EWxs2lRq1X370vSHIZpXw,27095
+onnx2tf/ops/Conv.py,sha256=jcBIgZY4IXxVnlNNmkGhIVbsE6UWmA7xfwe9Jw3J1G8,37881
+onnx2tf/ops/ConvInteger.py,sha256=UVHy1de6uCLM7IXP4vpzPz2pN2ej278lGBiqTPNdXFA,26664
 onnx2tf/ops/ConvTranspose.py,sha256=C7CR6m3kz0MtUBdtWrrKWZbZL7tJpGXl7Nkn3DRiEaA,15410
 onnx2tf/ops/Cos.py,sha256=0v5ZJZRzrswVEObyxf4f0RvnWMWZA4uCEdoeq_VE31s,3608
 onnx2tf/ops/Cosh.py,sha256=-L3QkQtiVBJIv1sSxbXtetVIwgI_2T4WC1O4t2aJ8Gc,3585
@@ -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.2.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.27.2.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.27.2.dist-info/METADATA,sha256=Vhy11gd-Dvr86ENsHvxyHUhVQGHzwEY6PHvY8KYmVqM,147712
-onnx2tf-1.27.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-onnx2tf-1.27.2.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.27.2.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.27.2.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,,

{onnx2tf-1.27.2.dist-info → onnx2tf-1.27.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any