Merge pull request #40 from onnx/gs/onnx-1.2

add onnx-1.2 dependency

Author: guschmue

setup.py

@@ -74,11 +74,11 @@ def run(self):
     version=VersionInfo.version,
     description='Tensorflow to ONNX converter',
     setup_requires=['pytest-runner'],
-    tests_require=['numpy', 'pytest', 'pytest-cov', 'psutil'],
+    tests_require=['numpy', 'pytest', 'pytest-cov', 'psutil', 'graphviz'],
     cmdclass=cmdclass,
     packages=find_packages(),
     author='[email protected]',
     author_email='[email protected]',
     url='https://github.com/onnx/tensorflow-onnx',
-    install_requires=['graphviz', 'pyyaml']
+    install_requires=['pyyaml', 'onnx>=1.2']
 )

tf2onnx/convert.py

@@ -63,7 +63,7 @@ def main():
         custom_ops = {op: default_custom_op_handler for op in args.custom_ops.split(",")}
         extra_opset = [helper.make_opsetid("tf", 1)]
     else:
-        args.custom_ops = {}
+        custom_ops = {}
         extra_opset = None
 
     graph_def = tf.GraphDef()