Skip to content

Commit b55232d

Browse files
zhresholdzhreshold
authored
force mxnet>=1.3.0, replace load_params with load_parameters (#398)
* force mxnet>=1.3.0, replace load_params with load_parameters * fix pylint
1 parent 922d5a5 commit b55232d

23 files changed

+73
-74
lines changed

‎docs/tutorials/classification/dive_deep_cifar10.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def test(ctx, val_data):
317317
################################################################
318318
# Next time if you need to use it, just run
319319

320-
net.load_params('dive_deep_cifar10_resnet20_v2.params', ctx=ctx)
320+
net.load_parameters('dive_deep_cifar10_resnet20_v2.params', ctx=ctx)
321321

322322
################################################################
323323
# Next Step

‎gluoncv/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
mx_version = '1.3.0'
88
try:
99
import mxnet as mx
10-
import warnings
1110
from distutils.version import LooseVersion
1211
if LooseVersion(mx.__version__) < LooseVersion(mx_version):
1312
msg = (
1413
"Legacy mxnet=={} detected, some new modules may not work properly. "
15-
"mxnet>={} is recommended. You can use pip to upgrade mxnet "
16-
"`pip install mxnet --pre --upgrade`").format(mx.__version__, mx_version)
17-
warnings.warn(msg)
14+
"mxnet>={} is required. You can use pip to upgrade mxnet "
15+
"`pip install mxnet/mxnet-cu90 --pre --upgrade`").format(mx.__version__, mx_version)
16+
raise ImportError(msg)
1817
except ImportError:
1918
raise ImportError(
2019
"Unable to import dependency mxnet. "
21-
"A quick tip is to install via `pip install mxnet --pre`. "
20+
"A quick tip is to install via `pip install mxnet/mxnet-cu90 --pre`. "
2221
"please refer to https://gluon-cv.mxnet.io/#installation for details.")
2322

2423
__version__ = '0.3.0'

