From 271a943215b9f62193a87001665449ef7c1315a7 Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 12 Jul 2018 20:26:55 +0200 Subject: [PATCH 1/3] Some Python 3 fixes in ./tools --- tools/accnn/rank_selection.py | 3 ++- tools/accnn/utils.py | 1 + tools/caffe_converter/convert_symbol.py | 2 ++ tools/coreml/test/test_mxnet_image.py | 4 +++- tools/coreml/test/test_mxnet_models.py | 4 +++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/accnn/rank_selection.py b/tools/accnn/rank_selection.py index c5c026114aeb..61cc710b47a8 100644 --- a/tools/accnn/rank_selection.py +++ b/tools/accnn/rank_selection.py @@ -16,11 +16,12 @@ # under the License. import numpy as np -import mxnet as mx import json import utils import math import sys +from six.moves import xrange + def calc_complexity(ishape, node): y, x = map(int, eval(node['param']['kernel'])) diff --git a/tools/accnn/utils.py b/tools/accnn/utils.py index b19521f9e860..88fac3afd915 100644 --- a/tools/accnn/utils.py +++ b/tools/accnn/utils.py @@ -20,6 +20,7 @@ import copy import json import ast +from six.moves import xrange def load_model(args): diff --git a/tools/caffe_converter/convert_symbol.py b/tools/caffe_converter/convert_symbol.py index bbbdaa44e314..8faef04fe215 100644 --- a/tools/caffe_converter/convert_symbol.py +++ b/tools/caffe_converter/convert_symbol.py @@ -20,8 +20,10 @@ from __future__ import print_function import argparse import re +import mxnet as mx import caffe_parser + def _get_input(proto): """Get input size """ diff --git a/tools/coreml/test/test_mxnet_image.py b/tools/coreml/test/test_mxnet_image.py index e373caeba932..6e3befa881b1 100644 --- a/tools/coreml/test/test_mxnet_image.py +++ b/tools/coreml/test/test_mxnet_image.py @@ -21,6 +21,8 @@ import unittest import sys import os +from six.moves import xrange + current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") sys.path.append(current_working_directory + "/../converter/") @@ -134,4 +136,4 @@ def test_vgg16(self): if __name__ == '__main__': suite = unittest.TestLoader().loadTestsFromTestCase(ImageNetTest) - unittest.TextTestRunner(verbosity=2).run(suite) \ No newline at end of file + unittest.TextTestRunner(verbosity=2).run(suite) diff --git a/tools/coreml/test/test_mxnet_models.py b/tools/coreml/test/test_mxnet_models.py index 36ac0ece3641..61ae6b8d525b 100644 --- a/tools/coreml/test/test_mxnet_models.py +++ b/tools/coreml/test/test_mxnet_models.py @@ -21,11 +21,13 @@ import numpy as np import sys import os +from collections import namedtuple +from six.moves import xrange + current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") sys.path.append(current_working_directory + "/../converter/") import _mxnet_converter as mxnet_converter -from collections import namedtuple def _mxnet_remove_batch(input_data): From a7da56d8448037339eaa83b654256fd9c79c7921 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 13 Jul 2018 00:19:38 +0200 Subject: [PATCH 2/3] Do not use six --- tools/accnn/rank_selection.py | 6 +++++- tools/accnn/utils.py | 6 +++++- tools/coreml/test/test_mxnet_image.py | 5 ++++- tools/coreml/test/test_mxnet_models.py | 6 +++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tools/accnn/rank_selection.py b/tools/accnn/rank_selection.py index 61cc710b47a8..e64e41b21930 100644 --- a/tools/accnn/rank_selection.py +++ b/tools/accnn/rank_selection.py @@ -20,7 +20,11 @@ import utils import math import sys -from six.moves import xrange + +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 def calc_complexity(ishape, node): diff --git a/tools/accnn/utils.py b/tools/accnn/utils.py index 88fac3afd915..aa02d1010470 100644 --- a/tools/accnn/utils.py +++ b/tools/accnn/utils.py @@ -20,7 +20,11 @@ import copy import json import ast -from six.moves import xrange + +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 def load_model(args): diff --git a/tools/coreml/test/test_mxnet_image.py b/tools/coreml/test/test_mxnet_image.py index 6e3befa881b1..19cdec9d9a2e 100644 --- a/tools/coreml/test/test_mxnet_image.py +++ b/tools/coreml/test/test_mxnet_image.py @@ -21,7 +21,6 @@ import unittest import sys import os -from six.moves import xrange current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") @@ -29,6 +28,10 @@ import _mxnet_converter as mxnet_converter from converter.utils import load_model +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 VAL_DATA = 'data/val-5k-256.rec' URL = 'http://data.mxnet.io/data/val-5k-256.rec' diff --git a/tools/coreml/test/test_mxnet_models.py b/tools/coreml/test/test_mxnet_models.py index 61ae6b8d525b..3b343482d0d6 100644 --- a/tools/coreml/test/test_mxnet_models.py +++ b/tools/coreml/test/test_mxnet_models.py @@ -22,13 +22,17 @@ import sys import os from collections import namedtuple -from six.moves import xrange current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") sys.path.append(current_working_directory + "/../converter/") import _mxnet_converter as mxnet_converter +try: + xrange # Python 2 +except NameError: + xrange = range # Python 3 + def _mxnet_remove_batch(input_data): for blob in input_data: From d058c658dd080000313d670e52cfec1007e1457f Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 13 Jul 2018 06:40:51 +0200 Subject: [PATCH 3/3] from mxnet.base import xrange --- tools/accnn/rank_selection.py | 5 +---- tools/accnn/utils.py | 5 +---- tools/coreml/test/test_mxnet_image.py | 7 ++----- tools/coreml/test/test_mxnet_models.py | 7 ++----- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/accnn/rank_selection.py b/tools/accnn/rank_selection.py index e64e41b21930..3011c80e624d 100644 --- a/tools/accnn/rank_selection.py +++ b/tools/accnn/rank_selection.py @@ -21,10 +21,7 @@ import math import sys -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 +from mxnet.base import xrange def calc_complexity(ishape, node): diff --git a/tools/accnn/utils.py b/tools/accnn/utils.py index aa02d1010470..56da766d020d 100644 --- a/tools/accnn/utils.py +++ b/tools/accnn/utils.py @@ -21,10 +21,7 @@ import json import ast -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 +from mxnet.base import xrange def load_model(args): diff --git a/tools/coreml/test/test_mxnet_image.py b/tools/coreml/test/test_mxnet_image.py index 19cdec9d9a2e..18d1fc47c842 100644 --- a/tools/coreml/test/test_mxnet_image.py +++ b/tools/coreml/test/test_mxnet_image.py @@ -22,17 +22,14 @@ import sys import os +from mxnet.base import xrange + current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") sys.path.append(current_working_directory + "/../converter/") import _mxnet_converter as mxnet_converter from converter.utils import load_model -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 - VAL_DATA = 'data/val-5k-256.rec' URL = 'http://data.mxnet.io/data/val-5k-256.rec' diff --git a/tools/coreml/test/test_mxnet_models.py b/tools/coreml/test/test_mxnet_models.py index 3b343482d0d6..e8f9b24b37c8 100644 --- a/tools/coreml/test/test_mxnet_models.py +++ b/tools/coreml/test/test_mxnet_models.py @@ -23,16 +23,13 @@ import os from collections import namedtuple +from mxnet.base import xrange + current_working_directory = os.getcwd() sys.path.append(current_working_directory + "/..") sys.path.append(current_working_directory + "/../converter/") import _mxnet_converter as mxnet_converter -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 - def _mxnet_remove_batch(input_data): for blob in input_data: