Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tools/accnn/rank_selection.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
# under the License.

import numpy as np
import mxnet as mx
import json
import utils
import math
import sys

from mxnet.base import xrange
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? We don't have xrange definition in mxnet.base. My approval doesn't apply to this change.



def calc_complexity(ishape, node):
y, x = map(int, eval(node['param']['kernel']))
N = int(node['param']['num_filter'])
Expand Down
2 changes: 2 additions & 0 deletions tools/accnn/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import json
import ast

from mxnet.base import xrange


def load_model(args):
devs = mx.cpu() if args.gpus == None else [mx.gpu(int(i)) for i in args.gpus.split(',')]
Expand Down
2 changes: 2 additions & 0 deletions tools/caffe_converter/convert_symbol.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down
6 changes: 4 additions & 2 deletions tools/coreml/test/test_mxnet_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
import unittest
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


VAL_DATA = 'data/val-5k-256.rec'
URL = 'http://data.mxnet.io/data/val-5k-256.rec'

Expand Down Expand Up @@ -134,4 +136,4 @@ def test_vgg16(self):

if __name__ == '__main__':
suite = unittest.TestLoader().loadTestsFromTestCase(ImageNetTest)
unittest.TextTestRunner(verbosity=2).run(suite)
unittest.TextTestRunner(verbosity=2).run(suite)
5 changes: 4 additions & 1 deletion tools/coreml/test/test_mxnet_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import numpy as np
import sys
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
from collections import namedtuple


def _mxnet_remove_batch(input_data):
Expand Down