onnx2tf 1.29.4__py3-none-any.whl → 1.29.5__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.29.4'
+__version__ = '1.29.5'

onnx2tf/ops/CumProd.py

@@ -0,0 +1,127 @@
+import random
+random.seed(0)
+import numpy as np
+np.random.seed(0)
+import tensorflow as tf
+import onnx_graphsurgeon as gs
+from onnx2tf.utils.common_functions import (
+    get_constant_or_variable,
+    print_node_info,
+    inverted_operation_enable_disable,
+    make_tf_node_info,
+    get_replacement_parameter,
+    pre_process_transpose,
+    post_process_transpose,
+)
+
+
+@print_node_info
+@inverted_operation_enable_disable
+@get_replacement_parameter
+def make_node(
+    *,
+    graph_node: gs.Node,
+    tf_layers_dict: dict,
+    **kwargs: dict,
+):
+    """CumProd
+
+    Parameters
+    ----------
+    graph_node: gs.Node
+        graph_surgeon Node
+
+    tf_layers_dict: dict
+        optype, shape, dtype, tensorflow graph
+    """
+    before_op_output_shape_trans_1 = \
+        tf_layers_dict.get(graph_node.inputs[0].name, {}).get('before_op_output_shape_trans', True)
+    before_op_output_shape_trans_2 = \
+        tf_layers_dict.get(graph_node.inputs[1].name, {}).get('before_op_output_shape_trans', True)
+    before_op_output_shape_trans = \
+        before_op_output_shape_trans_1 \
+        and before_op_output_shape_trans_2
+
+    graph_node_input_1 = get_constant_or_variable(
+        graph_node.inputs[0],
+        before_op_output_shape_trans,
+    )
+    graph_node_input_2 = get_constant_or_variable(
+        graph_node.inputs[1],
+        before_op_output_shape_trans,
+    )
+
+    input_tensor = tf_layers_dict[graph_node_input_1.name]['tf_node'] \
+        if isinstance(graph_node_input_1, gs.Variable) else graph_node_input_1
+    input_tensor_dtype = input_tensor.dtype
+    axis = tf_layers_dict[graph_node_input_2.name]['tf_node'] \
+        if isinstance(graph_node_input_2, gs.Variable) else graph_node_input_2
+
+    graph_node_output: gs.Variable = graph_node.outputs[0]
+
+    shape = graph_node_output.shape
+    dtype = graph_node_output.dtype
+
+    exclusive = bool(graph_node.attrs.get('exclusive', 0))
+    reverse = bool(graph_node.attrs.get('reverse', 0))
+
+    # Preserving Graph Structure (Dict)
+    tf_layers_dict[graph_node_output.name] = {
+        'optype': graph_node.op,
+        'shape': shape,
+        'dtype': dtype,
+    }
+
+    # Pre-process transpose
+    input_tensor = pre_process_transpose(
+        value_before_transpose=input_tensor,
+        param_target='inputs',
+        param_name=graph_node.inputs[0].name,
+        **kwargs,
+    )
+
+    # TensorFlow's cumsum does not support boolean,
+    # so temporarily cast to INT32 for calculation.
+    if input_tensor_dtype == tf.bool:
+        input_tensor = tf.cast(input_tensor, dtype=tf.int32)
+
+    # Generation of TF OP
+    tf_layers_dict[graph_node_output.name]['tf_node'] = \
+        tf.math.cumprod(
+            x=input_tensor,
+            axis=axis,
+            exclusive=exclusive,
+            reverse=reverse,
+            name=graph_node.name,
+        )
+
+    # TensorFlow's cumsum does not support boolean,
+    # so INT32 is converted back to boolean.
+    if input_tensor_dtype == tf.bool:
+        tf_layers_dict[graph_node_output.name]['tf_node'] = \
+            tf.cast(tf_layers_dict[graph_node_output.name]['tf_node'], dtype=tf.bool)
+
+    # Post-process transpose
+    tf_layers_dict[graph_node_output.name]['tf_node'] = post_process_transpose(
+        value_before_transpose=tf_layers_dict[graph_node_output.name]['tf_node'],
+        param_target='outputs',
+        param_name=graph_node.outputs[0].name,
+        **kwargs,
+    )
+
+    # Generation of Debug Info
+    tf_layers_dict[graph_node_output.name]['tf_node_info'] = \
+        make_tf_node_info(
+            node_info={
+                'tf_op_type': tf.math.cumprod,
+                'tf_inputs': {
+                    'x': input_tensor,
+                    'axis': axis,
+                    'exclusive': exclusive,
+                    'reverse': reverse,
+                },
+                'tf_outputs': {
+                    'output': tf_layers_dict[graph_node_output.name]['tf_node'],
+                },
+            }
+        )

