onnx2tf 1.27.7__py3-none-any.whl → 1.27.8__py3-none-any.whl

onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.27.7'
+__version__ = '1.27.8'

onnx2tf/ops/AveragePool.py

@@ -167,11 +167,46 @@ def make_node(
         input_tensor=input_tensor
     )
 
-    func = math.ceil if ceil_mode else math.floor
-    output_spatial_shape = [
-        func((i + pb + pe - d * (k - 1) - 1) / s + 1)
-        for i, pb, pe, k, d, s in zip(input_tensor_shape[1:-1], pads[:len(pads) // 2], pads[len(pads) // 2:], kernel_shape, dilations, strides)
-    ]
+    if not is_known_shape:
+        def compute_output_spatial_shape_from_tensor(input_tensor, pads, kernel_shape, dilations, strides, ceil_mode=False):
+            input_shape = tf.shape(input_tensor)  # Get dynamic shape
+            input_spatial = input_shape[1:-1]  # Extract spatial dimensions only (NHWC format)
+
+            pad_begin = pads[:len(pads) // 2]
+            pad_end = pads[len(pads) // 2:]
+
+            round_func = tf.math.ceil if ceil_mode else tf.math.floor
+
+            output_spatial = []
+            for i, pb, pe, k, d, s in zip(tf.unstack(input_spatial), pad_begin, pad_end, kernel_shape, dilations, strides):
+                i = tf.cast(i, tf.float32)
+                pb = tf.constant(pb, dtype=tf.float32)
+                pe = tf.constant(pe, dtype=tf.float32)
+                k = tf.constant(k, dtype=tf.float32)
+                d = tf.constant(d, dtype=tf.float32)
+                s = tf.constant(s, dtype=tf.float32)
+
+                numerator = i + pb + pe - d * (k - 1) - 1
+                raw_output = numerator / s + 1
+                output_dim = tf.cast(round_func(raw_output), tf.int32)
+                output_spatial.append(output_dim)
+
+            return output_spatial
+
+        output_spatial_shape = compute_output_spatial_shape_from_tensor(
+            input_tensor=input_tensor,
+            pads=pads,
+            kernel_shape=kernel_shape,
+            dilations=dilations,
+            strides=strides,
+            ceil_mode=ceil_mode
+        )
+    else:
+        func = math.ceil if ceil_mode else math.floor
+        output_spatial_shape = [
+            func((i + pb + pe - d * (k - 1) - 1) / s + 1)
+            for i, pb, pe, k, d, s in zip(input_tensor_shape[1:-1], pads[:len(pads) // 2], pads[len(pads) // 2:], kernel_shape, dilations, strides)
+        ]
 
     # onnx padding value is ignored if auto_pad is not 'NOTSET'
     if auto_pad == 'NOTSET':
@@ -218,28 +253,52 @@ def make_node(
     # count nonzero elements in kernel each strides for the case count_include_pad is False
     non_zero_counts = []
 
-    for input_spatial_shape, output_size, kernel, dilation, stride, pads_begin, pads_end \
-            in zip(input_tensor_shape[1:-1], output_spatial_shape, kernel_shape,
-                   dilations, strides, pads[:len(pads) // 2], pads[len(pads) // 2:]):
-        sample_target = np.concatenate([
-            np.zeros(pads_begin),
-            np.ones(input_spatial_shape),
-            np.zeros(pads_end)]
+    if not is_known_shape:
+        def compute_non_zero_counts_loop(input_tensor, output_spatial_shape, kernel_shape, dilations, strides, pads):
+            
+            counts_list = []
+            
+            for dim in range(len(kernel_shape)):
+                k = kernel_shape[dim]
+                counts = [k] * (output_spatial_shape[dim].numpy() if tf.is_tensor(output_spatial_shape[dim]) and hasattr(output_spatial_shape[dim], 'numpy') else output_spatial_shape[dim])
+                counts_list.append(counts)
+                
+            return counts_list
+
+        non_zero_counts = compute_non_zero_counts_loop(
+            input_tensor=input_tensor,
+            output_spatial_shape=output_spatial_shape,
+            kernel_shape=kernel_shape,
+            dilations=dilations,
+            strides=strides,
+            pads=pads
         )
-        sample_kernel = np.zeros((kernel - 1) * dilation + 1)
-        sample_kernel[::dilation] = 1
+    else:
+        for input_spatial_shape, output_size, kernel, dilation, stride, pads_begin, pads_end \
+                in zip(input_tensor_shape[1:-1], output_spatial_shape, kernel_shape,
+                       dilations, strides, pads[:len(pads) // 2], pads[len(pads) // 2:]):
+            sample_target = np.concatenate([
+                np.zeros(pads_begin),
+                np.ones(input_spatial_shape),
+                np.zeros(pads_end)]
+            )
+            sample_kernel = np.zeros((kernel - 1) * dilation + 1)
+            sample_kernel[::dilation] = 1
 
-        counts = []
-        for i in range(output_size):
-            start = i * stride
-            stride_target = sample_target[start:start+len(sample_kernel)]
-            # pad target to match size
-            stride_target = np.concatenate([stride_target, np.zeros(len(sample_kernel) - len(stride_target))])
-            counts.extend(np.convolve(stride_target, sample_kernel, mode='valid'))
+            counts = []
+            for i in range(output_size):
+                start = i * stride
+                stride_target = sample_target[start:start+len(sample_kernel)]
+                # pad target to match size
+                stride_target = np.concatenate([stride_target, np.zeros(len(sample_kernel) - len(stride_target))])
+                counts.extend(np.convolve(stride_target, sample_kernel, mode='valid'))
 
-        non_zero_counts.append(counts)
+            non_zero_counts.append(counts)
 
-    need_multiplier = len(set([i for sublist in non_zero_counts for i in sublist])) != 1
+    if not is_known_shape:
+        need_multiplier = False  # Default to False for dynamic tensors to avoid errors
+    else:
+        need_multiplier = len(set([i for sublist in non_zero_counts for i in sublist])) != 1
 
     # default tensorflow option for count_include_pad is True and cannot control
     # average value should be compensated in cases below
@@ -295,7 +354,9 @@ def make_node(
                 multiplier[-1] = k / (k - extra_pad)
                 average_multiplier.append(multiplier)
         else:
-            for i, k, non_zero_count, extra_pad in enumerate(zip(kernel_shape, non_zero_counts, extra_pads)):
+            for i in range(len(kernel_shape)):
+                k = kernel_shape[i]
+                extra_pad = extra_pads[i]
                 average_multiplier[i][-1] = k / (k - extra_pad)
 
     # Preserving Graph Structure (Dict)

{onnx2tf-1.27.7.dist-info → onnx2tf-1.27.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx2tf
-Version: 1.27.7
+Version: 1.27.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
@@ -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.7
+  ghcr.io/pinto0309/onnx2tf:1.27.8
 
   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.7
+  docker.io/pinto0309/onnx2tf:1.27.8
 
   or
 

{onnx2tf-1.27.7.dist-info → onnx2tf-1.27.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-onnx2tf/__init__.py,sha256=T9ZWYLI8Cr8oH2EHbgRHp0VPs8l0KxcEqAyWcOBf9fQ,66
+onnx2tf/__init__.py,sha256=FA0T9QrV9uxJnT2OPSYDXM4XnIfbdPVzPKxKz-BfM6s,66
 onnx2tf/__main__.py,sha256=2RSCQ7d4lc6CwD-rlGn9UicPFg-P5du7ZD_yh-kuBEU,57
 onnx2tf/onnx2tf.py,sha256=KPFVEhTDBhX7Y-Bh7X40ZEclGf2_Vfp9-M9AMPqOywI,123892
 onnx2tf/ops/Abs.py,sha256=V7btmCG_ZvK_qJovUsguq0ZMJ349mhNQ4FHSgzP_Yuo,4029
@@ -12,7 +12,7 @@ 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
 onnx2tf/ops/Atanh.py,sha256=VsUYopBWWPoo4gta1_aqvUL6NrVXuVkGid4SqDqYJ9Q,3588
-onnx2tf/ops/AveragePool.py,sha256=p9R4k87FO1yKZMQ699FIftXGUNKxb5yu0vYfzPlpsMA,14701
+onnx2tf/ops/AveragePool.py,sha256=X2uMuo1CnPBpeqXbCkG-hMBmmUFGry-Xu4EXLg2aoIw,17297
 onnx2tf/ops/BatchNormalization.py,sha256=_hlf2-5-j3MCJHEoE2oMNQ8YhCm7ad9h2fwPpTo3i7g,26624
 onnx2tf/ops/Bernoulli.py,sha256=PM0xS0n1q4bnT_9PnbcKW8_Qj8dJYYBQR8kb2X-wIp4,3670
 onnx2tf/ops/BitShift.py,sha256=a28_E9hwA8yfjvtsrSKCZCeeMPB5RBQbjB3cmaNGN6k,3861
@@ -188,10 +188,10 @@ onnx2tf/utils/__init__.py,sha256=E9FM9He68VIASDnYp-OrxvHFVn55GzWqw2OEkCqn1zg,27
 onnx2tf/utils/common_functions.py,sha256=TXvZ7qg9stD1qKvbtkoE70jRxojdtdQhhHIoYaM0I1E,241826
 onnx2tf/utils/enums.py,sha256=7c5TqetqB07VjyHoxJHfLgtqBqk9ZRyUF33fPOJR1IM,1649
 onnx2tf/utils/logging.py,sha256=yUCmPuJ_XiUItM3sZMcaMO24JErkQy7zZwVTYWAuiKg,1982
-onnx2tf-1.27.7.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
-onnx2tf-1.27.7.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
-onnx2tf-1.27.7.dist-info/METADATA,sha256=83NqwMo1_sVzH1VVUyzVhh_0QT5rSg2m4LfoP3VDrZo,147712
-onnx2tf-1.27.7.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-onnx2tf-1.27.7.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
-onnx2tf-1.27.7.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
-onnx2tf-1.27.7.dist-info/RECORD,,
+onnx2tf-1.27.8.dist-info/licenses/LICENSE,sha256=5v_Kxihy8i6mzHVl349ikSREaIdsl9YeUnX1KBDLD2w,1070
+onnx2tf-1.27.8.dist-info/licenses/LICENSE_onnx-tensorflow,sha256=gK4GtS9S5YcyINu6uuNNWdo-kBClyEM4MFLFGiNTeRM,11231
+onnx2tf-1.27.8.dist-info/METADATA,sha256=LemcJx7-r_QtmIE02r6C6XUgQKnDKGzOsyWyCF-1s5s,147712
+onnx2tf-1.27.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+onnx2tf-1.27.8.dist-info/entry_points.txt,sha256=gDPK8ToCFPKMvm8jr9xrGOkXtORJJVh4736fBEKO5k0,41
+onnx2tf-1.27.8.dist-info/top_level.txt,sha256=WgfPiEy3f6vZ_FOpAIEA2CF3TCx1eYrhGw93Ih6b9Fw,8
+onnx2tf-1.27.8.dist-info/RECORD,,