onnx2tf 1.26.3__py3-none-any.whl → 1.26.5__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.26.3'
+__version__ = '1.26.5'

onnx2tf/onnx2tf.py

@@ -80,6 +80,7 @@ def convert(
     overwrite_input_shape: Optional[List[str]] = None,
     no_large_tensor: Optional[bool] = False,
     output_nms_with_dynamic_tensor: Optional[bool] = False,
+    switch_nms_version: Optional[str] = 'v4',
     keep_ncw_or_nchw_or_ncdhw_input_names: Optional[List[str]] = None,
     keep_nwc_or_nhwc_or_ndhwc_input_names: Optional[List[str]] = None,
     keep_shape_absolutely_input_names: Optional[List[str]] = None,
@@ -270,6 +271,12 @@ def convert(
         enable --output_nms_with_dynamic_tensor:\n
             output_tensor_shape: [N, 7]
 
+    switch_nms_version: Optional[str]
+        Switch the NMS version to V4 or V5 to convert.\n\n
+        e.g.\n
+        NonMaxSuppressionV4(default): --switch_nms_version v4\n
+        NonMaxSuppressionV5: --switch_nms_version v5
+
     keep_ncw_or_nchw_or_ncdhw_input_names: Optional[List[str]]
         Holds the NCW or NCHW or NCDHW of the input shape for the specified INPUT OP names.\n
         If a nonexistent INPUT OP name is specified, it is ignored.\n
@@ -921,6 +928,7 @@ def convert(
         'mvn_epsilon': mvn_epsilon,
         'output_signaturedefs': output_signaturedefs,
         'output_nms_with_dynamic_tensor': output_nms_with_dynamic_tensor,
+        'switch_nms_version': switch_nms_version,
         'output_integer_quantized_tflite': output_integer_quantized_tflite,
         'gelu_replace_op_names': {},
         'space_to_depth_replace_op_names': {},
@@ -2233,6 +2241,18 @@ def main():
             'enable --output_nms_with_dynamic_tensor: \n' +
             '    output_tensor_shape: [N, 7]'
     )
+    parser.add_argument(
+        '-snms',
+        '--switch_nms_version',
+        type=str,
+        choices=['v4', 'v5'],
+        default='v4',
+        help=\
+            'Switch the NMS version to V4 or V5 to convert. \n' +
+            'e.g. \n' +
+            'NonMaxSuppressionV4(default): --switch_nms_version v4 \n' +
+            'NonMaxSuppressionV5: --switch_nms_version v5'
+    )
     parser.add_argument(
         '-k',
         '--keep_ncw_or_nchw_or_ncdhw_input_names',
@@ -2623,6 +2643,7 @@ def main():
         overwrite_input_shape=args.overwrite_input_shape,
         no_large_tensor=args.no_large_tensor,
         output_nms_with_dynamic_tensor=args.output_nms_with_dynamic_tensor,
+        switch_nms_version=args.switch_nms_version,
         keep_ncw_or_nchw_or_ncdhw_input_names=args.keep_ncw_or_nchw_or_ncdhw_input_names,
         keep_nwc_or_nhwc_or_ndhwc_input_names=args.keep_nwc_or_nhwc_or_ndhwc_input_names,
         keep_shape_absolutely_input_names=args.keep_shape_absolutely_input_names,

onnx2tf/ops/NonMaxSuppression.py

@@ -25,8 +25,9 @@ from tensorflow.python.util import dispatch
 
 
 class NMSLayer(tf_keras.layers.Layer):
-    def __init__(self):
+    def __init__(self, switch_nms_version='v4'):
         super(NMSLayer, self).__init__()
+        self.switch_nms_version = switch_nms_version
 
     @dispatch.add_dispatch_support
     def non_max_suppression(
@@ -40,29 +41,56 @@ class NMSLayer(tf_keras.layers.Layer):
         name=None,
     ):
         with ops.name_scope(name, 'non_max_suppression'):
-            selected_indices, num_valid = gen_image_ops.non_max_suppression_v4(
-                boxes=boxes,
-                scores=scores,
-                max_output_size=max_output_size \
-                    if not isinstance(max_output_size, np.ndarray) \
-                        else tf.convert_to_tensor(
-                            value=max_output_size,
-                            name='max_output_size'
-                        ),
-                iou_threshold=iou_threshold \
-                    if not isinstance(iou_threshold, np.ndarray) \
-                        else tf.convert_to_tensor(
-                            value=iou_threshold,
-                            name='iou_threshold',
-                        ),
-                score_threshold=score_threshold \
-                    if not isinstance(score_threshold, np.ndarray) \
-                        else tf.convert_to_tensor(
-                            value=score_threshold,
-                            name='score_threshold',
-                        ),
-                pad_to_max_output_size=pad_to_max_output_size,
-            )
+            if self.switch_nms_version == 'v4':
+                selected_indices, num_valid = gen_image_ops.non_max_suppression_v4(
+                    boxes=boxes,
+                    scores=scores,
+                    max_output_size=max_output_size \
+                        if not isinstance(max_output_size, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=max_output_size,
+                                name='max_output_size'
+                            ),
+                    iou_threshold=iou_threshold \
+                        if not isinstance(iou_threshold, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=iou_threshold,
+                                name='iou_threshold',
+                            ),
+                    score_threshold=score_threshold \
+                        if not isinstance(score_threshold, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=score_threshold,
+                                name='score_threshold',
+                            ),
+                    pad_to_max_output_size=pad_to_max_output_size,
+                )
+
+            elif self.switch_nms_version == 'v5':
+                selected_indices, selected_scores, num_valid = gen_image_ops.non_max_suppression_v5(
+                    boxes=boxes,
+                    scores=scores,
+                    max_output_size=max_output_size \
+                        if not isinstance(max_output_size, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=max_output_size,
+                                name='max_output_size'
+                            ),
+                    iou_threshold=iou_threshold \
+                        if not isinstance(iou_threshold, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=iou_threshold,
+                                name='iou_threshold',
+                            ),
+                    score_threshold=score_threshold \
+                        if not isinstance(score_threshold, np.ndarray) \
+                            else tf.convert_to_tensor(
+                                value=score_threshold,
+                                name='score_threshold',
+                            ),
+                    soft_nms_sigma=0.0,
+                    pad_to_max_output_size=pad_to_max_output_size,
+                )
             if pad_to_max_output_size:
                 return selected_indices
 
@@ -130,8 +158,8 @@ def make_node(
     scores = tf_layers_dict[graph_node_input_2.name]['tf_node'] \
         if isinstance(graph_node_input_2, gs.Variable) else graph_node_input_2
 
-    output_nms_with_dynamic_tensor: bool = \
-        kwargs['output_nms_with_dynamic_tensor']
+    output_nms_with_dynamic_tensor: bool = kwargs['output_nms_with_dynamic_tensor']
+    switch_nms_version: str = kwargs['switch_nms_version']
 
     # Pre-process transpose
     boxes = pre_process_transpose(
@@ -339,7 +367,7 @@ def make_node(
                     axis=0,
                 )
             # get the selected boxes indices
-            nms = NMSLayer()
+            nms = NMSLayer(switch_nms_version=switch_nms_version)
             selected_indices = nms(
                 boxes=tf_boxes,
                 scores=tf_scores,

onnx2tf/utils/common_functions.py

@@ -2386,6 +2386,15 @@ def shape_unmatched_special_avoidance_workaround(
     input_tensor_2: Any
         Input shape-corrected TensorFlow input node Y
     """
+    try:
+        if hasattr(input_tensor_1, "shape") \
+            and hasattr(input_tensor_2, "shape") \
+            and input_tensor_1.shape is not None \
+            and input_tensor_2.shape is not None \
+            and input_tensor_1.shape == input_tensor_2.shape:
+            return input_tensor_1, input_tensor_2
+    except:
+        pass
     # At least one True value for same_input_shape_as_onnx
     # At least one True value in nhwc_flags
     # same_input_shape_as_onnx == True and nhwc_flags == False and 3D or 4D or 5D tensor is NHWC transposed

{onnx2tf-1.26.3.dist-info → onnx2tf-1.26.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: onnx2tf
-Version: 1.26.3
+Version: 1.26.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
@@ -12,6 +12,15 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE_onnx-tensorflow
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-python
+Dynamic: summary
 
 # onnx2tf
 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](https://github.com/onnx/onnx-tensorflow) ([onnx-tf](https://pypi.org/project/onnx-tf/)). I don't need a Star, but give me a pull request. Since I am adding challenging model optimizations and fixing bugs almost daily, I frequently embed potential bugs that would otherwise break through CI's regression testing. Therefore, if you encounter new problems, I recommend that you try a package that is a few versions older, or try the latest package that will be released in a few days.
@@ -314,7 +323,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.26.3
+  ghcr.io/pinto0309/onnx2tf:1.26.5
 
   or
 
@@ -322,7 +331,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.26.3
+  docker.io/pinto0309/onnx2tf:1.26.5
 
   or
 
@@ -1541,6 +1550,7 @@ usage: onnx2tf
 [-ois OVERWRITE_INPUT_SHAPE [OVERWRITE_INPUT_SHAPE ...]]
 [-nlt]
 [-onwdt]
+[-snms {v4,v5}]
 [-k KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES [KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES ...]]
 [-kt KEEP_NWC_OR_NHWC_OR_NDHWC_INPUT_NAMES [KEEP_NWC_OR_NHWC_OR_NDHWC_INPUT_NAMES ...]]
 [-kat KEEP_SHAPE_ABSOLUTELY_INPUT_NAMES [KEEP_SHAPE_ABSOLUTELY_INPUT_NAMES ...]]
@@ -1740,6 +1750,12 @@ optional arguments:
     enable --output_nms_with_dynamic_tensor:
         output_tensor_shape: [N, 7]
 
+  -snms {v4,v5}, --switch_nms_version {v4,v5}
+    Switch the NMS version to V4 or V5 to convert.
+    e.g.
+    NonMaxSuppressionV4(default): --switch_nms_version v4
+    NonMaxSuppressionV5: --switch_nms_version v5
+
   -k KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES [KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES ...], \
       --keep_ncw_or_nchw_or_ncdhw_input_names KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES \
           [KEEP_NCW_OR_NCHW_OR_NCDHW_INPUT_NAMES ...]
@@ -2025,6 +2041,7 @@ convert(
   overwrite_input_shape: Union[List[str], NoneType] = None,
   no_large_tensor: Optional[bool] = False,
   output_nms_with_dynamic_tensor: Optional[bool] = False,
+  switch_nms_version: Optional[str] = 'v4',
   keep_ncw_or_nchw_or_ncdhw_input_names: Union[List[str], NoneType] = None,
   keep_nwc_or_nhwc_or_ndhwc_input_names: Union[List[str], NoneType] = None,
   keep_shape_absolutely_input_names: Optional[List[str]] = None,
@@ -2230,6 +2247,12 @@ convert(
       enable --output_nms_with_dynamic_tensor:
           output_tensor_shape: [N, 7]
 
+    switch_nms_version {v4,v5}
+      Switch the NMS version to V4 or V5 to convert.
+      e.g.
+      NonMaxSuppressionV4(default): switch_nms_version="v4"
+      NonMaxSuppressionV5: switch_nms_version="v5"
+
     keep_ncw_or_nchw_or_ncdhw_input_names: Optional[List[str]]
       Holds the NCW or NCHW or NCDHW of the input shape for the specified INPUT OP names.
       If a nonexistent INPUT OP name is specified, it is ignored.

{onnx2tf-1.26.3.dist-info → onnx2tf-1.26.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-onnx2tf/__init__.py,sha256=GQ8Cd-IK3KY_z7zOeJbzvlNqa1JZnqZNpGK3P7Hq7eg,66
+onnx2tf/__init__.py,sha256=CCPWz_VoOl1azpYesO2K-voE8SmUyaEdAT-xziLuToc,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
-onnx2tf/onnx2tf.py,sha256=0QiBJXhX_m2ZuWoGbAsO_N6z3o9uqN0rL8uEkllYhJc,123980
+onnx2tf/onnx2tf.py,sha256=IEnfIs3Dy8Y5F3iJ4HY7bWkn3QuB6lq_gHa1q5E3tMI,124745
 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
@@ -96,7 +96,7 @@ onnx2tf/ops/Mod.py,sha256=K6oH5Q4I5JWh8DFp8T1CSdL4WUJCexYdfqTy5iceJxo,9999
 onnx2tf/ops/Mul.py,sha256=p75MHWbJSo6jLarFzmfK6oQREar4ntlFGqn-U7MzY8s,15962
 onnx2tf/ops/Multinomial.py,sha256=0HQC76IA3AvRsUx9RS0S__nIfEmPuvIaDfSt8bns4FU,3158
 onnx2tf/ops/Neg.py,sha256=vu2ExVXyGpggAM_DNPeZj9QFeUyqhn5XmJnDlPJFsQU,4219
-onnx2tf/ops/NonMaxSuppression.py,sha256=XdqIAh-KhU9JXRxXigGYe37cw2Fus7wgIteJTcIn_wQ,14153
+onnx2tf/ops/NonMaxSuppression.py,sha256=nHeiX5eMGQAq_51KoljNZGlZddJ89Oe7Yfe33xLhl6M,15763
 onnx2tf/ops/NonZero.py,sha256=2EYZFMNIejeqR2azHw0CT2mthiKuRPQepUafzeVE8Nk,2788
 onnx2tf/ops/Not.py,sha256=wn3nThGf4gtpQdHjP7OX2xlhyaNQGeHifjZ18O5shhg,3599
 onnx2tf/ops/OneHot.py,sha256=OThLm1MF1X75zx7gep_qdnRHsTRZX_tqZxjt6pAVi7E,6489
@@ -185,13 +185,13 @@ onnx2tf/ops/_Loop.py,sha256=eo5sNfrfOnKV6_I737AWsM5LJTY9DVOxQEvhanxtP4g,11322
 onnx2tf/ops/__Loop.py,sha256=ClwMcbNS4hqUtW_pzwjMa9Cqg7ONvz9aplke55A0uJ0,19704
 onnx2tf/ops/__init__.py,sha256=jnmUWWa-3dHzBZV9bmPzXu6eoz2dumJTzO7i8JdcgSM,25
 onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
-onnx2tf/utils/common_functions.py,sha256=35vTJfectN2lPwsVGaka_wzpZpCLJeQDmn327oVj4FA,241128
+onnx2tf/utils/common_functions.py,sha256=lhhWuNVDwM_mVFc9DD2kYcYEyyT46CDlJMvZzi9KWD4,241473
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.26.3.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.26.3.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.26.3.dist-info/METADATA,sha256=Z9LRHNes38qX_F5zyDsJumFxJ-BnD1N246dOw7O-yXw,146609
-onnx2tf-1.26.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-onnx2tf-1.26.3.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.26.3.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.26.3.dist-info/RECORD,,
+onnx2tf-1.26.5.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.26.5.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.26.5.dist-info/METADATA,sha256=GtIaK3JYaUlveLrLhxHuJX-Tb9H54timBbTLctSs8Rw,147279
+onnx2tf-1.26.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+onnx2tf-1.26.5.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.26.5.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.26.5.dist-info/RECORD,,

{onnx2tf-1.26.3.dist-info → onnx2tf-1.26.5.dist-info}/WHEEL

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