onnx2tf 1.23.2__tar.gz → 1.24.0__tar.gz

{onnx2tf-1.23.2/onnx2tf.egg-info → onnx2tf-1.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx2tf
-Version: 1.23.2
+Version: 1.24.0
 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
@@ -308,7 +308,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.23.2
+  ghcr.io/pinto0309/onnx2tf:1.24.0
 
   or
 
@@ -316,7 +316,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.23.2
+  docker.io/pinto0309/onnx2tf:1.24.0
 
   or
 

{onnx2tf-1.23.2 → onnx2tf-1.24.0}/README.md

@@ -293,7 +293,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.23.2
+  ghcr.io/pinto0309/onnx2tf:1.24.0
 
   or
 
@@ -301,7 +301,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.23.2
+  docker.io/pinto0309/onnx2tf:1.24.0
 
   or
 

{onnx2tf-1.23.2 → onnx2tf-1.24.0}/onnx2tf/__init__.py

@@ -1,3 +1,3 @@
 from onnx2tf.onnx2tf import convert, main
 
-__version__ = '1.23.2'
+__version__ = '1.24.0'

{onnx2tf-1.23.2 → onnx2tf-1.24.0}/onnx2tf/onnx2tf.py

@@ -1220,6 +1220,8 @@ def convert(
             # concrete_func
             info(Color.REVERSE(f'saved_model output started'), '=' * 58)
             if not output_signaturedefs and not output_integer_quantized_tflite:
+                tf.saved_model.save(model, output_folder_path)
+            else:
                 export_archive = tf_keras.export.ExportArchive()
                 export_archive.add_endpoint(
                     name=SIGNATURE_KEY,
@@ -1227,8 +1229,6 @@ def convert(
                     input_signature=[tf.TensorSpec(tensor.shape, tensor.dtype, tensor.name) for tensor in model.inputs],
                 )
                 export_archive.write_out(output_folder_path)
-            else:
-                tf.saved_model.save(model, output_folder_path)
             info(Color.GREEN(f'saved_model output complete!'))
         except TypeError as e:
             # Switch to .pb
@@ -1239,11 +1239,13 @@ def convert(
                 for s in msg_list:
                     if 'Failed to add concrete function' in s \
                         or "Tried to export a function which references an 'untracked' resource" in s:
-                        warn(
-                            f'This model contains GroupConvolution and is automatically optimized for TFLite, ' +
-                            f'but is not output because saved_model does not support GroupConvolution. ' +
-                            f'If saved_model is needed, specify --disable_group_convolution to retransform the model.'
+                        export_archive = tf_keras.export.ExportArchive()
+                        export_archive.add_endpoint(
+                            name=SIGNATURE_KEY,
+                            fn=lambda *inputs : model(inputs),
+                            input_signature=[tf.TensorSpec(tensor.shape, tensor.dtype, tensor.name) for tensor in model.inputs],
                         )
+                        export_archive.write_out(output_folder_path)
                         break
             else:
                 error(e)

{onnx2tf-1.23.2 → onnx2tf-1.24.0}/onnx2tf/utils/common_functions.py

@@ -4584,7 +4584,7 @@ def rewrite_tflite_inout_opname(
             result = subprocess.check_output(
                 [
                     'curl',
-                    'https://raw.githubusercontent.com/tensorflow/tensorflow/v2.11.0/tensorflow/lite/schema/schema.fbs',
+                    'https://raw.githubusercontent.com/tensorflow/tensorflow/v2.17.0-rc1/tensorflow/compiler/mlir/lite/schema/schema.fbs',
                     '-o',
                     f'{output_folder_path}/schema.fbs'
                 ],

{onnx2tf-1.23.2 → onnx2tf-1.24.0/onnx2tf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx2tf
-Version: 1.23.2
+Version: 1.24.0
 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
@@ -308,7 +308,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.23.2
+  ghcr.io/pinto0309/onnx2tf:1.24.0
 
   or
 
@@ -316,7 +316,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.23.2
+  docker.io/pinto0309/onnx2tf:1.24.0
 
   or