add commit value to onnx file, remove expired code and add License in generating version.py

Signed-off-by: Deyu Huang <[email protected]>
Co-authored-by: Guenther Schmuelling <[email protected]>

Author: hwangdeyu

setup.py

@@ -37,8 +37,9 @@ def finalize_options(self):
         pass
 
     def run(self):
+        alv2_license = "# SPDX-License-Identifier: Apache-2.0\n\n"
         with open(os.path.join(SRC_DIR, 'version.py'), 'w') as f:
-            f.write(dedent('''
+            f.write(alv2_license + dedent('''
             version = '{version}'
             git_version = '{git_version}'
             '''.format(**dict(VersionInfo._asdict()))))

tests/keras2onnx_applications/model_source/densenet_1/densenet_1.py

@@ -8,9 +8,6 @@
 - [Densely Connected Convolutional Networks](https://arxiv.org/pdf/1608.06993.pdf)
 - [The One Hundred Layers Tiramisu: Fully Convolutional DenseNets for Semantic Segmentation](https://arxiv.org/pdf/1611.09326.pdf)
 '''
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
 
 import warnings
 

tests/keras2onnx_applications/model_source/densenet_1/subpixel.py

@@ -3,8 +3,6 @@
 # From https://github.com/titu1994/DenseNet/blob/master/subpixel.py
 # Modifications Copyright (c) Microsoft.
 
-from __future__ import absolute_import
-
 from mock_keras2onnx.proto import keras
 from keras import backend as K
 from keras.engine import Layer

tf2onnx/__init__.py

@@ -6,7 +6,6 @@
            "tfonnx", "shape_inference", "schemas", "tf_utils", "tf_loader", "convert"]
 
 import onnx
-from .version import version as __version__
+from .version import git_version, version as __version__
 from . import verbose_logging as logging
 from tf2onnx import tfonnx, utils, graph, graph_builder, graph_matcher, shape_inference, schemas, convert  # pylint: disable=wrong-import-order
-#from tf2onnx import tf_utils, tf_loader

tf2onnx/graph.py

@@ -12,7 +12,7 @@
 import numpy as np
 
 from onnx import helper, numpy_helper, shape_inference, AttributeProto, TensorProto
-from tf2onnx import utils, __version__
+from tf2onnx import utils, __version__, git_version
 from tf2onnx.utils import make_name, port_name, find_opset
 from tf2onnx import optimizer
 from tf2onnx.schemas import get_schema, infer_onnx_shape_dtype
@@ -1189,9 +1189,10 @@ def make_model(self, graph_doc, optimize=False, graph_name="tf2onnx", external_t
         graph = self.make_graph(graph_doc, graph_name, external_tensor_storage)
 
         if "producer_name" not in kwargs:
-            kwargs = {"producer_name": "tf2onnx",
-                      "producer_version": __version__}
-
+            kwargs = {
+                "producer_name": "tf2onnx",
+                "producer_version": __version__ + " " + git_version[:6]
+            }
         if "opset_imports" not in kwargs:
             opsets = [helper.make_opsetid(constants.ONNX_DOMAIN, self._opset)]
             opsets.append(constants.AI_ONNX_ML_OPSET)
@@ -1668,6 +1669,8 @@ def get_onnx_model_properties(onnx_model_proto):
             kwargs["producer_name"] = onnx_model_proto.producer_name
         if onnx_model_proto.HasField('producer_version'):
             kwargs["producer_version"] = onnx_model_proto.producer_version
+        if onnx_model_proto.HasField('producer_git_version'):
+            kwargs["producer_git_version"] = onnx_model_proto.producer_git_version
         if onnx_model_proto.HasField('domain'):
             kwargs["domain"] = onnx_model_proto.domain
         if onnx_model_proto.HasField('model_version'):

tf2onnx/tfonnx.py

@@ -411,7 +411,7 @@ def process_tf_graph(tf_graph, continue_on_error=False, verbose=False, target=No
 
     opset = utils.find_opset(opset)
     logger.info("Using tensorflow=%s, onnx=%s, tf2onnx=%s/%s",
-                get_tf_version(), utils.get_onnx_version(), tf2onnx.__version__, tf2onnx.version.git_version[:6])
+                get_tf_version(), utils.get_onnx_version(), tf2onnx.__version__, tf2onnx.git_version[:6])
     logger.info("Using opset <onnx, %s>", opset)
     if opset > schemas.get_max_supported_opset_version():
         logger.warning("Currently installed onnx package %s is too low to support opset %s, "

tf2onnx/version.py

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
+
 version = '1.10.0'
-git_version = '219e00c073f6e73fba7335630dcf1f96cc82c983'
+git_version = '8e43a1783a1921a4f5f20d51ae9b48926706a939'