onnx2tf 1.26.7__py3-none-any.whl → 1.26.9__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.26.7'
+__version__ = '1.26.9'

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/ops/ReduceL1.py

@@ -298,12 +298,10 @@ def make_node(
     # Generation of TF OP
     axes = list(axes) if axes is not None else None
     tf_layers_dict[graph_node_output.name]['tf_node'] = \
-        tf.norm(
-            tensor=input_tensor,
-            ord=1,
+        tf.reduce_sum(
+            tf.abs(input_tensor),
             axis=axes if len(axes) > 1 else axes[0],
             keepdims=keepdims,
-            name=graph_node.name,
         )
 
     # Post-process transpose

onnx2tf/ops/ReduceL2.py

@@ -297,12 +297,12 @@ def make_node(
     # Generation of TF OP
     axes = list(axes) if axes is not None else None
     tf_layers_dict[graph_node_output.name]['tf_node'] = \
-        tf.norm(
-            tensor=input_tensor,
-            ord=2,
-            axis=axes if len(axes) > 1 else axes[0],
-            keepdims=keepdims,
-            name=graph_node.name,
+        tf.sqrt(
+            tf.reduce_sum(
+                tf.square(input_tensor),
+                axis=axes,
+                keepdims=keepdims
+            )
         )
 
     # Post-process transpose

{onnx2tf-1.26.7.dist-info → onnx2tf-1.26.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: onnx2tf
-Version: 1.26.7
+Version: 1.26.9
 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
@@ -331,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.7
+  ghcr.io/pinto0309/onnx2tf:1.26.9
 
   or
 
@@ -339,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.7
+  docker.io/pinto0309/onnx2tf:1.26.9
 
   or
 

{onnx2tf-1.26.7.dist-info → onnx2tf-1.26.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=RrXNg4NwfETlM2c3jHfhOLXhTvNGwhllQR8rp8HGUqk,66
+onnx2tf/__init__.py,sha256=14sed6LJ9qrrV90jfdiUVlID3DheS0YBDgOQlRIbt_U,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
@@ -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
@@ -122,8 +122,8 @@ onnx2tf/ops/RandomUniform.py,sha256=3FIDoguM-eDVD0vAWt7XxYj3fhLLvubNDDWtNazh7es,
 onnx2tf/ops/RandomUniformLike.py,sha256=CocvXoQkjeumITYuQGKF8TSTOX6xNKreZgQFopYqu0c,2771
 onnx2tf/ops/Range.py,sha256=2Kcn0dDZ7T-zKeCyJUH3NRXGR7DhIcgmuAjRCWgBSbU,3340
 onnx2tf/ops/Reciprocal.py,sha256=wRNioynAaaCnNZn183G2IPbEUTMtE5y95EwCoSHUNGE,3604
-onnx2tf/ops/ReduceL1.py,sha256=HKFXX71LLlKoLDOWMqgom6NPiP6DbrSq5hHRPOLYJbA,12387
-onnx2tf/ops/ReduceL2.py,sha256=rvdaIneNPtct8lOLo1Q8DTF3n8AOwedgNxL_w60ZVtU,12312
+onnx2tf/ops/ReduceL1.py,sha256=O8u9MzkjETml9FOrLP98Ldr8BcvT-CBvFYfXU-Rl454,12341
+onnx2tf/ops/ReduceL2.py,sha256=XFFzedagS7CN884VHk4TRm9Sxt7KD6n82g-aHJ29hbM,12285
 onnx2tf/ops/ReduceLogSum.py,sha256=xa5CtTKBi-VJpSHWLTGZKcV4IjEw6RorkpM6r0ffuP8,12349
 onnx2tf/ops/ReduceLogSumExp.py,sha256=xHBUGDyCHDfqlvYbJwg11-lAMundx_pj5K8pOQuOZwU,12357
 onnx2tf/ops/ReduceMax.py,sha256=BQ6xZ4il1fZp5WEwtY6Kbm45fGTjC_M2S5FDiKKCT4U,12593
@@ -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.7.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.26.7.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.26.7.dist-info/METADATA,sha256=c3wABcbpUgOuTUlhaLmywA_FPyN8Aogkz5KAV0Um4Ao,147499
-onnx2tf-1.26.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-onnx2tf-1.26.7.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.26.7.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.26.7.dist-info/RECORD,,
+onnx2tf-1.26.9.dist-info/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.26.9.dist-info/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.26.9.dist-info/METADATA,sha256=YlHKAl6m5rKRbF5pN8-jvIFUDvVTX9Mg-eWdkJvUkKM,147499
+onnx2tf-1.26.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+onnx2tf-1.26.9.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.26.9.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.26.9.dist-info/RECORD,,

{onnx2tf-1.26.7.dist-info → onnx2tf-1.26.9.dist-info}/WHEEL

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