fix import error with python3

fix alexnet and googlenet pooling pad error remove first pool pad. remove pad
apache · Jan 16, 2017 · 0eb840a · 0eb840a
1 parent a0ec859
commit 0eb840a
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 7 deletions.
diff --git a/example/image-classification/benchmark.py b/example/image-classification/benchmark.py
@@ -86,7 +86,7 @@ def validate(self, attrs):
                 sys.exit(1)
             try:
                 #check if the network exists
-                importlib.import_module('symbol.'+ args[0])
+                importlib.import_module('symbols.'+ args[0])
                 batch_size = int(args[1])
                 img_size = int(args[2])
                 return Network(name=args[0], batch_size=batch_size, img_size=img_size)

diff --git a/example/image-classification/benchmark_score.py b/example/image-classification/benchmark_score.py
@@ -16,7 +16,7 @@ def get_symbol(network, batch_size):
     if 'resnet' in network:
         num_layers = int(network.split('-')[1])
         network = 'resnet'
-    net = import_module('symbol.'+network)
+    net = import_module('symbols.'+network)
     sym = net.get_symbol(num_classes = 1000,
                          image_shape = ','.join([str(i) for i in image_shape]),
                          num_layers  = num_layers)

diff --git a/...ple/image-classification/symbol/README.md → ...le/image-classification/symbols/README.md b/...ple/image-classification/symbol/README.md → ...le/image-classification/symbols/README.md
diff --git a/...e/image-classification/symbol/__init__.py → .../image-classification/symbols/__init__.py b/...e/image-classification/symbol/__init__.py → .../image-classification/symbols/__init__.py
diff --git a/.../image-classification/symbol/googlenet.py → ...e/image-classification/symbols/alexnet.py b/.../image-classification/symbol/googlenet.py → ...e/image-classification/symbols/alexnet.py
@@ -5,8 +5,6 @@
 with convolutions." arXiv preprint arXiv:1409.4842 (2014).
 
 """
-
-import find_mxnet
 import mxnet as mx
 
 def ConvFactory(data, num_filter, kernel, stride=(1,1), pad=(0, 0), name=None, suffix=''):

diff --git a/...le/image-classification/symbol/alexnet.py → ...image-classification/symbols/googlenet.py b/...le/image-classification/symbol/alexnet.py → ...image-classification/symbols/googlenet.py
diff --git a/...age-classification/symbol/inception-bn.py → ...ge-classification/symbols/inception-bn.py b/...age-classification/symbol/inception-bn.py → ...ge-classification/symbols/inception-bn.py
diff --git a/...ssification/symbol/inception-resnet-v2.py → ...sification/symbols/inception-resnet-v2.py b/...ssification/symbol/inception-resnet-v2.py → ...sification/symbols/inception-resnet-v2.py
diff --git a/...age-classification/symbol/inception-v3.py → ...ge-classification/symbols/inception-v3.py b/...age-classification/symbol/inception-v3.py → ...ge-classification/symbols/inception-v3.py
diff --git a/example/image-classification/symbol/lenet.py → ...ple/image-classification/symbols/lenet.py b/example/image-classification/symbol/lenet.py → ...ple/image-classification/symbols/lenet.py
diff --git a/example/image-classification/symbol/mlp.py → example/image-classification/symbols/mlp.py b/example/image-classification/symbol/mlp.py → example/image-classification/symbols/mlp.py
diff --git a/...ple/image-classification/symbol/resnet.py → ...le/image-classification/symbols/resnet.py b/...ple/image-classification/symbol/resnet.py → ...le/image-classification/symbols/resnet.py
diff --git a/...le/image-classification/symbol/resnext.py → ...e/image-classification/symbols/resnext.py b/...le/image-classification/symbol/resnext.py → ...e/image-classification/symbols/resnext.py
diff --git a/example/image-classification/symbol/vgg.py → example/image-classification/symbols/vgg.py b/example/image-classification/symbol/vgg.py → example/image-classification/symbols/vgg.py
diff --git a/example/image-classification/train_cifar10.py b/example/image-classification/train_cifar10.py
@@ -46,7 +46,7 @@ def download_cifar10():
 
     # load network
     from importlib import import_module
-    net = import_module('symbol.'+args.network)
+    net = import_module('symbols.'+args.network)
     sym = net.get_symbol(**vars(args))
 
     # train

diff --git a/example/image-classification/train_imagenet.py b/example/image-classification/train_imagenet.py
@@ -33,7 +33,7 @@
 
     # load network
     from importlib import import_module
-    net = import_module('symbol.'+args.network)
+    net = import_module('symbols.'+args.network)
     sym = net.get_symbol(**vars(args))
 
     # train

diff --git a/example/image-classification/train_mnist.py b/example/image-classification/train_mnist.py
@@ -69,7 +69,7 @@ def get_mnist_iter(args, kv):
 
     # load network
     from importlib import import_module
-    net = import_module('symbol.'+args.network)
+    net = import_module('symbols.'+args.network)
     sym = net.get_symbol(**vars(args))
 
     # train