onnx2tf 1.29.18__py3-none-any.whl → 1.29.20__py3-none-any.whl

onnx2tf/utils/common_functions.py

@@ -26,6 +26,7 @@ from tensorflow.python.keras.layers import Lambda
 from tensorflow.python.keras.utils import conv_utils
 import onnx
 from onnx.serialization import ProtoSerializer
+from onnx.external_data_helper import uses_external_data
 import onnx_graphsurgeon as gs
 try:
     import onnxruntime as ort
@@ -45,6 +46,8 @@ INF_INDEX_VALUE: int = 4294967296
 ONNX_INF_INDEX_VALUE = sys.maxsize # 9223372036854775807
 
 
+
+
 def get_replacement_parameter(func):
     @wraps(func)
     def get_replacement_parameter_wrapper_func(*args, **kwargs):
@@ -4046,6 +4049,9 @@ def dummy_onnx_inference(
                 input_sizes[i] = updated_shape
 
     input_dtypes: List[Any] = [inp.dtype for inp in onnx_inputs]
+    input_size_map = {
+        name: tuple(size) for name, size in zip(input_names, input_sizes)
+    }
     input_datas = {}
 
     # -cid
@@ -4059,7 +4065,16 @@ def dummy_onnx_inference(
             if input_op_info is not None:
                 ncw_nchw_ncdhw_perm: List = input_op_info.get('ncw_nchw_ncdhw_perm', None)
                 if ncw_nchw_ncdhw_perm is not None:
-                    custom_input_data = custom_input_data.transpose(ncw_nchw_ncdhw_perm)
+                    expected_shape = input_size_map.get(
+                        input_op_name,
+                        tuple(custom_input_data.shape),
+                    )
+                    if tuple(custom_input_data.shape) != expected_shape:
+                        permuted_shape = tuple(
+                            custom_input_data.shape[i] for i in ncw_nchw_ncdhw_perm
+                        )
+                        if permuted_shape == expected_shape:
+                            custom_input_data = custom_input_data.transpose(ncw_nchw_ncdhw_perm)
                 onnx_batch_size = input_op_info['shape'][0]
                 cdata_batch_size = custom_input_data.shape[0]
                 if isinstance(onnx_batch_size, int) and onnx_batch_size != cdata_batch_size and cdata_batch_size > 1:
@@ -4231,6 +4246,7 @@ def dummy_tf_inference(
     custom_input_op_name_np_data_path: Optional[str] = None,
     shape_hints: Optional[List[str]] = None,
     input_datas_for_validation: Optional[Dict[str, np.ndarray]] = None,
+    prefilled_input_datas: Optional[Dict[str, np.ndarray]] = 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,
@@ -4264,6 +4280,8 @@ def dummy_tf_inference(
     """
     input_names: List[str] = [inp.name for inp in inputs]
     input_sizes: List[int] = [inp.shape for inp in inputs]
+    input_size_map = {name: size for name, size in zip(input_names, input_sizes)}
+    input_index_map = {name: i for i, name in enumerate(input_names)}
 
     if shape_hints is None:
         new_input_sizes = []
@@ -4338,10 +4356,20 @@ def dummy_tf_inference(
 
     # -cid
     if custom_input_op_name_np_data_path:
-        for idx, param in enumerate(custom_input_op_name_np_data_path):
+        for param in custom_input_op_name_np_data_path:
+            if len(param) < 2:
+                continue
+            input_name = str(param[0])
             numpy_file_path = str(param[1])
+            if input_name not in input_index_map:
+                continue
+            idx = input_index_map[input_name]
+            tf_input_name = input_names[idx]
+            if prefilled_input_datas and tf_input_name in prefilled_input_datas:
+                continue
             custom_input_data = np.load(numpy_file_path)
             input_size = input_sizes[idx]
+            input_dtype = input_dtypes[idx] if idx < len(input_dtypes) else np.float32
 
             tf_batch_size = input_size[0]
             cdata_batch_size = custom_input_data.shape[0]
@@ -4351,6 +4379,24 @@ def dummy_tf_inference(
                 custom_input_data = custom_input_data[0:1, ...]
 
             if list(custom_input_data.shape) != input_size:
+                auto_split_input = (
+                    'onnx2tf_split_' in numpy_file_path
+                    or os.path.basename(numpy_file_path).startswith('part_')
+                )
+                if auto_split_input:
+                    warn(
+                        'Auto-split custom input shape does not match TF input shape. '
+                        f'input_name={input_name} '
+                        f'tf_shape={input_size} '
+                        f'numpy_shape={list(custom_input_data.shape)} '
+                        f'path={numpy_file_path} '
+                        'Fallback to dummy input for this tensor.'
+                    )
+                    input_datas[input_names[idx]] = np.ones(
+                        input_size,
+                        dtype=TF_DTYPES_TO_NUMPY_DTYPES[input_dtype],
+                    )
+                    continue
                 error_msg = f'' + \
                     Color.RED(f'ERROR:') + ' ' + \
                     f"The format of custom input data is different from Tensorflow's format. " + \
@@ -4397,6 +4443,33 @@ def dummy_tf_inference(
     if input_datas_for_validation is not None:
         input_datas_for_validation.update(input_datas)
 
+    if prefilled_input_datas:
+        for input_name, input_data in prefilled_input_datas.items():
+            expected = None
+            if input_name in input_datas:
+                expected = input_datas[input_name].shape
+            elif input_name in input_size_map:
+                expected = input_size_map[input_name]
+            else:
+                continue
+            data = input_data
+            try:
+                if expected is not None and tuple(data.shape) != tuple(expected):
+                    if data.size == np.prod(expected):
+                        data = data.reshape(expected)
+                    else:
+                        continue
+                target_dtype = None
+                if input_name in input_datas:
+                    target_dtype = input_datas[input_name].dtype
+                elif input_name in input_index_map:
+                    target_dtype = input_dtypes[input_index_map[input_name]]
+                if target_dtype is not None and data.dtype != target_dtype:
+                    data = data.astype(target_dtype)
+                input_datas[input_name] = data
+            except Exception:
+                continue
+
     outputs = model(
         inputs={
             input.name: input_datas[input.name] for input in inputs
@@ -6057,6 +6130,8 @@ def acquisition_of_validation_data(
         kwargs['test_data_nhwc']
     custom_input_op_name_np_data_path: str = \
         kwargs['custom_input_op_name_np_data_path']
+    tf_input_cache: Optional[Dict[str, np.ndarray]] = \
+        kwargs.get('tf_input_cache', None)
 
     # Get the output tensor of one previous OP of TensorFlow only once
     tf_model_inputs = get_tf_model_inputs(
@@ -6108,6 +6183,7 @@ def acquisition_of_validation_data(
             inputs=tf_model_inputs,
             test_data_nhwc=test_data_nhwc,
             custom_input_op_name_np_data_path=custom_input_op_name_np_data_path,
+            prefilled_input_datas=tf_input_cache,
         )
     except Exception as ex:
         pass
@@ -6526,3 +6602,24 @@ def define_reduceXXX(
             keepdims=target_keepdims,
         )
     return reduced_tensor
+
+def check_has_external_data(input_onnx_file_path: str) -> bool:
+    model = onnx.load(input_onnx_file_path, load_external_data=False)
+    def iter_tensors_in_graph(g):
+        for t in g.initializer:
+            yield t
+        for t in g.sparse_initializer:
+            yield t
+        for n in g.node:
+            for a in n.attribute:
+                if a.type == onnx.AttributeProto.TENSOR:
+                    yield a.t
+                elif a.type == onnx.AttributeProto.TENSORS:
+                    for t in a.tensors:
+                        yield t
+                elif a.type == onnx.AttributeProto.GRAPH:
+                    yield from iter_tensors_in_graph(a.g)
+                elif a.type == onnx.AttributeProto.GRAPHS:
+                    for sg in a.graphs:
+                        yield from iter_tensors_in_graph(sg)
+    return any(uses_external_data(t) for t in iter_tensors_in_graph(model.graph))

{onnx2tf-1.29.18.dist-info → onnx2tf-1.29.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.18
+Version: 1.29.20
 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
@@ -137,11 +137,11 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Cos|:heavy_check_mark:|
   |CumProd|:heavy_check_mark:|
   |CumSum|:heavy_check_mark:|
-  |DeformConv|**Help wanted**|
+  |DeformConv|:white_check_mark:|
   |DepthToSpace|:heavy_check_mark:|
   |Det|:heavy_check_mark:|
   |DequantizeLinear|:heavy_check_mark:|
-  |DFT|**Help wanted**|
+  |DFT|:white_check_mark:|
   |Div|:heavy_check_mark:|
   |Dropout|:heavy_check_mark:|
   |DynamicQuantizeLinear|:heavy_check_mark:|
@@ -365,7 +365,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.18
+  ghcr.io/pinto0309/onnx2tf:1.29.20
 
   or
 
@@ -373,7 +373,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.18
+  docker.io/pinto0309/onnx2tf:1.29.20
 
   or
 
@@ -1887,6 +1887,15 @@ optional arguments:
     model partitioned into subgraphs.
     e.g. --output_names_to_interrupt_model_conversion "output0" "output1" "output2"
 
+  -easm, --enable_auto_split_model
+    Force auto split regardless of the ONNX file size.
+    Uses --auto_split_max_size_mb as the target partition size.
+
+  -asmsm AUTO_SPLIT_MAX_SIZE_MB, --auto_split_max_size_mb AUTO_SPLIT_MAX_SIZE_MB
+    Target maximum size per partition in MB based on ONNX initializer sizes.
+    Used when auto-split is triggered or forced.
+    Default: 1024
+
   -dgc, --disable_group_convolution
     Disable GroupConvolution and replace it with SeparableConvolution for
     output to saved_model format.
@@ -2156,6 +2165,8 @@ convert(
   keep_shape_absolutely_input_names: Optional[List[str]] = None,
   input_names_to_interrupt_model_conversion: Union[List[str], NoneType] = None,
   output_names_to_interrupt_model_conversion: Union[List[str], NoneType] = None,
+  enable_auto_split_model: Optional[bool] = False,
+  auto_split_max_size_mb: Optional[int] = 1024,
   disable_group_convolution: Union[bool, NoneType] = False,
   enable_batchmatmul_unfold: Optional[bool] = False,
   enable_rnn_unroll: Optional[bool] = False,
@@ -2424,6 +2435,17 @@ convert(
       e.g.
       output_names_to_interrupt_model_conversion=['output0','output1','output2']
 
+    enable_auto_split_model: Optional[bool]
+      Force auto split regardless of the ONNX file size.
+      Uses auto_split_max_size_mb as the target partition size.
+      Short option: -easm
+      Default: False
+
+    auto_split_max_size_mb: Optional[int]
+      Target maximum size per partition in MB based on ONNX initializer sizes.
+      Used when auto-split is triggered or forced.
+      Default: 1024
+
     disable_group_convolution: Optional[bool]
       Disable GroupConvolution and replace it with SeparableConvolution for
       output to saved_model format.

{onnx2tf-1.29.18.dist-info → onnx2tf-1.29.20.dist-info}/RECORD

@@ -1,6 +1,6 @@
-onnx2tf/__init__.py,sha256=GJI-T9Q6ftbR-PwGyLk5t5_Iv3hvUC3prwy56yvn7vA,67
+onnx2tf/__init__.py,sha256=eeSEsd3Wo8LJdK15-iysWnXuxIbvnuVUXyPA9PbSr1o,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
-onnx2tf/onnx2tf.py,sha256=y8FewjpNYAFnUs0cjq6JzdYkiXQSm1o_sZ3PXLJzK64,161921
+onnx2tf/onnx2tf.py,sha256=pBrhrEzDqFKOgvXEr75vMJ61P_m3_f5ogUegD_vDEnc,207077
 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
@@ -27,7 +27,7 @@ onnx2tf/ops/Cast.py,sha256=M0LRClHPgZ_8NubwME6ipKrAqcY9aKC5ihQXCkTkNkM,4601
 onnx2tf/ops/Ceil.py,sha256=0-jaueltpQSwpOIDUmy9DdTy98qN-XimYu5cHVPnUIs,3586
 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/Col2Im.py,sha256=8n66z3O59VJvJRlcrj93a5TLJ_qh-aSdR_-8SAQIlRo,7658
 onnx2tf/ops/Compress.py,sha256=NvDGr9gCNl-8YG41xDBfe3UvhRP03K-ktdtY_MoytBc,3667
 onnx2tf/ops/Concat.py,sha256=kDk7LN01nHuQyYnEPUEikSQ-M17jguAc-qFtCb9tg9I,38537
 onnx2tf/ops/ConcatFromSequence.py,sha256=z8pNmGQRGq9cxWORW330NZS_0zsmhFudLswMyPn8AXU,3086
@@ -40,6 +40,8 @@ onnx2tf/ops/Cos.py,sha256=0v5ZJZRzrswVEObyxf4f0RvnWMWZA4uCEdoeq_VE31s,3608
 onnx2tf/ops/Cosh.py,sha256=-L3QkQtiVBJIv1sSxbXtetVIwgI_2T4WC1O4t2aJ8Gc,3585
 onnx2tf/ops/CumProd.py,sha256=k4hTEQrkwS7vk7pEy2Btvy2y0o70NlWj1MgsNomfOPg,3957
 onnx2tf/ops/CumSum.py,sha256=SYKmD5r9Cm9gsCkJPNFoHigvvBO1PmRYRrVmn1HE78o,3954
+onnx2tf/ops/DFT.py,sha256=rL_w1z16N9Kkf0TyMbywOawld0qZ_g1QOD9npGYD_zY,8086
+onnx2tf/ops/DeformConv.py,sha256=tlhZDzNYAT093PkBDP4s6-EO-vnSdW_0KZTxtddjajM,13541
 onnx2tf/ops/DepthToSpace.py,sha256=BiyBZ88dmXQAkZ5Jc-Ddo-5Kn8dRYCnoik_XnOFzqXc,14449
 onnx2tf/ops/DequantizeLinear.py,sha256=1v43E1hUqO3g7N-PL1fy_cGj4oUgbphh7vXIGhUAyGc,6463
 onnx2tf/ops/Det.py,sha256=kxuHkpv_KNHkof0uBv2RLtr3G1uA76MFHyCiCYCBXkw,3590
@@ -58,8 +60,8 @@ onnx2tf/ops/Floor.py,sha256=8izJrNmw8wNmjF_YabIpLs4jm82J-gKcyAQbwV7Yqpc,3589
 onnx2tf/ops/FusedConv.py,sha256=gslI50V3yvt4l0mmodnyHFAu0cORx1J_ZL5cE0rZ8qs,4523
 onnx2tf/ops/GRU.py,sha256=kBHiZlhlPIV2DQCoFYFHxCTwOATeguJy1MSfj2kxqDM,30732
 onnx2tf/ops/Gather.py,sha256=ezsUTN8nWau4-kB696xjonlVWU6XQ6BjtyjSebt1EXg,15216
-onnx2tf/ops/GatherElements.py,sha256=pR9EuOkYRBKPntmnj9DYpoBESc35EGv3RHfl0HCSmao,15026
-onnx2tf/ops/GatherND.py,sha256=sdHaBeY2ycN9gRc_ahaZo2QI9XbV8PBthefm-JPiPnE,7642
+onnx2tf/ops/GatherElements.py,sha256=qF8milhgXOOc_G3W80U2rK7Q2SsHlPNHrs4VX20ddDY,16002
+onnx2tf/ops/GatherND.py,sha256=2PwSyXHwPP9_xADPasjxj-IXAvLNqKuGm3P5K3GOiwE,9239
 onnx2tf/ops/Gelu.py,sha256=ms9oHnESOuiIPxl_8YU2WEnQo_BVKRPKo5UJsvsWyEA,4321
 onnx2tf/ops/Gemm.py,sha256=8vGtXwx_V59JIDh3EBPuFVQSbIVql45zEHUlVGV3coU,7587
 onnx2tf/ops/GlobalAveragePool.py,sha256=GrDDOywtO6peW79mBPmBJX9MrEU2PXso94xazAzx_xk,5704
@@ -158,8 +160,8 @@ onnx2tf/ops/STFT.py,sha256=LDKN309_dBu4v9AYpz70uMJbNjRFiOte9O3wUL4bIJw,4463
 onnx2tf/ops/ScaleAndTranslate.py,sha256=VQDDhSs9TyMLQy0mF7n8pZ2TuvoKY-Lhlzd7Inf4UdI,11989
 onnx2tf/ops/Scan.py,sha256=hfN-DX6Gp-dG5158WMoHRrDWZAra3VSbsjsiphNqRIQ,16293
 onnx2tf/ops/Scatter.py,sha256=5_rTM60FPCq8unyNPDO-BZXcuz6w9Uyl2Xqx-zJTpgg,746
-onnx2tf/ops/ScatterElements.py,sha256=7u9-_pjS_x3JQsBCVnQyu6sPfuGx2o9qAW_RSZszOTs,7585
-onnx2tf/ops/ScatterND.py,sha256=Y949fYKSAvkPW1s-58P7suafnna9hDLoTg0UA8cs2Ag,9087
+onnx2tf/ops/ScatterElements.py,sha256=mp-TmswDTA9Nv0B3G3b-khOCPCKHnhCI97jDRofoEM0,8561
+onnx2tf/ops/ScatterND.py,sha256=-mVbxXjQor2T6HVHSJy5e0FHQmEfaHknaKPuSc3Oz4o,11005
 onnx2tf/ops/Selu.py,sha256=CD0SqQlTTe0chO7lebkrdfDFSk6Cg9zLhvrKomsSH4Y,3799
 onnx2tf/ops/SequenceAt.py,sha256=jpjl9gVJFagtg223YY26I0pUUEgEFjJGvSZWwbo2-mQ,3278
 onnx2tf/ops/SequenceConstruct.py,sha256=KKbnpnitdAky23WF_DS49ot7ZxVoqBEU2ChgYEcXshY,2639
@@ -191,7 +193,7 @@ onnx2tf/ops/Sub.py,sha256=JCUWNmRLrwJEB8_0MPRTzmZ4KAV_HLXNivUd_jNqPQI,11012
 onnx2tf/ops/Sum.py,sha256=wtI0SbGuNFxkLskBk68ZhOAg3XyrIx-9xGYy1GZCVSo,3073
 onnx2tf/ops/Tan.py,sha256=Ncig8clGvY7GWshqxRDRdcxjcbf_HTKGdpDw5ValrKI,3582
 onnx2tf/ops/Tanh.py,sha256=PIQUvxS_AIDufblC2vc573nse2UCRA9z5yWd7kB-51s,3585
-onnx2tf/ops/TensorScatter.py,sha256=xOB1HVeHXFUUTmKJfZuUBEyPSLpJYjzUf0cAMqblsnc,7413
+onnx2tf/ops/TensorScatter.py,sha256=9M1L8ys2FodscRZXdjme5NQYrCFX_nZH7wm8vx-PXcc,8176
 onnx2tf/ops/ThresholdedRelu.py,sha256=ArF3uRH7jN8kdYYDNcivJgv9UTFl5aqqSH2Qu79j4sY,3769
 onnx2tf/ops/Tile.py,sha256=xkprg6yTaykivcHFJ644opzVPctaeplu-Ed-OpS98Gg,12720
 onnx2tf/ops/TopK.py,sha256=f6OG-DcMWneXwSjIkmY935SPyOMD5tMteHnlQHoJwQo,6348
@@ -204,12 +206,12 @@ onnx2tf/ops/Where.py,sha256=MaCcY9g4mKZQqCgh4xtoylicP-xVu9f4boKiu_q9Ow8,7711
 onnx2tf/ops/Xor.py,sha256=2ceqxHSI1Wtez_CIh8gFfvcu45Xboqfyp1iy3v2vuIs,4590
 onnx2tf/ops/__init__.py,sha256=jnmUWWa-3dHzBZV9bmPzXu6eoz2dumJTzO7i8JdcgSM,25
 onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
-onnx2tf/utils/common_functions.py,sha256=j8bRC3RK5NlNAV9vwxj38DwDaaCLR2iprRdDjBgv_RA,260619
+onnx2tf/utils/common_functions.py,sha256=NPsgAhZTgLZABrVK1x_mWs5_nXDC9tyWFAfvW9qqNLI,265023
 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.18.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-onnx2tf-1.29.18.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
-onnx2tf-1.29.18.dist-info/METADATA,sha256=9JTkd8SawqhrnG2GYMLaI8rvpkmiUJMRUdGvEhbGSBE,154306
-onnx2tf-1.29.18.dist-info/RECORD,,
+onnx2tf-1.29.20.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+onnx2tf-1.29.20.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
+onnx2tf-1.29.20.dist-info/METADATA,sha256=4DMYV8XRObEn9G6cqsBYyWC-Vcj42dbDs8IAxPKeg0Q,155198
+onnx2tf-1.29.20.dist-info/RECORD,,