onnx2tf 1.26.2__py3-none-any.whl → 1.26.4__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.26.2'
+__version__ = '1.26.4'

onnx2tf/ops/MatMul.py

@@ -87,7 +87,7 @@ def make_node(
     input_tensor_2_is_one_d = False
     if input_tensor_1.shape is not None \
         and len(input_tensor_1.shape) == 1:
-        input_tensor_1 = tf.expand_dims(input_tensor_2, axis=0)
+        input_tensor_1 = tf.expand_dims(input_tensor_1, axis=0)
         input_tensor_1_is_one_d = True
     elif input_tensor_2.shape is not None \
             and len(input_tensor_2.shape) == 1:

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: onnx2tf
-Version: 1.26.2
+Version: 1.26.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
@@ -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.2
+  ghcr.io/pinto0309/onnx2tf:1.26.4
 
   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.2
+  docker.io/pinto0309/onnx2tf:1.26.4
 
   or
 
@@ -1463,9 +1472,13 @@ For example, take a model with multiple inputs and multiple outputs as shown in
 When converting to TensorFlow.js, process as follows.
 
 ```bash
-pip install tensorflowjs
+pip install -U --no-deps \
+tensorflowjs \
+tensorflow_decision_forests \
+ydf \
+tensorflow_hub
 
-onnx2tf -i mobilenetv2-12.onnx -ois input:1,3,224,224 -osd
+onnx2tf -i mobilenetv2-12.onnx -ois input:1,3,224,224 -osd -dgc
 
 tensorflowjs_converter \
 --input_format tf_saved_model \

{onnx2tf-1.26.2.dist-info → onnx2tf-1.26.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=ukSyMQD2nvmJ0y2IY36gj51rhGbnV4IJhhjBoTOZI3w,66
+onnx2tf/__init__.py,sha256=yvXD35bY-2gNs9gj_0CHpN50j9qhEZ4Srq2TEr2Eq0Y,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=0QiBJXhX_m2ZuWoGbAsO_N6z3o9uqN0rL8uEkllYhJc,123980
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -82,7 +82,7 @@ onnx2tf/ops/LessOrEqual.py,sha256=9Lc8qaYUPVC6yZoQluNqcdHnvpUbfWBOI4Ow38RRAJo,45
 onnx2tf/ops/Log.py,sha256=UZebF3SGq85BnoPgYyN2j-zzFRp67fJnYPNyu33W55o,3582
 onnx2tf/ops/LogSoftmax.py,sha256=j2nhYY7__8ViLFJVLA5tS98QEvGS1gTIW0QCdnZWUPQ,3923
 onnx2tf/ops/LpNormalization.py,sha256=Uu15HgxFNXb6gNMgdTJyf0SLPaLbcbkOYqY_4hMBxNA,3153
-onnx2tf/ops/MatMul.py,sha256=vCvDYN-BSSTolhK4I02Zsud29Ubaxn5-RS6clGm195I,18804
+onnx2tf/ops/MatMul.py,sha256=oH-VvMn-RTozk3E8zcFE2-T78csDIygtMksVX30o4MY,18804
 onnx2tf/ops/MatMulInteger.py,sha256=qHqzdJNI9SeJDbW8pR90baYCdGN6FdOez4hi9EzwXoc,6538
 onnx2tf/ops/Max.py,sha256=w5nMciO_6ApYUobHuwMGuS3xhuza7eSvKDRhvMPgAuo,3256
 onnx2tf/ops/MaxPool.py,sha256=_JC4eqBTh-qLkZCMG8RZhthRZ8D2d821zaFMWeGMEWc,15775
@@ -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.2.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.26.2.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.26.2.dist-info/METADATA,sha256=qhOCQWAfBYKQHEomxc8ouP7mC2IhENrgDttNpgnTwRg,146536
-onnx2tf-1.26.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-onnx2tf-1.26.2.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.26.2.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.26.2.dist-info/RECORD,,
+onnx2tf-1.26.4.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.26.4.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.26.4.dist-info/METADATA,sha256=S2NjeVHmb3vQ_tcbSlmYNgCmonESBzC46-gZjRhqvkQ,146798
+onnx2tf-1.26.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+onnx2tf-1.26.4.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.26.4.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.26.4.dist-info/RECORD,,

{onnx2tf-1.26.2.dist-info → onnx2tf-1.26.4.dist-info}/WHEEL

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