Handling of model version information (#9)

*  - Moving model version, domain, producer, and producer version into
 functions. This allows for other packages that are using onnmltools to
 override these variables as needed.

*  - Updating based on feedback.

Author: singlis

onnxmltools/__init__.py

@@ -12,11 +12,12 @@
 __producer_version__ = __version__
 __domain__ = "onnxml"
 __model_version__ = 0
-__operator_set_version__ = 0
+
 
 from .convert import convert_coreml
 from .convert import convert_sklearn
 
 from .utils import load_model
 from .utils import save_model
-from .utils import save_text
+from .utils import save_text
+

onnxmltools/convert/common/ModelBuilder.py

@@ -8,11 +8,6 @@
 from uuid import uuid4
 from ..common import model_util
 from ...proto import onnx_proto
-from ... import __domain__
-from ... import __producer__
-from ... import __producer_version__
-from ... import __model_version__
-
 
 class ModelBuilder:
     def __init__(self, name=None, doc_string='', metadata_props=[]):
@@ -47,10 +42,10 @@ def add_domain_version_pair(self, pair):
     def make_model(self):
         return model_util.make_model(self._name,
                                      onnx_proto.IR_VERSION,
-                                     __producer__,
-                                     __producer_version__,
-                                     __domain__,
-                                     __model_version__,
+                                     model_util.get_producer(),
+                                     model_util.get_producer_version(),
+                                     model_util.get_domain(),
+                                     model_util.get_model_version(),
                                      self._doc_string,
                                      self._metadata_props,
                                      self._operator_domain_version_pairs,

onnxmltools/convert/common/model_util.py

@@ -15,6 +15,38 @@
                       onnx_proto.TensorProto.INT16, onnx_proto.TensorProto.INT32, onnx_proto.TensorProto.INT64]
 
 
+def get_producer():
+    """
+    Internal helper function to return the producer
+    """
+    from ... import __producer__
+    return __producer__
+
+
+def get_producer_version():
+    """
+    Internal helper function to return the producer version
+    """
+    from ... import __producer_version__
+    return __producer_version__
+
+
+def get_domain():
+    """
+    Internal helper function to return the model domain
+    """
+    from ... import __domain__
+    return __domain__
+
+
+def get_model_version():
+    """
+    Internal helper function to return the model version
+    """
+    from ... import __model_version__
+    return __model_version__
+
+
 def make_tensor_value_info(name, elem_type=None, shape=None, doc_string=''):
     """
     Makes a TypeProto based on the data type and shape.