onnx2tf 1.27.1__py3-none-any.whl → 1.27.2__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.27.1'
+__version__ = '1.27.2'

onnx2tf/ops/Split.py

@@ -158,15 +158,56 @@ def make_node(
                 if idx == axis:
                     end_.append(split_idx + 1)
                 elif input_tensor_shape[idx] is None:
-                    end_.append(-1)
+                    end_.append(0)
                 else:
                     end_.append(input_tensor_shape[idx])
 
+            begin_mask_ = np.sum([2**idx if idx != axis else 0 for idx in range(input_tensor_rank)])
+            end_mask_ = np.sum([2**idx if idx != axis else 0 for idx in range(input_tensor_rank)])
+
             splited_tensors.append(
                 tf.strided_slice(
                     input_=input_tensor,
                     begin=begin_,
                     end=end_,
+                    begin_mask=begin_mask_,
+                    end_mask=end_mask_,
+                )
+            )
+    elif isinstance(split, np.ndarray) \
+        and len(list(split)) > 1 \
+        and np.prod(split) != 1 \
+        and np.all(split == split[0]) \
+        and isinstance(input_tensor_shape[axis], int) \
+        and input_tensor_shape[axis] == np.sum(split):
+        # strided_slice - Slice everything in same size
+        # Suppression of FlexSplitV generation
+        # https://github.com/PINTO0309/onnx2tf/issues/751
+        splited_tensors = []
+        split_size = split[0]
+        for split_idx in range(len(list(split))):
+            begin_ = [
+                split_size * split_idx if idx == axis else 0 for idx in range(input_tensor_rank)
+            ]
+            end_ = []
+            for idx in range(input_tensor_rank):
+                if idx == axis:
+                    end_.append(split_size * split_idx + split_size)
+                elif input_tensor_shape[idx] is None:
+                    end_.append(0)
+                else:
+                    end_.append(input_tensor_shape[idx])
+
+            begin_mask_ = np.sum([2**idx if idx != axis else 0 for idx in range(input_tensor_rank)])
+            end_mask_ = np.sum([2**idx if idx != axis else 0 for idx in range(input_tensor_rank)])
+
+            splited_tensors.append(
+                tf.strided_slice(
+                    input_=input_tensor,
+                    begin=begin_,
+                    end=end_,
+                    begin_mask=begin_mask_,
+                    end_mask=end_mask_,
                 )
             )
     elif isinstance(split, np.ndarray) \

{onnx2tf-1.27.1.dist-info → onnx2tf-1.27.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.1
+Version: 1.27.2
 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
@@ -334,7 +334,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.27.1
+  ghcr.io/pinto0309/onnx2tf:1.27.2
 
   or
 
@@ -342,7 +342,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.27.1
+  docker.io/pinto0309/onnx2tf:1.27.2
 
   or
 

{onnx2tf-1.27.1.dist-info → onnx2tf-1.27.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=1DKX0NLn80YH-Q7CqMU_p0krBqmhasp8q5rJQdssxTw,66
+onnx2tf/__init__.py,sha256=hu7TZkPbwUCwf8zZcrp1NGR2aMUiIbLW_oqR1se7KzI,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
@@ -162,7 +162,7 @@ onnx2tf/ops/Softmax.py,sha256=CEnHcSm25v1QC4QVDg4fz1NooYY1v-Uq4GORd8dnnr8,14773
 onnx2tf/ops/Softplus.py,sha256=R44YMo8G2Ig15jBO6T2VOI6RhpUmjD70qvSCXFylU-Q,3605
 onnx2tf/ops/Softsign.py,sha256=2ZdKH3KVHZXDzyO7S8f-O_aqRugurbRxd1i2g_fwCos,3600
 onnx2tf/ops/SpaceToDepth.py,sha256=rWtPQNm2rErYs20gQyz-tFYsImAIUBGtdvfMVkJg5bo,2809
-onnx2tf/ops/Split.py,sha256=ueBG52Z_wWD2xZLXgCPB11VbYz6pQDvhATqylomEMY8,8946
+onnx2tf/ops/Split.py,sha256=ukm7QZmSwYwUwGLbVGsOiCEB3YfrFMl0cozn1kwgCv0,10728
 onnx2tf/ops/SplitToSequence.py,sha256=BS_JEd7DC7vuPfs5oRRW774mtlK--kqf9DJUalv-Agk,5062
 onnx2tf/ops/Sqrt.py,sha256=-xE8Tk_6unSR56k9g3R46lML4Nht5kQwqJT0JYkn5ko,3585
 onnx2tf/ops/Squeeze.py,sha256=FLIt2qjWh1IJyti1c4YHuepH2Fkxt40rnEKszzmwsnE,7980
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 onnx2tf/utils/common_functions.py,sha256=HTDca3DGXB3xvc1S50RNscgB57TCiq4yC5Nrafs6ka4,241430
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.27.1.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.27.1.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.27.1.dist-info/METADATA,sha256=_cqkJJkplUxrDL2K4Kk4lsXZ5BLefqYuNLh7hvVA8Nc,147712
-onnx2tf-1.27.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-onnx2tf-1.27.1.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.27.1.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.27.1.dist-info/RECORD,,
+onnx2tf-1.27.2.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.27.2.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.27.2.dist-info/METADATA,sha256=Vhy11gd-Dvr86ENsHvxyHUhVQGHzwEY6PHvY8KYmVqM,147712
+onnx2tf-1.27.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+onnx2tf-1.27.2.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.27.2.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.27.2.dist-info/RECORD,,