onnx2tf 1.26.6__py3-none-any.whl → 1.26.8__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.26.6'
+__version__ = '1.26.8'

onnx2tf/ops/DequantizeLinear.py

@@ -101,12 +101,14 @@ def make_node(
 
     # Reshape process is needed for per-axis dequantization
     # when scale is a 1-D tensor
-    if x_scale_rank == 1:
+    if x_scale_rank == 1 and x_scale_shape[0] != 1:
         shape_broadcast = list([1 for _ in range(axis)] + [input_tensor_shape[axis]] + [1 for _ in range(axis + 1, input_tensor_rank)])
         x_scale = tf.reshape(
             tensor=x_scale,
             shape=shape_broadcast,
         )
+    elif x_scale_rank == 1 and x_scale_shape[0] == 1:
+        shape_broadcast = [1 for i in range(input_tensor_rank)]
 
     subed_tensor = input_tensor
     if len(graph_node.inputs) >= 3 and input_tensor.dtype != tf.int32:

onnx2tf/ops/GatherElements.py

@@ -184,7 +184,8 @@ def make_node(
                 tf_layers_dict=tf_layers_dict,
             )
             val_model = None
-            if not isinstance(input_tensor, np.ndarray):
+            if not isinstance(input_tensor, np.ndarray) \
+                and not hasattr(input_tensor, "numpy"):
                 val_model = tf_keras.Model(
                     inputs=tf_model_inputs,
                     outputs=[

{onnx2tf-1.26.6.dist-info → onnx2tf-1.26.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: onnx2tf
-Version: 1.26.6
+Version: 1.26.8
 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
@@ -289,14 +289,22 @@ Video speed is adjusted approximately 50 times slower than actual speed.
 - psutil==5.9.5
 - ml_dtypes==0.3.2
 - flatbuffers-compiler (Optional, Only when using the `-coion` option. Executable file named `flatc`.)
-- flatbuffers>=23.5.26
+- flatbuffers>=23.1.21
   ```bash
-  # Custom flatc v23.5.26 binary for Ubuntu 20.04+
+  # Custom flatc binary for Ubuntu 22.04+
   # https://github.com/PINTO0309/onnx2tf/issues/196
+
+  # x86_64/amd64 v23.5.26
   wget https://github.com/PINTO0309/onnx2tf/releases/download/1.16.31/flatc.tar.gz \
   && tar -zxvf flatc.tar.gz \
   && sudo chmod +x flatc \
   && sudo mv flatc /usr/bin/
+
+  # arm64 v23.1.21
+  wget https://github.com/PINTO0309/onnx2tf/releases/download/1.26.6/flatc_arm64.tar.gz \
+  && tar -zxvf flatc_arm64.tar.gz \
+  && sudo chmod +x flatc \
+  && sudo mv flatc /usr/bin/
   ```
 
 ## Sample Usage
@@ -323,7 +331,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.6
+  ghcr.io/pinto0309/onnx2tf:1.26.8
 
   or
 
@@ -331,7 +339,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.6
+  docker.io/pinto0309/onnx2tf:1.26.8
 
   or
 

{onnx2tf-1.26.6.dist-info → onnx2tf-1.26.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=D5w6RbaMF9GzXScgnbOcTItpc7gKywaN-02SRdPSjro,66
+onnx2tf/__init__.py,sha256=JmpkhYt1GTh9veBIkt7rVJ77GyAolWS783efKllAINE,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=IEnfIs3Dy8Y5F3iJ4HY7bWkn3QuB6lq_gHa1q5E3tMI,124745
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -33,7 +33,7 @@ onnx2tf/ops/Cos.py,sha256=0v5ZJZRzrswVEObyxf4f0RvnWMWZA4uCEdoeq_VE31s,3608
 onnx2tf/ops/Cosh.py,sha256=-L3QkQtiVBJIv1sSxbXtetVIwgI_2T4WC1O4t2aJ8Gc,3585
 onnx2tf/ops/CumSum.py,sha256=SYKmD5r9Cm9gsCkJPNFoHigvvBO1PmRYRrVmn1HE78o,3954
 onnx2tf/ops/DepthToSpace.py,sha256=BiyBZ88dmXQAkZ5Jc-Ddo-5Kn8dRYCnoik_XnOFzqXc,14449
-onnx2tf/ops/DequantizeLinear.py,sha256=C-V0VOYqDqkEnKu83o_KS8mGuUsx6qHLt8qoFMwQC5I,5076
+onnx2tf/ops/DequantizeLinear.py,sha256=cNbGw4ITg_BsrXYkSb7fD05XEkQgz7v__-StQtvIvB4,5220
 onnx2tf/ops/Det.py,sha256=kxuHkpv_KNHkof0uBv2RLtr3G1uA76MFHyCiCYCBXkw,3590
 onnx2tf/ops/Div.py,sha256=fIN90mp7ByeKWEVDVENvCMja5Qc83jstayNw9hoKP4Y,16224
 onnx2tf/ops/Dropout.py,sha256=KZKVqlnbq875awsNvJaQRvkO3XgqxeAmjbikXymRCtA,5860
@@ -50,7 +50,7 @@ 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=3NzmEL50z0amWAwGiDo7A9ZLpcivD5ByAHtZd9ngk_g,14969
+onnx2tf/ops/GatherElements.py,sha256=pR9EuOkYRBKPntmnj9DYpoBESc35EGv3RHfl0HCSmao,15026
 onnx2tf/ops/GatherND.py,sha256=sdHaBeY2ycN9gRc_ahaZo2QI9XbV8PBthefm-JPiPnE,7642
 onnx2tf/ops/Gelu.py,sha256=ms9oHnESOuiIPxl_8YU2WEnQo_BVKRPKo5UJsvsWyEA,4321
 onnx2tf/ops/Gemm.py,sha256=8vGtXwx_V59JIDh3EBPuFVQSbIVql45zEHUlVGV3coU,7587
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 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.6.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.26.6.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.26.6.dist-info/METADATA,sha256=YynCnx1YI6Z2O7qzh_0en21B-2V1LGUNNBARLYkpe8E,147279
-onnx2tf-1.26.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-onnx2tf-1.26.6.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.26.6.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.26.6.dist-info/RECORD,,
+onnx2tf-1.26.8.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.26.8.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.26.8.dist-info/METADATA,sha256=C3jELB9wU7bG2S4qAWIebTQHAJ8a_rUn_-HSLfIxUY4,147499
+onnx2tf-1.26.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+onnx2tf-1.26.8.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.26.8.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.26.8.dist-info/RECORD,,