onnx2tf 1.27.8__py3-none-any.whl → 1.27.10__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.27.8'
+__version__ = '1.27.10'

onnx2tf/onnx2tf.py

@@ -78,6 +78,7 @@ def convert(
     not_use_opname_auto_generate: Optional[bool] = False,
     batch_size: Optional[int] = None,
     overwrite_input_shape: Optional[List[str]] = None,
+    shape_hints: Optional[List[str]] = None,
     no_large_tensor: Optional[bool] = False,
     output_nms_with_dynamic_tensor: Optional[bool] = False,
     switch_nms_version: Optional[str] = 'v4',
@@ -255,6 +256,20 @@ def convert(
         Numerical values other than dynamic dimensions are ignored.\n
         Ignores batch_size if specified at the same time as batch_size.
 
+    shape_hints: Optional[List[str]]
+        Shape hints for input tensors containing dynamic dimensions.\n
+        Specify input shapes for test inference with -cotof or -coto.\n
+        Unlike `--overwrite_input_shape`, this operation does not overwrite\n
+        the ONNX input shape with a static shape.\n
+        The format is\n
+        ["input_name_1:dim0,...,dimN","input_name_2:dim0,...,dimN","input_name_3:dim0,...,dimN"].\n
+        When there is only one input, for example,\n
+        ['data:1,3,224,224']\n
+        When there are multiple inputs, for example,\n
+        ['data1:1,3,224,224','data2:1,3,112,112','data3:5']\n
+        A value of 1 or more must be specified.\n
+        Numerical values other than dynamic dimensions are ignored.
+
     no_large_tensor: Optional[bool]
         Suppresses constant bloat caused by Tile OP when optimizing models in onnxsim.\n
         See: https://github.com/daquexian/onnx-simplifier/issues/178
@@ -1055,6 +1070,7 @@ def convert(
                     tf_layers_dict=tf_layers_dict,
                     use_cuda=use_cuda,
                     disable_strict_mode=disable_strict_mode,
+                    shape_hints=shape_hints if (check_onnx_tf_outputs_elementwise_close or check_onnx_tf_outputs_elementwise_close_full) else None,
                 )
             """
             onnx_tensor_infos_for_validation:
@@ -1889,6 +1905,7 @@ def convert(
                         custom_input_op_name_np_data_path=custom_input_op_name_np_data_path,
                         tf_layers_dict=tf_layers_dict,
                         use_cuda=use_cuda,
+                        shape_hints=shape_hints,
                     )
             except Exception as ex:
                 warn(
@@ -1898,12 +1915,17 @@ def convert(
                 warn(f'{ex}')
             else:
                 # TF dummy inference
-                tf_tensor_infos: Dict[Any] = dummy_tf_inference(
-                    model=model,
-                    inputs=inputs,
-                    test_data_nhwc=test_data_nhwc,
-                    custom_input_op_name_np_data_path=custom_input_op_name_np_data_path,
-                )
+                tf_tensor_infos: Dict[Any] = \
+                    dummy_tf_inference(
+                        model=model,
+                        inputs=inputs,
+                        test_data_nhwc=test_data_nhwc,
+                        custom_input_op_name_np_data_path=custom_input_op_name_np_data_path,
+                        shape_hints=shape_hints,
+                        keep_shape_absolutely_input_names=keep_shape_absolutely_input_names,
+                        keep_ncw_or_nchw_or_ncdhw_input_names=keep_ncw_or_nchw_or_ncdhw_input_names,
+                        keep_nwc_or_nhwc_or_ndhwc_input_names=keep_nwc_or_nhwc_or_ndhwc_input_names,
+                    )
                 # Validation
                 onnx_tensor_infos = {
                     output_name: dummy_onnx_output \
@@ -2207,6 +2229,25 @@ def main():
             'Numerical values other than dynamic dimensions are ignored. \n' +
             'Ignores --batch_size if specified at the same time as --batch_size.'
     )
+    parser.add_argument(
+        '-sh',
+        '--shape_hints',
+        type=str,
+        nargs='+',
+        help=\
+            'Shape hints for input tensors containing dynamic dimensions. \n' +
+            'Specify input shapes for test inference with -cotof or -coto. \n' +
+            'Unlike `--overwrite_input_shape`, this operation does not overwrite \n' +
+            'the ONNX input shape with a static shape.\n' +
+            'The format is\n' +
+            '"input_name_1:dim0,...,dimN" "input_name_2:dim0,...,dimN" "input_name_3:dim0,...,dimN". \n' +
+            'When there is only one input, for example, \n' +
+            '"data:1,3,224,224" \n' +
+            'When there are multiple inputs, for example, \n' +
+            '"data1:1,3,224,224" "data2:1,3,112,112" "data3:5" \n' +
+            'Only applied to dynamic dimensions in inputs. \n' +
+            'Only used when -cotof or -coto are specified.'
+    )
     parser.add_argument(
         '-nlt',
         '--no_large_tensor',
@@ -2631,6 +2672,7 @@ def main():
         not_use_opname_auto_generate=args.not_use_opname_auto_generate,
         batch_size=args.batch_size,
         overwrite_input_shape=args.overwrite_input_shape,
+        shape_hints=args.shape_hints,
         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,

onnx2tf/utils/common_functions.py

@@ -3633,6 +3633,7 @@ def dummy_onnx_inference(
     tf_layers_dict: Optional[Dict] = None,
     use_cuda: bool = False,
     disable_strict_mode: bool = False,
+    shape_hints: Optional[List[str]] = None,
 ) -> List[np.ndarray]:
     """Perform inference on ONNX subgraphs with an all-1 dummy tensor.
 
@@ -3775,24 +3776,46 @@ def dummy_onnx_inference(
     onnx_inputs = gs_graph.inputs
     input_names: List[str] = [inp.name for inp in onnx_inputs]
     input_sizes: List[int] = [inp.shape for inp in onnx_inputs]
-    new_input_sizes = []
-    for input_size in input_sizes:
-        new_input_size = []
-        for idx, dim in enumerate(input_size):
-            if idx == 0 and input_sizes[0][0] is not None \
-                and not isinstance(input_sizes[0][0], str) \
-                and len(input_sizes[0]) == len(input_size) \
-                and (dim is None or isinstance(dim, str)):
-                # Batch size assignment for input OPs
-                new_input_size.append(input_sizes[0][0])
-            elif dim is None or isinstance(dim, str):
-                # Fixed and assigned 1
-                new_input_size.append(1)
-            else:
-                # Assign input shape as is
-                new_input_size.append(dim)
-        new_input_sizes.append(new_input_size)
-    input_sizes = new_input_sizes
+
+    if shape_hints is None:
+        new_input_sizes = []
+        for input_size in input_sizes:
+            new_input_size = []
+            for idx, dim in enumerate(input_size):
+                if idx == 0 and input_sizes[0][0] is not None \
+                    and not isinstance(input_sizes[0][0], str) \
+                    and len(input_sizes[0]) == len(input_size) \
+                    and (dim is None or isinstance(dim, str)):
+                    # Batch size assignment for input OPs
+                    new_input_size.append(input_sizes[0][0])
+                elif dim is None or isinstance(dim, str):
+                    # Fixed and assigned 1
+                    new_input_size.append(1)
+                else:
+                    # Assign input shape as is
+                    new_input_size.append(dim)
+            new_input_sizes.append(new_input_size)
+        input_sizes = new_input_sizes
+
+    else:
+        shape_hints_dict = {}
+        for hint in shape_hints:
+            parts = hint.split(':')
+            if len(parts) == 2:
+                input_name = parts[0]
+                shape_values = [int(val) for val in parts[1].split(',')]
+                shape_hints_dict[input_name] = shape_values
+
+        for i, (input_name, original_shape) in enumerate(zip(input_names, input_sizes)):
+            if input_name in shape_hints_dict:
+                updated_shape = shape_hints_dict[input_name]
+                for j, (orig_dim, hint_dim) in enumerate(zip(original_shape, updated_shape)):
+                    if orig_dim is not None and not isinstance(orig_dim, str):
+                        updated_shape[j] = orig_dim
+                    else:
+                        updated_shape[j] = hint_dim
+                input_sizes[i] = updated_shape
+
     input_dtypes: List[Any] = [inp.dtype for inp in onnx_inputs]
     input_datas = {}
 
@@ -3886,6 +3909,10 @@ def dummy_tf_inference(
     test_data_nhwc: Optional[np.ndarray] = None,
     verification_datas: Optional[List[np.ndarray]] = None,
     custom_input_op_name_np_data_path: Optional[str] = None,
+    shape_hints: Optional[List[str]] = None,
+    keep_shape_absolutely_input_names: Optional[List[str]] = None,
+    keep_ncw_or_nchw_or_ncdhw_input_names: Optional[List[str]] = None,
+    keep_nwc_or_nhwc_or_ndhwc_input_names: Optional[List[str]] = None,
 ) -> Any:
     """Perform inference on TF subgraphs with an all-1 dummy tensor.
 
@@ -3914,23 +3941,74 @@ def dummy_tf_inference(
     """
     input_names: List[str] = [inp.name for inp in inputs]
     input_sizes: List[int] = [inp.shape for inp in inputs]
-    new_input_sizes = []
-    for input_size in input_sizes:
-        new_input_size = []
-        for idx, dim in enumerate(input_size):
-            if idx == 0 and input_sizes[0][0] is not None \
-                and len(input_sizes[0]) == len(input_size) \
-                and dim is None:
-                # Batch size assignment for input OPs
-                new_input_size.append(input_sizes[0][0])
-            elif dim is None:
-                # Fixed and assigned 1
-                new_input_size.append(1)
-            else:
-                # Assign input shape as is
-                new_input_size.append(dim)
-        new_input_sizes.append(new_input_size)
-    input_sizes = new_input_sizes
+
+    if shape_hints is None:
+        new_input_sizes = []
+        for input_size in input_sizes:
+            new_input_size = []
+            for idx, dim in enumerate(input_size):
+                if idx == 0 and input_sizes[0][0] is not None \
+                    and len(input_sizes[0]) == len(input_size) \
+                    and dim is None:
+                    # Batch size assignment for input OPs
+                    new_input_size.append(input_sizes[0][0])
+                elif dim is None:
+                    # Fixed and assigned 1
+                    new_input_size.append(1)
+                else:
+                    # Assign input shape as is
+                    new_input_size.append(dim)
+            new_input_sizes.append(new_input_size)
+        input_sizes = new_input_sizes
+
+    else:
+        shape_hints_dict = {}
+        for hint in shape_hints:
+            parts = hint.split(':')
+            if len(parts) == 2:
+                input_name = parts[0]
+                shape_values = [int(val) for val in parts[1].split(',')]
+                shape_hints_dict[input_name] = shape_values
+
+        for i, (input_name, original_shape) in enumerate(zip(input_names, input_sizes)):
+            if input_name in shape_hints_dict:
+                hint_shape = shape_hints_dict[input_name]
+                updated_shape = []
+
+                # Check if we need to keep the original shape
+                keep_absolutely = (
+                    keep_shape_absolutely_input_names is not None and
+                    input_name in keep_shape_absolutely_input_names
+                )
+                keep_nchw = (
+                    keep_ncw_or_nchw_or_ncdhw_input_names is not None and
+                    input_name in keep_ncw_or_nchw_or_ncdhw_input_names
+                )
+                keep_nhwc = (
+                    keep_nwc_or_nhwc_or_ndhwc_input_names is not None and
+                    input_name in keep_nwc_or_nhwc_or_ndhwc_input_names
+                )
+
+                if keep_absolutely or keep_nchw:
+                    updated_shape = hint_shape
+                # Otherwise, convert from NCHW to NHWC based on dimensionality
+                elif len(hint_shape) == 3:  # NCW -> NWC [0,2,1]
+                    updated_shape = [hint_shape[0], hint_shape[2], hint_shape[1]]
+                elif len(hint_shape) == 4:  # NCHW -> NHWC [0,3,1,2]
+                    updated_shape = [hint_shape[0], hint_shape[2], hint_shape[3], hint_shape[1]]
+                elif len(hint_shape) == 5:  # NCDHW -> NDHWC [0,4,1,2,3]
+                    updated_shape = [hint_shape[0], hint_shape[2], hint_shape[3], hint_shape[4], hint_shape[1]]
+                else:
+                    updated_shape = hint_shape
+
+                for j, (orig_dim, hint_dim) in enumerate(zip(original_shape, updated_shape)):
+                    if orig_dim is not None and not isinstance(orig_dim, str):
+                        updated_shape[j] = orig_dim
+                    else:
+                        updated_shape[j] = hint_dim
+
+                input_sizes[i] = updated_shape
+
     input_dtypes: List[Any] = [inp.dtype for inp in inputs]
     input_datas = {}
 
@@ -4228,10 +4306,10 @@ def broadcast_for_gpu_delegate(
     if not optimization_for_gpu_delegate:
         return input_tensor_1, input_tensor_2
     xshapes = input_tensor_1.shape
-    xshape_list = [int(dim) for dim in input_tensor_1.shape]
+    xshape_list = [int(dim) if dim is not None else -1 for dim in input_tensor_1.shape]
     xshapes_rank = len(xshapes)
     yshapes = input_tensor_2.shape
-    yshape_list = [int(dim) for dim in input_tensor_2.shape]
+    yshape_list = [int(dim) if dim is not None else -1 for dim in input_tensor_2.shape]
     yshapes_rank = len(yshape_list)
 
     try:

{onnx2tf-1.27.8.dist-info → onnx2tf-1.27.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.8
+Version: 1.27.10
 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.8
+  ghcr.io/pinto0309/onnx2tf:1.27.10
 
   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.8
+  docker.io/pinto0309/onnx2tf:1.27.10
 
   or
 
@@ -1561,6 +1561,7 @@ usage: onnx2tf
 [-nuonag]
 [-b BATCH_SIZE]
 [-ois OVERWRITE_INPUT_SHAPE [OVERWRITE_INPUT_SHAPE ...]]
+[-sh SHAPE_HINTS [SHAPE_HINTS ...]]
 [-nlt]
 [-onwdt]
 [-snms {v4,v5}]
@@ -1747,6 +1748,21 @@ optional arguments:
     Numerical values other than dynamic dimensions are ignored.
     Ignores --batch_size if specified at the same time as --batch_size.
 
+  -sh SHAPE_HINTS [SHAPE_HINTS ...], \
+      --shape_hints SHAPE_HINTS [SHAPE_HINTS ...]
+    Shape hints for input tensors containing dynamic dimensions.
+    Specify input shapes for test inference with -cotof or -coto.
+    Unlike `--overwrite_input_shape`, this operation does not overwrite
+    the ONNX input shape with a static shape.
+    The format is
+    "i1:dim0,...,dimN" "i2:dim0,...,dimN" "i3:dim0,...,dimN"
+    When there is only one input, for example,
+    "data:1,3,224,224"
+    When there are multiple inputs, for example,
+    "data1:1,3,224,224" "data2:1,3,112" "data3:5"
+    A value of 1 or more must be specified.
+    Numerical values other than dynamic dimensions are ignored.
+
   -nlt, --no_large_tensor
     Suppresses constant bloat caused by Tile OP when optimizing models in onnxsim.
     See: https://github.com/daquexian/onnx-simplifier/issues/178
@@ -2052,6 +2068,7 @@ convert(
   not_use_opname_auto_generate: Optional[bool] = False,
   batch_size: Union[int, NoneType] = None,
   overwrite_input_shape: Union[List[str], NoneType] = None,
+  shape_hints: 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',
@@ -2244,6 +2261,20 @@ convert(
       Numerical values other than dynamic dimensions are ignored.
       Ignores batch_size if specified at the same time as batch_size.
 
+    shape_hints: Optional[List[str]]
+      Shape hints for input tensors containing dynamic dimensions.
+      Specify input shapes for test inference with -cotof or -coto.
+      Unlike `--overwrite_input_shape`, this operation does not overwrite
+      the ONNX input shape with a static shape.
+      The format is
+      ['i1:dim0,...,dimN', 'i2:dim0,...,dimN', 'i3:dim0,...,dimN']
+      When there is only one input, for example,
+      ['data:1,3,224,224']
+      When there are multiple inputs, for example,
+      ['data1:1,3,224,224', 'data2:1,3,112', 'data3:5']
+      A value of 1 or more must be specified.
+      Numerical values other than dynamic dimensions are ignored.
+
     no_large_tensor: Optional[bool]
       Suppresses constant bloat caused by Tile OP when optimizing models in onnxsim.
       See: https://github.com/daquexian/onnx-simplifier/issues/178

{onnx2tf-1.27.8.dist-info → onnx2tf-1.27.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-onnx2tf/__init__.py,sha256=FA0T9QrV9uxJnT2OPSYDXM4XnIfbdPVzPKxKz-BfM6s,66
+onnx2tf/__init__.py,sha256=XUWhuuMFDDXP_g52JLtZhc-ADNltAchMMkJMSLVGSTk,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
-onnx2tf/onnx2tf.py,sha256=KPFVEhTDBhX7Y-Bh7X40ZEclGf2_Vfp9-M9AMPqOywI,123892
+onnx2tf/onnx2tf.py,sha256=_PB395J0GPgruBNqFzf_45-LR5boe3avZzoQIdnoSOY,126240
 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
@@ -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=TXvZ7qg9stD1qKvbtkoE70jRxojdtdQhhHIoYaM0I1E,241826
+onnx2tf/utils/common_functions.py,sha256=cvczLScMTAuyhLi1ljUeI2SRhACT0-OGBQLibg4yYdE,245521
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.27.8.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.27.8.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.27.8.dist-info/METADATA,sha256=LemcJx7-r_QtmIE02r6C6XUgQKnDKGzOsyWyCF-1s5s,147712
-onnx2tf-1.27.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-onnx2tf-1.27.8.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.27.8.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.27.8.dist-info/RECORD,,
+onnx2tf-1.27.10.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.27.10.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.27.10.dist-info/METADATA,sha256=D-vbk2OeCeu06NZYvAQNJaoFexmJDBnEAwrg8D52WLY,149173
+onnx2tf-1.27.10.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+onnx2tf-1.27.10.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.27.10.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.27.10.dist-info/RECORD,,

{onnx2tf-1.27.8.dist-info → onnx2tf-1.27.10.dist-info}/WHEEL

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