Further cleanup backend tests

ci/docker/runtime_functions.sh

@@ -939,10 +939,9 @@ unittest_centos7_gpu() {
 integrationtest_ubuntu_cpu_onnx() {
 	set -ex
 	export PYTHONPATH=./python/
-	pytest tests/python-pytest/onnx/import/mxnet_backend_test.py
-	pytest tests/python-pytest/onnx/import/gluon_backend_test.py
-	pytest tests/python-pytest/onnx/export/onnx_backend_test.py
-	pytest tests/python-pytest/onnx/export/mxnet_export_test.py
+	pytest tests/python-pytest/onnx/gluon_backend_test.py
+	pytest tests/python-pytest/onnx/mxnet_backend_test.py
+	pytest tests/python-pytest/onnx/mxnet_export_test.py
 	pytest tests/python-pytest/onnx/test_models.py
 	pytest tests/python-pytest/onnx/test_node.py
 }

tests/python-pytest/onnx/import/mxnet_backend_test.py → tests/python-pytest/onnx/gluon_backend_test.py

@@ -21,29 +21,25 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import os
-import sys
-CURR_PATH = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-sys.path.insert(0, os.path.join(CURR_PATH, '../'))
-
 import unittest
 import backend as mxnet_backend
 import backend_test
 
 try:
     import onnx.backend.test
 except ImportError:
-    raise ImportError("Onnx and protobuf need to be installed. Instructions to"
-                      + " install - https://github.com/onnx/onnx#installation")
-
+    raise ImportError("Onnx and protobuf need to be installed")
 
+operations = ['import']  # Gluon->ONNX exprot is not supported yet
 # This is a pytest magic variable to load extra plugins
 pytest_plugins = "onnx.backend.test.report",
 
-BACKEND_TESTS = backend_test.prepare_tests(mxnet_backend, 'import')
 
-# import all test cases at global scope to make them visible to python.unittest
-globals().update(BACKEND_TESTS.enable_report().test_cases)
+for operation in operations:
+    mxnet_backend.MXNetBackend.set_params('gluon', operation)
+    BACKEND_TESTS = backend_test.prepare_tests(mxnet_backend, operation)
+    # import all test cases at global scope to make them visible to python.unittest
+    globals().update(BACKEND_TESTS.enable_report().test_cases)
 
 if __name__ == '__main__':
     unittest.main()

tests/python-pytest/onnx/export/onnx_backend_test.py → tests/python-pytest/onnx/mxnet_backend_test.py

@@ -22,12 +22,6 @@
 from __future__ import unicode_literals
 
 
-import os
-import sys
-
-CURR_PATH = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-sys.path.insert(0, os.path.join(CURR_PATH, '../'))
-
 import unittest
 import backend as mxnet_backend
 import backend_test
@@ -37,15 +31,16 @@
 except ImportError:
     raise ImportError("Onnx and protobuf need to be installed")
 
-
-mxnet_backend.MXNetBackend.set_params('mxnet', 'export')
+operations = ['import', 'export']
 # This is a pytest magic variable to load extra plugins
 pytest_plugins = "onnx.backend.test.report",
 
-BACKEND_TESTS = backend_test.prepare_tests(mxnet_backend, 'export')
 
-# import all test cases at global scope to make them visible to python.unittest
-globals().update(BACKEND_TESTS.enable_report().test_cases)
+for operation in operations:
+    mxnet_backend.MXNetBackend.set_params('mxnet', operation)
+    BACKEND_TESTS = backend_test.prepare_tests(mxnet_backend, operation)
+    # import all test cases at global scope to make them visible to python.unittest
+    globals().update(BACKEND_TESTS.enable_report().test_cases)
 
 if __name__ == '__main__':
     unittest.main()

tests/python-pytest/onnx/export/mxnet_export_test.py → tests/python-pytest/onnx/mxnet_export_test.py

@@ -23,7 +23,6 @@
 """
 # pylint: disable=too-many-locals,wrong-import-position,import-error
 from __future__ import absolute_import
-import sys
 import os
 import unittest
 import logging
@@ -33,10 +32,6 @@
 from mxnet.contrib import onnx as onnx_mxnet
 import mxnet as mx
 
-CURR_PATH = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-sys.path.insert(0, os.path.join(CURR_PATH, '../../../python/unittest'))
-from common import with_seed
-
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)