{onnx2tf-1.29.4.dist-info → onnx2tf-1.29.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.29.4
+Version: 1.29.5
 Summary: Self-Created Tools to convert ONNX files (NCHW) to TensorFlow/TFLite/Keras format (NHWC).
 Home-page: https://github.com/PINTO0309/onnx2tf
 Author: Katsuya Hyodo
@@ -95,6 +95,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Acosh|:heavy_check_mark:|
   |Acos|:heavy_check_mark:|
   |Add|:heavy_check_mark:|
+  |AffineGrid|**Help wanted**|
   |And|:heavy_check_mark:|
   |ArgMax|:heavy_check_mark:|
   |ArgMin|:heavy_check_mark:|
@@ -102,6 +103,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Asin|:heavy_check_mark:|
   |Atanh|:heavy_check_mark:|
   |Atan|:heavy_check_mark:|
+  |Attention|**Help wanted**|
   |AveragePool|:heavy_check_mark:|
   |BatchNormalization|:heavy_check_mark:|
   |Bernoulli|:heavy_check_mark:|
@@ -110,6 +112,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |BitwiseNot|:heavy_check_mark:|
   |BitwiseOr|:heavy_check_mark:|
   |BitwiseXor|:heavy_check_mark:|
+  |BlackmanWindow|**Help wanted**|
   |Cast|:heavy_check_mark:|
   |Ceil|:heavy_check_mark:|
   |Celu|:heavy_check_mark:|
@@ -126,6 +129,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |ConvTranspose|:heavy_check_mark:|
   |Cosh|:heavy_check_mark:|
   |Cos|:heavy_check_mark:|
+  |CumProd|:heavy_check_mark:|
   |CumSum|:heavy_check_mark:|
   |DeformConv|**Help wanted**|
   |DepthToSpace|:heavy_check_mark:|
@@ -165,6 +169,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |HardSwish|:heavy_check_mark:|
   |Identity|:heavy_check_mark:|
   |If|:heavy_check_mark:|
+  |ImageDecoder|**Help wanted**|
   |Input|:heavy_check_mark:|
   |InstanceNormalization|:heavy_check_mark:|
   |Inverse|:heavy_check_mark:|
@@ -178,6 +183,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |LogSoftmax|:heavy_check_mark:|
   |Loop|**Help wanted**|
   |LpNormalization|:heavy_check_mark:|
+  |LpPool|**Help wanted**|
   |LRN|:heavy_check_mark:|
   |LSTM|:heavy_check_mark:|
   |MatMul|:heavy_check_mark:|
@@ -195,6 +201,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Mul|:heavy_check_mark:|
   |Multinomial|:heavy_check_mark:|
   |Neg|:heavy_check_mark:|
+  |NegativeLogLikelihoodLoss|**Help wanted**|
   |NonMaxSuppression|:heavy_check_mark:|
   |NonZero|:heavy_check_mark:|
   |Optional|**Help wanted**|
@@ -237,6 +244,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |ReverseSequence|:heavy_check_mark:|
   |RNN|:heavy_check_mark:|
   |RoiAlign|:heavy_check_mark:|
+  |RotaryEmbedding|**Help wanted**|
   |Round|:heavy_check_mark:|
   |ScaleAndTranslate|:heavy_check_mark:|
   |Scatter|:heavy_check_mark:|
@@ -259,6 +267,7 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Size|:heavy_check_mark:|
   |Slice|:heavy_check_mark:|
   |Softmax|:heavy_check_mark:|
+  |SoftmaxCrossEntropyLoss|**Help wanted**|
   |Softplus|:heavy_check_mark:|
   |Softsign|:heavy_check_mark:|
   |SpaceToDepth|:heavy_check_mark:|
@@ -267,11 +276,14 @@ https://github.com/PINTO0309/onnx2tf/wiki/model_status
   |Sqrt|:heavy_check_mark:|
   |Squeeze|:heavy_check_mark:|
   |STFT|:white_check_mark:|
+  |StringConcat|**Help wanted**|
   |StringNormalizer|:white_check_mark:|
+  |StringSplit|**Help wanted**|
   |Sub|:heavy_check_mark:|
   |Sum|:heavy_check_mark:|
-  |Tanh|:heavy_check_mark:|
   |Tan|:heavy_check_mark:|
+  |Tanh|:heavy_check_mark:|
+  |TensorScatter|**Help wanted**|
   |TfIdfVectorizer|**Help wanted**|
   |ThresholdedRelu|:heavy_check_mark:|
   |Tile|:heavy_check_mark:|
@@ -292,11 +304,11 @@ Video speed is adjusted approximately 50 times slower than actual speed.
 
 ## Environment
 - Linux / Windows
-- onnx==1.17.0
-- onnxruntime==1.18.1
+- onnx==1.19.0
+- onnxruntime==1.23.0
 - onnx-simplifier==0.4.33 or 0.4.30 `(onnx.onnx_cpp2py_export.shape_inference.InferenceError: [ShapeInferenceError] (op_type:Slice, node name: /xxxx/Slice): [ShapeInferenceError] Inferred shape and existing shape differ in rank: (x) vs (y))`
-- onnx_graphsurgeon
-- simple_onnx_processing_tools
+- onnx_graphsurgeon==0.5.8
+- simple_onnx_processing_tools==1.1.32
 - tensorflow==2.19.0, Special bugs: [#436](https://github.com/PINTO0309/onnx2tf/issues/436)
 - tf-keras==2.19.0
 - ai-edge-litert==1.2.0
@@ -345,7 +357,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.4
+  ghcr.io/pinto0309/onnx2tf:1.29.5
 
   or
 
@@ -353,15 +365,15 @@ 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.4
+  docker.io/pinto0309/onnx2tf:1.29.5
 
   or
 
-  pip install -U onnx==1.17.0 \
-  && pip install -U onnx-graphsurgeon \
-  && pip install -U onnxruntime==1.18.1 \
+  pip install -U onnx==1.19.0 \
+  && pip install -U onnx-graphsurgeon==0.5.8 \
+  && pip install -U onnxruntime==1.23.0 \
   && pip install -U onnxsim==0.4.33 \
-  && pip install -U simple_onnx_processing_tools \
+  && pip install -U simple_onnx_processing_tools==1.1.32 \
   && pip install -U sne4onnx>=1.0.13 \
   && pip install -U sng4onnx>=1.0.4 \
   && pip install -U ai_edge_litert==1.2.0 \
@@ -397,7 +409,7 @@ or
   !pip install -U pip \
     && pip install tensorflow==2.19.0 \
     && pip install ai_edge_litert==1.2.0 \
-    && pip install -U onnx==1.17.0 \
+    && pip install -U onnx==1.19.0 \
     && python -m pip install onnx_graphsurgeon \
           --index-url https://pypi.ngc.nvidia.com \
     && pip install -U onnxruntime==1.18.1 \

{onnx2tf-1.29.4.dist-info → onnx2tf-1.29.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=pluvSdvaC9nePqUVOCSAuPcchjfddyLkq1cJnhohl5w,66
+onnx2tf/__init__.py,sha256=Q0W9h6HaC_Ln39vo1FoV-1h8VnPLA9bqc2HhgI7rS7w,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=wdBA-lgCEu-ZfUAKIUQgLe8hSP8ifE7rS6nWAq6iF6o,151519
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -35,6 +35,7 @@ onnx2tf/ops/ConvInteger.py,sha256=UVHy1de6uCLM7IXP4vpzPz2pN2ej278lGBiqTPNdXFA,26
 onnx2tf/ops/ConvTranspose.py,sha256=C7CR6m3kz0MtUBdtWrrKWZbZL7tJpGXl7Nkn3DRiEaA,15410
 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/DepthToSpace.py,sha256=BiyBZ88dmXQAkZ5Jc-Ddo-5Kn8dRYCnoik_XnOFzqXc,14449
 onnx2tf/ops/DequantizeLinear.py,sha256=cNbGw4ITg_BsrXYkSb7fD05XEkQgz7v__-StQtvIvB4,5220
@@ -194,9 +195,9 @@ 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.4.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.29.4.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.29.4.dist-info/METADATA,sha256=HYGQZOLfX2Hvk0xSg3t8Dfd376S7WlGyAc16CEfQztM,153246
-onnx2tf-1.29.4.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-onnx2tf-1.29.4.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.29.4.dist-info/RECORD,,
+onnx2tf-1.29.5.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.29.5.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.29.5.dist-info/METADATA,sha256=DNS6D_TBgXo1oDBQro5G-cirZniYhPvUdjCehba_IVo,153688
+onnx2tf-1.29.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+onnx2tf-1.29.5.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.29.5.dist-info/RECORD,,