onnx2tf 1.29.10__py3-none-any.whl → 1.29.12__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.29.10'
+__version__ = '1.29.12'

onnx2tf/ops/MatMul.py

@@ -444,19 +444,68 @@ def make_node(
         onnx_output_shape = [
             dim if not isinstance(dim, str) else None for dim in onnx_output_shape
         ]
+
+        def _shape_match(a_shape, b_shape):
+            if len(a_shape) != len(b_shape):
+                return False
+            for a_dim, b_dim in zip(a_shape, b_shape):
+                if a_dim is None or b_dim is None:
+                    continue
+                if a_dim != b_dim:
+                    return False
+            return True
+
+        # Squeeze unit dims if ONNX output rank is smaller.
+        if len(post_matmul_shape) > len(onnx_output_shape):
+            squeeze_axes = []
+            tmp_shape = list(post_matmul_shape)
+            while len(tmp_shape) > len(onnx_output_shape) and tmp_shape[-1] == 1:
+                squeeze_axes.append(len(tmp_shape) - 1)
+                tmp_shape.pop()
+            if squeeze_axes and len(tmp_shape) == len(onnx_output_shape) \
+                and _shape_match(tmp_shape, onnx_output_shape):
+                tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                    tf.squeeze(
+                        input=tf_layers_dict[graph_node_output.name]['tf_node'],
+                        axis=squeeze_axes,
+                    )
+                post_matmul_shape = list(tf_layers_dict[graph_node_output.name]['tf_node'].shape)
+                post_matmul_shape_none_count = sum(
+                    [1 if dim is None else 0 for dim in post_matmul_shape]
+                )
+            else:
+                leading_ones = 0
+                tmp_shape = list(post_matmul_shape)
+                while len(tmp_shape) > len(onnx_output_shape) and tmp_shape and tmp_shape[0] == 1:
+                    leading_ones += 1
+                    tmp_shape.pop(0)
+                if leading_ones and len(tmp_shape) == len(onnx_output_shape) \
+                    and _shape_match(tmp_shape, onnx_output_shape):
+                    tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                        tf.squeeze(
+                            input=tf_layers_dict[graph_node_output.name]['tf_node'],
+                            axis=list(range(leading_ones)),
+                        )
+                    post_matmul_shape = list(tf_layers_dict[graph_node_output.name]['tf_node'].shape)
+                    post_matmul_shape_none_count = sum(
+                        [1 if dim is None else 0 for dim in post_matmul_shape]
+                    )
+
         onnx_output_shape_none_count = sum([1 if dim is None else 0 for dim in onnx_output_shape])
-        if post_matmul_shape_none_count == onnx_output_shape_none_count:
+        if post_matmul_shape_none_count == onnx_output_shape_none_count \
+            and post_matmul_shape != list(onnx_output_shape):
             post_transpose_perm = []
             for dim in onnx_output_shape:
                 idx = post_matmul_shape.index(dim)
                 post_transpose_perm.append(idx)
                 post_matmul_shape[idx] = -999
 
-            tf_layers_dict[graph_node_output.name]['tf_node'] = \
-                tf.transpose(
-                    a=tf_layers_dict[graph_node_output.name]['tf_node'],
-                    perm=post_transpose_perm,
-                )
+            if len(post_transpose_perm) == len(post_matmul_shape):
+                tf_layers_dict[graph_node_output.name]['tf_node'] = \
+                    tf.transpose(
+                        a=tf_layers_dict[graph_node_output.name]['tf_node'],
+                        perm=post_transpose_perm,
+                    )
 
     # Post-process transpose
     tf_layers_dict[graph_node_output.name]['tf_node'] = post_process_transpose(

{onnx2tf-1.29.10.dist-info → onnx2tf-1.29.12.dist-info}/METADATA

@@ -1,16 +1,20 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.10
-Summary: Self-Created Tools to convert ONNX files (NCHW) to TensorFlow/TFLite/Keras format (NHWC).
-Home-page: https://github.com/PINTO0309/onnx2tf
+Version: 1.29.12
+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
-Author-email: rmsdh122@yahoo.co.jp
-Platform: linux
-Platform: unix
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-License-File: LICENSE_onnx-tensorflow
+Author-email: Katsuya Hyodo <rmsdh122@yahoo.co.jp>
+License-Expression: MIT
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: Unix
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Dist: requests==2.32.5
 Requires-Dist: numpy==1.26.4
 Requires-Dist: onnx==1.19.0
@@ -26,14 +30,14 @@ Requires-Dist: simple-onnx-processing-tools==1.1.32
 Requires-Dist: psutil==5.9.5
 Requires-Dist: protobuf==4.25.5
 Requires-Dist: h5py==3.11.0
-Requires-Dist: ml_dtypes==0.5.1
+Requires-Dist: ml-dtypes==0.5.1
 Requires-Dist: flatbuffers==25.12.19
-Dynamic: author
-Dynamic: author-email
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: platform
-Dynamic: requires-python
+Requires-Python: >=3.10.12
+Project-URL: Homepage, https://github.com/PINTO0309/onnx2tf
+Project-URL: Repository, https://github.com/PINTO0309/onnx2tf
+Project-URL: Documentation, https://github.com/PINTO0309/onnx2tf#readme
+Project-URL: Issues, https://github.com/PINTO0309/onnx2tf/issues
+Description-Content-Type: text/markdown
 
 # 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.
@@ -359,7 +363,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.10
+  ghcr.io/pinto0309/onnx2tf:1.29.12
 
   or
 
@@ -367,7 +371,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.10
+  docker.io/pinto0309/onnx2tf:1.29.12
 
   or
 

{onnx2tf-1.29.10.dist-info → onnx2tf-1.29.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=E1LYdyUQ9pnnydTNI6NtTfnt7AZXaoxY42NlhsS5Jr0,67
+onnx2tf/__init__.py,sha256=89EgFjqomm_s1GTO1Is-NN_4IBNeGFXu31Zcmotmbes,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=yR8aKaEn01Q8dEeYDqHIsuZuG6l5TGQniHDlPiUROx4,152238
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -92,7 +92,7 @@ onnx2tf/ops/LogSoftmax.py,sha256=j2nhYY7__8ViLFJVLA5tS98QEvGS1gTIW0QCdnZWUPQ,392
 onnx2tf/ops/Loop.py,sha256=I32CWoex8FMXm9KE2aomADB4jK5BzaMoAKvtPnBJy6A,14593
 onnx2tf/ops/LpNormalization.py,sha256=Uu15HgxFNXb6gNMgdTJyf0SLPaLbcbkOYqY_4hMBxNA,3153
 onnx2tf/ops/LpPool.py,sha256=96eI1FaDgW0M_USWBCHFedvtojHTLL28_lb3mcEV55A,10470
-onnx2tf/ops/MatMul.py,sha256=KHhRyQCyxe6845f-AOI1UJzA3rGTssG6eyKmDw0oegs,21466
+onnx2tf/ops/MatMul.py,sha256=X9cQSD4BCogkDP6D4YZEZmOWnsceGL8ppN8E4kqyjB0,23926
 onnx2tf/ops/MatMulInteger.py,sha256=qHqzdJNI9SeJDbW8pR90baYCdGN6FdOez4hi9EzwXoc,6538
 onnx2tf/ops/Max.py,sha256=w5nMciO_6ApYUobHuwMGuS3xhuza7eSvKDRhvMPgAuo,3256
 onnx2tf/ops/MaxPool.py,sha256=_JC4eqBTh-qLkZCMG8RZhthRZ8D2d821zaFMWeGMEWc,15775
@@ -199,9 +199,7 @@ 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.10.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.29.10.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.29.10.dist-info/METADATA,sha256=LMFqdTpJPlqtKrJ0jmOeQh5PKMyUy_XDbSPDcARueyE,153516
-onnx2tf-1.29.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-onnx2tf-1.29.10.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.29.10.dist-info/RECORD,,
+onnx2tf-1.29.12.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
+onnx2tf-1.29.12.dist-info/entry_points.txt,sha256=GuhvLu7ZlYECumbmoiFlKX0mFPtFi_Ti9L-E5yuQqKs,42
+onnx2tf-1.29.12.dist-info/METADATA,sha256=Ddf7-_nYlEjEOlH3taykx6G5ULbARSgF7cuFlj7HD_0,154193
+onnx2tf-1.29.12.dist-info/RECORD,,

{onnx2tf-1.29.10.dist-info → onnx2tf-1.29.12.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.2)
+Generator: uv 0.9.27
 Root-Is-Purelib: true
 Tag: py3-none-any
-

onnx2tf-1.29.12.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+onnx2tf = onnx2tf:main
+

onnx2tf-1.29.10.dist-info/licenses/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Katsuya Hyodo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

onnx2tf-1.29.10.dist-info/licenses/LICENSE_onnx-tensorflow

@@ -1,213 +0,0 @@
-ONNX-Tensorflow Converter
-
-Copyright (c) International Business Machines Corporation 2017, 2018
-Copyright (c) LeapMind Inc. 2018
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
- 
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- 
- 1. Definitions.
- 
-     "License" shall mean the terms and conditions for use, reproduction, and
-     distribution as defined by Sections 1 through 9 of this document.
- 
-     "Licensor" shall mean the copyright owner or entity authorized by the
-     copyright owner that is granting the License.
- 
-     "Legal Entity" shall mean the union of the acting entity and all other
-     entities that control, are controlled by, or are under common control with
-     that entity. For the purposes of this definition, "control" means (i) the
-     power, direct or indirect, to cause the direction or management of such
-     entity, whether by contract or otherwise, or (ii) ownership of
-     fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
-     ownership of such entity.
- 
-     "You" (or "Your") shall mean an individual or Legal Entity exercising
-     permissions granted by this License.
- 
-     "Source" form shall mean the preferred form for making modifications,
-     including but not limited to software source code, documentation source,
-     and configuration files.
- 
-     "Object" form shall mean any form resulting from mechanical transformation
-     or translation of a Source form, including but not limited to compiled
-     object code, generated documentation, and conversions to
-     other media types.
- 
-     "Work" shall mean the work of authorship, whether in Source or Object
-     form, made available under the License, as indicated by a copyright notice
-     that is included in or attached to the work (an example is provided in the
-     Appendix below).
- 
-     "Derivative Works" shall mean any work, whether in Source or Object form,
-     that is based on (or derived from) the Work and for which the editorial
-     revisions, annotations, elaborations, or other modifications represent,
-     as a whole, an original work of authorship. For the purposes of this
-     License, Derivative Works shall not include works that remain separable
-     from, or merely link (or bind by name) to the interfaces of, the Work and
-     Derivative Works thereof.
- 
-     "Contribution" shall mean any work of authorship, including the original
-     version of the Work and any modifications or additions to that Work or
-     Derivative Works thereof, that is intentionally submitted to Licensor for
-     inclusion in the Work by the copyright owner or by an individual or
-     Legal Entity authorized to submit on behalf of the copyright owner.
-     For the purposes of this definition, "submitted" means any form of
-     electronic, verbal, or written communication sent to the Licensor or its
-     representatives, including but not limited to communication on electronic
-     mailing lists, source code control systems, and issue tracking systems
-     that are managed by, or on behalf of, the Licensor for the purpose of
-     discussing and improving the Work, but excluding communication that is
-     conspicuously marked or otherwise designated in writing by the copyright
-     owner as "Not a Contribution."
- 
-     "Contributor" shall mean Licensor and any individual or Legal Entity on
-     behalf of whom a Contribution has been received by Licensor and
-     subsequently incorporated within the Work.
- 
- 2. Grant of Copyright License.
- 
-     Subject to the terms and conditions of this License, each Contributor
-     hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-     royalty-free, irrevocable copyright license to reproduce, prepare
-     Derivative Works of, publicly display, publicly perform, sublicense,
-     and distribute the Work and such Derivative Works in
-     Source or Object form.
- 
- 3. Grant of Patent License.
- 
-     Subject to the terms and conditions of this License, each Contributor
-     hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-     royalty-free, irrevocable (except as stated in this section) patent
-     license to make, have made, use, offer to sell, sell, import, and
-     otherwise transfer the Work, where such license applies only to those
-     patent claims licensable by such Contributor that are necessarily
-     infringed by their Contribution(s) alone or by combination of their
-     Contribution(s) with the Work to which such Contribution(s) was submitted.
-     If You institute patent litigation against any entity (including a
-     cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-     Contribution incorporated within the Work constitutes direct or
-     contributory patent infringement, then any patent licenses granted to
-     You under this License for that Work shall terminate as of the date such
-     litigation is filed.
- 
- 4. Redistribution.
- 
-     You may reproduce and distribute copies of the Work or Derivative Works
-     thereof in any medium, with or without modifications, and in Source or
-     Object form, provided that You meet the following conditions:
- 
-     1. You must give any other recipients of the Work or Derivative Works a
-     copy of this License; and
- 
-     2. You must cause any modified files to carry prominent notices stating
-     that You changed the files; and
- 
-     3. You must retain, in the Source form of any Derivative Works that You
-     distribute, all copyright, patent, trademark, and attribution notices from
-     the Source form of the Work, excluding those notices that do not pertain
-     to any part of the Derivative Works; and
- 
-     4. If the Work includes a "NOTICE" text file as part of its distribution,
-     then any Derivative Works that You distribute must include a readable copy
-     of the attribution notices contained within such NOTICE file, excluding
-     those notices that do not pertain to any part of the Derivative Works,
-     in at least one of the following places: within a NOTICE text file
-     distributed as part of the Derivative Works; within the Source form or
-     documentation, if provided along with the Derivative Works; or, within a
-     display generated by the Derivative Works, if and wherever such
-     third-party notices normally appear. The contents of the NOTICE file are
-     for informational purposes only and do not modify the License.
-     You may add Your own attribution notices within Derivative Works that You
-     distribute, alongside or as an addendum to the NOTICE text from the Work,
-     provided that such additional attribution notices cannot be construed
-     as modifying the License.
- 
-     You may add Your own copyright statement to Your modifications and may
-     provide additional or different license terms and conditions for use,
-     reproduction, or distribution of Your modifications, or for any such
-     Derivative Works as a whole, provided Your use, reproduction, and
-     distribution of the Work otherwise complies with the conditions
-     stated in this License.
- 
- 5. Submission of Contributions.
- 
-     Unless You explicitly state otherwise, any Contribution intentionally
-     submitted for inclusion in the Work by You to the Licensor shall be under
-     the terms and conditions of this License, without any additional
-     terms or conditions. Notwithstanding the above, nothing herein shall
-     supersede or modify the terms of any separate license agreement you may
-     have executed with Licensor regarding such Contributions.
- 
- 6. Trademarks.
- 
-     This License does not grant permission to use the trade names, trademarks,
-     service marks, or product names of the Licensor, except as required for
-     reasonable and customary use in describing the origin of the Work and
-     reproducing the content of the NOTICE file.
- 
- 7. Disclaimer of Warranty.
- 
-     Unless required by applicable law or agreed to in writing, Licensor
-     provides the Work (and each Contributor provides its Contributions)
-     on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-     either express or implied, including, without limitation, any warranties
-     or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS
-     FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
-     appropriateness of using or redistributing the Work and assume any risks
-     associated with Your exercise of permissions under this License.
- 
- 8. Limitation of Liability.
- 
-     In no event and under no legal theory, whether in tort
-     (including negligence), contract, or otherwise, unless required by
-     applicable law (such as deliberate and grossly negligent acts) or agreed
-     to in writing, shall any Contributor be liable to You for damages,
-     including any direct, indirect, special, incidental, or consequential
-     damages of any character arising as a result of this License or out of
-     the use or inability to use the Work (including but not limited to damages
-     for loss of goodwill, work stoppage, computer failure or malfunction,
-     or any and all other commercial damages or losses), even if such
-     Contributor has been advised of the possibility of such damages.
- 
- 9. Accepting Warranty or Additional Liability.
- 
-     While redistributing the Work or Derivative Works thereof, You may choose
-     to offer, and charge a fee for, acceptance of support, warranty,
-     indemnity, or other liability obligations and/or rights consistent with
-     this License. However, in accepting such obligations, You may act only
-     on Your own behalf and on Your sole responsibility, not on behalf of any
-     other Contributor, and only if You agree to indemnify, defend, and hold
-     each Contributor harmless for any liability incurred by, or claims
-     asserted against, such Contributor by reason of your accepting any such
-     warranty or additional liability.
- 
- END OF TERMS AND CONDITIONS
- 
- APPENDIX: How to apply the Apache License to your work
- 
-     To apply the Apache License to your work, attach the following boilerplate
-     notice, with the fields enclosed by brackets "[]" replaced with your own
-     identifying information. (Don't include the brackets!) The text should be
-     enclosed in the appropriate comment syntax for the file format. We also
-     recommend that a file or class name and description of purpose be included
-     on the same "printed page" as the copyright notice for easier
-     identification within third-party archives.
- 
-         Copyright 2017 ONNX-TF Authors
- 
-         Licensed under the Apache License, Version 2.0 (the "License");
-         you may not use this file except in compliance with the License.
-         You may obtain a copy of the License at
- 
-         http://www.apache.org/licenses/LICENSE-2.0
- 
-         Unless required by applicable law or agreed to in writing, software
-         distributed under the License is distributed on an "AS IS" BASIS,
-         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-         or implied. See the License for the specific language governing
-         permissions and limitations under the License.
-

onnx2tf-1.29.10.dist-info/top_level.txt

@@ -1 +0,0 @@
-onnx2tf