Avoid importing testing module from the top level module directly

examples/mxnet/export.py

@@ -3,10 +3,10 @@
 
 import collections
 
-import numpy as np
-
 import chainer
 import chainer.functions as F
+import numpy as np
+
 import chainercv.links as C
 import mxnet
 import onnx_chainer

examples/nnvm/export.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import chainer
+import chainer.functions as F
 import numpy as np
 import onnx
 
-import chainer
-import chainer.functions as F
 import chainercv.links as C
 import nnvm
 import onnx_chainer

examples/sample_rt.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import numpy as np
-import onnxruntime as rt
-
 import chainer
 import chainer.links as L
+import numpy as np
+
 import onnx_chainer
+import onnxruntime as rt
 from chainercv import transforms
 from PIL import Image
 

onnx_chainer/__init__.py

@@ -1,4 +1,4 @@
 from onnx_chainer.export import convert_parameter  # NOQA
 from onnx_chainer.export import export  # NOQA
 
-from onnx_chainer import testing  # NOQA
+from onnx_chainer.export import MINIMUM_OPSET_VERSION  # NOQA

onnx_chainer/export.py

@@ -3,13 +3,12 @@
 import collections
 import warnings
 
+import chainer
 import numpy
 import onnx
 from onnx.mapping import NP_TYPE_TO_TENSOR_TYPE
 
-import chainer
 from onnx_chainer import functions, mapping
-from onnx_chainer.testing import test_onnxruntime
 
 try:
     from onnx import checker
@@ -20,6 +19,8 @@
 except ImportError:
     _available = False
 
+MINIMUM_OPSET_VERSION = 7
+
 
 def _check_available():
     if not _available:
@@ -197,14 +198,14 @@ def export(model, args, filename=None, export_params=True,
 
     if opset_version is None:
         opset_version = int(onnx.defs.onnx_opset_version())
-    elif opset_version < test_onnxruntime.MINIMUM_OPSET_VERSION:
+    elif opset_version < MINIMUM_OPSET_VERSION:
         warnings.warn(
             'ONNX-Chainer has been tested only with opset_version >= {m}. '
             'This is because ONNXRuntime supports only opset_version >= {m}. '
             'The ONNX file exported with your requested opset_version ({o}) '
             'may cause some problems because the converters used for the '
             'opset_version have not been tested.'.format(
-                m=test_onnxruntime.MINIMUM_OPSET_VERSION,
+                m=MINIMUM_OPSET_VERSION,
                 o=opset_version)
         )
 

onnx_chainer/functions/array.py

@@ -1,8 +1,8 @@
+import chainer
 import numpy as np
 from onnx import helper
 from onnx.mapping import NP_TYPE_TO_TENSOR_TYPE
 
-import chainer
 from onnx_chainer import mapping
 
 

onnx_chainer/functions/connection.py

@@ -1,8 +1,7 @@
+import chainer
 import numpy as np
 from onnx import helper
 
-import chainer
-
 
 def convert_Convolution2DFunction(func, onnx_op_name, opset_version,
                                   input_names, output_names, parameters):

onnx_chainer/functions/math.py

@@ -1,8 +1,7 @@
+import chainer
 import numpy as np
 from onnx import helper
 
-import chainer
-
 
 def convert_Add(func, onnx_op_name, opset_version, input_names, output_names,
                 parameters):

onnx_chainer/functions/noise.py

@@ -1,6 +1,5 @@
-from onnx import helper
-
 import chainer
+from onnx import helper
 
 
 def convert_Dropout(

onnx_chainer/functions/normalization.py

@@ -1,8 +1,7 @@
 import sys
 
-from onnx import helper
-
 import chainer
+from onnx import helper
 
 
 def convert_BatchNormalization(func, onnx_op_name, opset_version, input_names,

onnx_chainer/testing/test_mxnet.py

@@ -2,10 +2,10 @@
 import os
 import warnings
 
+import chainer
 import numpy as np
 import onnx
 
-import chainer
 import onnx_chainer
 
 try:

onnx_chainer/testing/test_onnxruntime.py

@@ -1,9 +1,9 @@
 import warnings
 
+import chainer
 import numpy as np
 import onnx
 
-import chainer
 import onnx_chainer
 
 try:

tests/functions_tests/test_activations.py

@@ -1,12 +1,13 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.functions as F
 import chainer.links as L
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -42,7 +43,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)
@@ -68,7 +69,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)

tests/functions_tests/test_arrays.py

@@ -1,11 +1,12 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.functions as F
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -105,7 +106,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)
@@ -133,7 +134,7 @@ def __call__(self, x1, x2):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, (self.x1, self.x2), self.fn,

tests/functions_tests/test_connections.py

@@ -1,11 +1,12 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.links as L
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -86,7 +87,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)

tests/functions_tests/test_maths.py

@@ -1,10 +1,11 @@
 import unittest
 
+import chainer
 import numpy as np
 import onnx
-
-import chainer
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -47,7 +48,7 @@ def __call__(self, a):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.a, self.fn, opset_version=opset_version)
@@ -86,7 +87,7 @@ def __call__(self, a, b):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)
@@ -123,7 +124,7 @@ def __call__(self, a, b, c):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)

tests/functions_tests/test_noises.py

@@ -1,11 +1,12 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.functions as F
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -33,7 +34,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)

tests/functions_tests/test_normalizations.py

@@ -1,12 +1,13 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.functions as F
 import chainer.links as L
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -52,7 +53,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)
@@ -83,7 +84,7 @@ def __call__(self, x):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)

tests/functions_tests/test_poolings.py

@@ -1,11 +1,12 @@
 import unittest
 
-import numpy as np
-import onnx
-
 import chainer
 import chainer.functions as F
+import numpy as np
+import onnx
 from chainer import testing
+
+import onnx_chainer
 from onnx_chainer.testing import test_onnxruntime
 
 
@@ -35,7 +36,7 @@ def setUp(self):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             test_onnxruntime.check_output(
                 self.model, self.x, self.fn, opset_version=opset_version)
@@ -57,7 +58,7 @@ def setUp(self):
 
     def test_output(self):
         for opset_version in range(
-                test_onnxruntime.MINIMUM_OPSET_VERSION,
+                onnx_chainer.MINIMUM_OPSET_VERSION,
                 onnx.defs.onnx_opset_version() + 1):
             with self.assertRaises(RuntimeError):
                 test_onnxruntime.check_output(