‎gluoncv/model_zoo/cifarresnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ def get_cifar_resnet(version, num_layers, pretrained=False, ctx=cpu(),
269269
net = resnet_class(block_class, layers, channels, **kwargs)
270270
if pretrained:
271271
from .model_store import get_model_file
272-
net.load_params(get_model_file('cifar_resnet%d_v%d'%(num_layers, version),
273-
tag=pretrained, root=root), ctx=ctx)
272+
net.load_parameters(get_model_file('cifar_resnet%d_v%d'%(num_layers, version),
273+
tag=pretrained, root=root), ctx=ctx)
274274
return net
275275

276276
def cifar_resnet20_v1(**kwargs):

‎gluoncv/model_zoo/cifarresnext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ def get_cifar_resnext(num_layers, cardinality=16, bottleneck_width=64,
163163
net = CIFARResNext(layers, cardinality, bottleneck_width, **kwargs)
164164
if pretrained:
165165
from .model_store import get_model_file
166-
net.load_params(get_model_file('cifar_resnext%d_%dx%dd'%(num_layers, cardinality,
167-
bottleneck_width),
168-
tag=pretrained, root=root), ctx=ctx)
166+
net.load_parameters(get_model_file('cifar_resnext%d_%dx%dd'%(num_layers, cardinality,
167+
bottleneck_width),
168+
tag=pretrained, root=root), ctx=ctx)
169169
return net
170170

171171
def cifar_resnext29_32x4d(**kwargs):

‎gluoncv/model_zoo/cifarwideresnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ def get_cifar_wide_resnet(num_layers, width_factor=1, drop_rate=0.0,
166166
net = CIFARWideResNet(CIFARBasicBlockV2, layers, channels, drop_rate, **kwargs)
167167
if pretrained:
168168
from .model_store import get_model_file
169-
net.load_params(get_model_file('cifar_wideresnet%d_%d'%(num_layers, width_factor),
170-
tag=pretrained, root=root), ctx=ctx)
169+
net.load_parameters(get_model_file('cifar_wideresnet%d_%d'%(num_layers, width_factor),
170+
tag=pretrained, root=root), ctx=ctx)
171171
return net
172172

173173
def cifar_wideresnet16_10(**kwargs):

‎gluoncv/model_zoo/nasnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@ def get_nasnet(repeat=6, penultimate_filters=4032,
620620
net = NASNetALarge(repeat=repeat, penultimate_filters=penultimate_filters, **kwargs)
621621
if pretrained:
622622
from .model_store import get_model_file
623-
net.load_params(get_model_file('nasnet_%d_%d'%(repeat, penultimate_filters),
624-
tag=pretrained, root=root), ctx=ctx)
623+
net.load_parameters(get_model_file('nasnet_%d_%d'%(repeat, penultimate_filters),
624+
tag=pretrained, root=root), ctx=ctx)
625625
from ..data import ImageNet1kAttr
626626
attrib = ImageNet1kAttr()
627627
net.synset = attrib.synset

‎gluoncv/model_zoo/resnetv1b.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ def resnet18_v1b(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
279279
model = ResNetV1b(BasicBlockV1b, [2, 2, 2, 2], **kwargs)
280280
if pretrained:
281281
from .model_store import get_model_file
282-
model.load_params(get_model_file('resnet%d_v%db'%(18, 1),
283-
tag=pretrained, root=root), ctx=ctx)
282+
model.load_parameters(get_model_file('resnet%d_v%db'%(18, 1),
283+
tag=pretrained, root=root), ctx=ctx)
284284
from ..data import ImageNet1kAttr
285285
attrib = ImageNet1kAttr()
286286
model.synset = attrib.synset
@@ -314,8 +314,8 @@ def resnet34_v1b(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
314314
model = ResNetV1b(BasicBlockV1b, [3, 4, 6, 3], **kwargs)
315315
if pretrained:
316316
from .model_store import get_model_file
317-
model.load_params(get_model_file('resnet%d_v%db'%(34, 1),
318-
tag=pretrained, root=root), ctx=ctx)
317+
model.load_parameters(get_model_file('resnet%d_v%db'%(34, 1),
318+
tag=pretrained, root=root), ctx=ctx)
319319
from ..data import ImageNet1kAttr
320320
attrib = ImageNet1kAttr()
321321
model.synset = attrib.synset
@@ -349,8 +349,8 @@ def resnet50_v1b(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
349349
model = ResNetV1b(BottleneckV1b, [3, 4, 6, 3], **kwargs)
350350
if pretrained:
351351
from .model_store import get_model_file
352-
model.load_params(get_model_file('resnet%d_v%db'%(50, 1),
353-
tag=pretrained, root=root), ctx=ctx)
352+
model.load_parameters(get_model_file('resnet%d_v%db'%(50, 1),
353+
tag=pretrained, root=root), ctx=ctx)
354354
from ..data import ImageNet1kAttr
355355
attrib = ImageNet1kAttr()
356356
model.synset = attrib.synset
@@ -384,8 +384,8 @@ def resnet101_v1b(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
384384
model = ResNetV1b(BottleneckV1b, [3, 4, 23, 3], **kwargs)
385385
if pretrained:
386386
from .model_store import get_model_file
387-
model.load_params(get_model_file('resnet%d_v%db'%(101, 1),
388-
tag=pretrained, root=root), ctx=ctx)
387+
model.load_parameters(get_model_file('resnet%d_v%db'%(101, 1),
388+
tag=pretrained, root=root), ctx=ctx)
389389
from ..data import ImageNet1kAttr
390390
attrib = ImageNet1kAttr()
391391
model.synset = attrib.synset
@@ -419,8 +419,8 @@ def resnet152_v1b(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
419419
model = ResNetV1b(BottleneckV1b, [3, 8, 36, 3], **kwargs)
420420
if pretrained:
421421
from .model_store import get_model_file
422-
model.load_params(get_model_file('resnet%d_v%db'%(152, 1),
423-
tag=pretrained, root=root), ctx=ctx)
422+
model.load_parameters(get_model_file('resnet%d_v%db'%(152, 1),
423+
tag=pretrained, root=root), ctx=ctx)
424424
from ..data import ImageNet1kAttr
425425
attrib = ImageNet1kAttr()
426426
model.synset = attrib.synset
@@ -448,8 +448,8 @@ def resnet50_v1c(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
448448
model = ResNetV1b(BottleneckV1b, [3, 4, 6, 3], deep_stem=True, **kwargs)
449449
if pretrained:
450450
from .model_store import get_model_file
451-
model.load_params(get_model_file('resnet%d_v%dc'%(50, 1),
452-
tag=pretrained, root=root), ctx=ctx)
451+
model.load_parameters(get_model_file('resnet%d_v%dc'%(50, 1),
452+
tag=pretrained, root=root), ctx=ctx)
453453
from ..data import ImageNet1kAttr
454454
attrib = ImageNet1kAttr()
455455
model.synset = attrib.synset
@@ -478,8 +478,8 @@ def resnet101_v1c(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
478478
model = ResNetV1b(BottleneckV1b, [3, 4, 23, 3], deep_stem=True, **kwargs)
479479
if pretrained:
480480
from .model_store import get_model_file
481-
model.load_params(get_model_file('resnet%d_v%dc'%(101, 1),
482-
tag=pretrained, root=root), ctx=ctx)
481+
model.load_parameters(get_model_file('resnet%d_v%dc'%(101, 1),
482+
tag=pretrained, root=root), ctx=ctx)
483483
from ..data import ImageNet1kAttr
484484
attrib = ImageNet1kAttr()
485485
model.synset = attrib.synset
@@ -507,8 +507,8 @@ def resnet152_v1c(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
507507
model = ResNetV1b(BottleneckV1b, [3, 8, 36, 3], deep_stem=True, **kwargs)
508508
if pretrained:
509509
from .model_store import get_model_file
510-
model.load_params(get_model_file('resnet%d_v%dc'%(152, 1),
511-
tag=pretrained, root=root), ctx=ctx)
510+
model.load_parameters(get_model_file('resnet%d_v%dc'%(152, 1),
511+
tag=pretrained, root=root), ctx=ctx)
512512
from ..data import ImageNet1kAttr
513513
attrib = ImageNet1kAttr()
514514
model.synset = attrib.synset
@@ -536,8 +536,8 @@ def resnet50_v1d(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
536536
model = ResNetV1b(BottleneckV1b, [3, 4, 6, 3], deep_stem=True, avg_down=True, **kwargs)
537537
if pretrained:
538538
from .model_store import get_model_file
539-
model.load_params(get_model_file('resnet%d_v%dd'%(50, 1),
540-
tag=pretrained, root=root), ctx=ctx)
539+
model.load_parameters(get_model_file('resnet%d_v%dd'%(50, 1),
540+
tag=pretrained, root=root), ctx=ctx)
541541
from ..data import ImageNet1kAttr
542542
attrib = ImageNet1kAttr()
543543
model.synset = attrib.synset
@@ -565,8 +565,8 @@ def resnet101_v1d(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
565565
model = ResNetV1b(BottleneckV1b, [3, 4, 23, 3], deep_stem=True, avg_down=True, **kwargs)
566566
if pretrained:
567567
from .model_store import get_model_file
568-
model.load_params(get_model_file('resnet%d_v%dd'%(101, 1),
569-
tag=pretrained, root=root), ctx=ctx)
568+
model.load_parameters(get_model_file('resnet%d_v%dd'%(101, 1),
569+
tag=pretrained, root=root), ctx=ctx)
570570
from ..data import ImageNet1kAttr
571571
attrib = ImageNet1kAttr()
572572
model.synset = attrib.synset
@@ -594,8 +594,8 @@ def resnet152_v1d(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
594594
model = ResNetV1b(BottleneckV1b, [3, 8, 36, 3], deep_stem=True, avg_down=True, **kwargs)
595595
if pretrained:
596596
from .model_store import get_model_file
597-
model.load_params(get_model_file('resnet%d_v%dd'%(152, 1),
598-
tag=pretrained, root=root), ctx=ctx)
597+
model.load_parameters(get_model_file('resnet%d_v%dd'%(152, 1),
598+
tag=pretrained, root=root), ctx=ctx)
599599
from ..data import ImageNet1kAttr
600600
attrib = ImageNet1kAttr()
601601
model.synset = attrib.synset
@@ -624,8 +624,8 @@ def resnet50_v1e(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
624624
deep_stem=True, avg_down=True, stem_width=64, **kwargs)
625625
if pretrained:
626626
from .model_store import get_model_file
627-
model.load_params(get_model_file('resnet%d_v%dd'%(50, 1),
628-
tag=pretrained, root=root), ctx=ctx)
627+
model.load_parameters(get_model_file('resnet%d_v%dd'%(50, 1),
628+
tag=pretrained, root=root), ctx=ctx)
629629
from ..data import ImageNet1kAttr
630630
attrib = ImageNet1kAttr()
631631
model.synset = attrib.synset
@@ -654,8 +654,8 @@ def resnet101_v1e(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
654654
deep_stem=True, avg_down=True, stem_width=64, **kwargs)
655655
if pretrained:
656656
from .model_store import get_model_file
657-
model.load_params(get_model_file('resnet%d_v%dd'%(101, 1),
658-
tag=pretrained, root=root), ctx=ctx)
657+
model.load_parameters(get_model_file('resnet%d_v%dd'%(101, 1),
658+
tag=pretrained, root=root), ctx=ctx)
659659
from ..data import ImageNet1kAttr
660660
attrib = ImageNet1kAttr()
661661
model.synset = attrib.synset
@@ -684,8 +684,8 @@ def resnet152_v1e(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
684684
deep_stem=True, avg_down=True, stem_width=64, **kwargs)
685685
if pretrained:
686686
from .model_store import get_model_file
687-
model.load_params(get_model_file('resnet%d_v%dd'%(152, 1),
688-
tag=pretrained, root=root), ctx=ctx)
687+
model.load_parameters(get_model_file('resnet%d_v%dd'%(152, 1),
688+
tag=pretrained, root=root), ctx=ctx)
689689
from ..data import ImageNet1kAttr
690690
attrib = ImageNet1kAttr()
691691
model.synset = attrib.synset
@@ -714,8 +714,8 @@ def resnet50_v1s(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs)
714714
model = ResNetV1b(BottleneckV1b, [3, 4, 6, 3], deep_stem=True, stem_width=64, **kwargs)
715715
if pretrained:
716716
from .model_store import get_model_file
717-
model.load_params(get_model_file('resnet%d_v%ds'%(50, 1),
718-
tag=pretrained, root=root), ctx=ctx)
717+
model.load_parameters(get_model_file('resnet%d_v%ds'%(50, 1),
718+
tag=pretrained, root=root), ctx=ctx)
719719
from ..data import ImageNet1kAttr
720720
attrib = ImageNet1kAttr()
721721
model.synset = attrib.synset
@@ -744,8 +744,8 @@ def resnet101_v1s(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
744744
model = ResNetV1b(BottleneckV1b, [3, 4, 23, 3], deep_stem=True, stem_width=64, **kwargs)
745745
if pretrained:
746746
from .model_store import get_model_file
747-
model.load_params(get_model_file('resnet%d_v%ds'%(101, 1),
748-
tag=pretrained, root=root), ctx=ctx)
747+
model.load_parameters(get_model_file('resnet%d_v%ds'%(101, 1),
748+
tag=pretrained, root=root), ctx=ctx)
749749
from ..data import ImageNet1kAttr
750750
attrib = ImageNet1kAttr()
751751
model.synset = attrib.synset
@@ -774,8 +774,8 @@ def resnet152_v1s(pretrained=False, root='~/.mxnet/models', ctx=cpu(0), **kwargs
774774
model = ResNetV1b(BottleneckV1b, [3, 8, 36, 3], deep_stem=True, stem_width=64, **kwargs)
775775
if pretrained:
776776
from .model_store import get_model_file
777-
model.load_params(get_model_file('resnet%d_v%ds'%(152, 1),
778-
tag=pretrained, root=root), ctx=ctx)
777+
model.load_parameters(get_model_file('resnet%d_v%ds'%(152, 1),
778+
tag=pretrained, root=root), ctx=ctx)
779779
from ..data import ImageNet1kAttr
780780
attrib = ImageNet1kAttr()
781781
model.synset = attrib.synset

‎gluoncv/model_zoo/resnext.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,13 @@ def get_resnext(num_layers, cardinality=32, bottleneck_width=4, use_se=False,
203203
if pretrained:
204204
from .model_store import get_model_file
205205
if not use_se:
206-
net.load_params(get_model_file('resnext%d_%dx%dd'%(num_layers, cardinality,
207-
bottleneck_width),
208-
tag=pretrained, root=root), ctx=ctx)
206+
net.load_parameters(get_model_file('resnext%d_%dx%dd'%(num_layers, cardinality,
207+
bottleneck_width),
208+
tag=pretrained, root=root), ctx=ctx)
209209
else:
210-
net.load_params(get_model_file('se_resnext%d_%dx%dd'%(num_layers, cardinality,
211-
bottleneck_width),
212-
tag=pretrained, root=root), ctx=ctx)
210+
net.load_parameters(get_model_file('se_resnext%d_%dx%dd'%(num_layers, cardinality,
211+
bottleneck_width),
212+
tag=pretrained, root=root), ctx=ctx)
213213
from ..data import ImageNet1kAttr
214214
attrib = ImageNet1kAttr()
215215
net.synset = attrib.synset

‎gluoncv/model_zoo/se_resnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ def get_se_resnet(version, num_layers, pretrained=False, ctx=cpu(),
432432
net = resnet_class(block_class, layers, channels, **kwargs)
433433
if pretrained:
434434
from .model_store import get_model_file
435-
net.load_params(get_model_file('se_resnet%d_v%d'%(num_layers, version),
436-
tag=pretrained, root=root), ctx=ctx)
435+
net.load_parameters(get_model_file('se_resnet%d_v%d'%(num_layers, version),
436+
tag=pretrained, root=root), ctx=ctx)
437437
from ..data import ImageNet1kAttr
438438
attrib = ImageNet1kAttr()
439439
net.synset = attrib.synset

‎gluoncv/model_zoo/senet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ def get_senet(num_layers, cardinality=64, bottleneck_width=4,
195195
net = SENet(layers, cardinality, bottleneck_width, **kwargs)
196196
if pretrained:
197197
from .model_store import get_model_file
198-
net.load_params(get_model_file('senet_%d'%(num_layers+2),
199-
root=root), ctx=ctx)
198+
net.load_parameters(get_model_file('senet_%d'%(num_layers+2),
199+
root=root), ctx=ctx)
200200
from ..data import ImageNet1kAttr
201201
attrib = ImageNet1kAttr()
202202
net.synset = attrib.synset

0 commit comments

Comments
 (0)