onnx2tf 1.25.13__py3-none-any.whl → 1.25.15__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.25.13'
+__version__ = '1.25.15'

onnx2tf/ops/Add.py

@@ -92,6 +92,10 @@ def make_node(
     input_tensor_2 = tf_layers_dict[graph_node_input_2.name]['tf_node'] \
         if isinstance(graph_node_input_2, gs.Variable) else graph_node_input_2
 
+    # issue: https://github.com/PINTO0309/onnx2tf/issues/698
+    if isinstance(input_tensor_1, np.ndarray) and not isinstance(input_tensor_2, np.ndarray):
+        input_tensor_1, input_tensor_2 = input_tensor_2, input_tensor_1
+
     disable_strict_mode: bool = kwargs['disable_strict_mode']
     gelu_replace_op_names: dict = kwargs['gelu_replace_op_names']
 

onnx2tf/ops/ArgMin.py

@@ -49,11 +49,15 @@ def make_node(
     shape = graph_node_output.shape
     dtype = graph_node_output.dtype
 
+    # Generation of TF OP
+    input_tensor = tf_layers_dict[graph_node_input.name]['tf_node'] \
+        if isinstance(graph_node_input, gs.Variable) else graph_node_input
+
     axis = graph_node.attrs.get('axis', 0)
     # NCHW->NHWC, NCDHW->NDHWC
     axis = convert_axis(
         axis=axis,
-        tensor_rank=len(graph_node_input.shape),
+        tensor_rank=len(graph_node_input.shape) if graph_node_input.shape is not None else len(input_tensor.shape),
         before_op_output_shape_trans=before_op_output_shape_trans,
     )
 
@@ -73,10 +77,6 @@ def make_node(
                 and 'nhwc' in tf_layers_dict[graph_node_input.name].keys() else False
     }
 
-    # Generation of TF OP
-    input_tensor = tf_layers_dict[graph_node_input.name]['tf_node'] \
-        if isinstance(graph_node_input, gs.Variable) else graph_node_input
-
     # Pre-process transpose
     input_tensor = pre_process_transpose(
         value_before_transpose=input_tensor,

onnx2tf/ops/Mul.py

@@ -84,6 +84,10 @@ def make_node(
     input_tensor_2 = tf_layers_dict[graph_node_input_2.name]['tf_node'] \
         if isinstance(graph_node_input_2, gs.Variable) else graph_node_input_2
 
+    # issue: https://github.com/PINTO0309/onnx2tf/issues/698
+    if isinstance(input_tensor_1, np.ndarray) and not isinstance(input_tensor_2, np.ndarray):
+        input_tensor_1, input_tensor_2 = input_tensor_2, input_tensor_1
+
     disable_strict_mode: bool = kwargs['disable_strict_mode']
     gelu_replace_op_names: dict = kwargs['gelu_replace_op_names']
 

{onnx2tf-1.25.13.dist-info → onnx2tf-1.25.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx2tf
-Version: 1.25.13
+Version: 1.25.15
 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
@@ -314,7 +314,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.25.13
+  ghcr.io/pinto0309/onnx2tf:1.25.15
 
   or
 
@@ -322,7 +322,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.25.13
+  docker.io/pinto0309/onnx2tf:1.25.15
 
   or
 

{onnx2tf-1.25.13.dist-info → onnx2tf-1.25.15.dist-info}/RECORD

@@ -1,13 +1,13 @@
-onnx2tf/__init__.py,sha256=0n0kULz_N4EYmkcB2C7-NGxa_cfTD3OmF9a5gwtv2cA,67
+onnx2tf/__init__.py,sha256=opVL1OZ6Gid56hPg_xSsIoFbi2YhdQYGiyMz8JpmmUI,67
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=v7juKPrl_0h9SQyck-Ol4B59QXWSSePVC3AUu3fmvII,122750
 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
-onnx2tf/ops/Add.py,sha256=GzbQ8TIbQv5WcO_rYvYAvfyU45_6S26TR06NqTy0QqM,12043
+onnx2tf/ops/Add.py,sha256=JnoEYKLFI2Uh7G1MTOvMxGPLIgIJ5V1VAZGKkVa_XzU,12271
 onnx2tf/ops/And.py,sha256=_ubtWa0r8-60x__pS7MEMil1DfBqxiUsk66yRCYS4KY,4591
 onnx2tf/ops/ArgMax.py,sha256=F3PV4EchYQgH1GATJybVGnmY9sGvZkgxCHbNCue9Qns,7278
-onnx2tf/ops/ArgMin.py,sha256=CeLbK6mwT8h2H5_LleZo3YhuMnNjVbBPhre3Xix2thk,4158
+onnx2tf/ops/ArgMin.py,sha256=32r7I8AYLQOKTPOOPX1AZwiPnQfkrFB0Le16vdJ1yBs,4225
 onnx2tf/ops/Asin.py,sha256=2djUjTaOzXM6t4Qb-EEMZY-pm1rJl24cgcrep2i_6aQ,4003
 onnx2tf/ops/Asinh.py,sha256=74ZzTEkpxZY4CGfJT2JJU-SHXYL5KZeUkWY2v7hsMMw,3588
 onnx2tf/ops/Atan.py,sha256=D24XDMxEwXFtJheQAr3V3IWOUOc6Q5M0-b_83bmGGMM,3981
@@ -93,7 +93,7 @@ onnx2tf/ops/MelWeightMatrix.py,sha256=MyYFUTxz2wFVqNx3Dhlro0ktg9kxtEq8sGFmHICDZs
 onnx2tf/ops/Min.py,sha256=dK3i115xYh6NusQtGfswEGYBg9MBc_g-edafLgvq4TQ,3356
 onnx2tf/ops/Mish.py,sha256=LEg5MXBLLIzwxmsudC1zTA_yq7drVY_DMCB8lHBCA-8,3546
 onnx2tf/ops/Mod.py,sha256=K6oH5Q4I5JWh8DFp8T1CSdL4WUJCexYdfqTy5iceJxo,9999
-onnx2tf/ops/Mul.py,sha256=LT3lRwkiUK4y3IcHveLW5FqYNh-sGDPZeKciMmCpjH8,15734
+onnx2tf/ops/Mul.py,sha256=p75MHWbJSo6jLarFzmfK6oQREar4ntlFGqn-U7MzY8s,15962
 onnx2tf/ops/Multinomial.py,sha256=0HQC76IA3AvRsUx9RS0S__nIfEmPuvIaDfSt8bns4FU,3158
 onnx2tf/ops/Neg.py,sha256=vu2ExVXyGpggAM_DNPeZj9QFeUyqhn5XmJnDlPJFsQU,4219
 onnx2tf/ops/NonMaxSuppression.py,sha256=XdqIAh-KhU9JXRxXigGYe37cw2Fus7wgIteJTcIn_wQ,14153
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 onnx2tf/utils/common_functions.py,sha256=gCpAe11EcX-gYOMu68saIpIj20pDmLld-6jybnc_0aY,240691
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.25.13.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.25.13.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.25.13.dist-info/METADATA,sha256=c-Lopg7ir77SfOzaY25Pvbm6noISr9nVotCZIcoVbwo,146125
-onnx2tf-1.25.13.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-onnx2tf-1.25.13.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.25.13.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.25.13.dist-info/RECORD,,
+onnx2tf-1.25.15.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.25.15.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.25.15.dist-info/METADATA,sha256=a3NRQOOxqxrY48M3FAnq6UiitZ3iXaX_zyLHhd02buQ,146125
+onnx2tf-1.25.15.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+onnx2tf-1.25.15.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.25.15.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.25.15.dist-info/RECORD,,