Merge pull request #3062 from Hakuyume/fix-resnet-make-npz

Fix _make_npz for ResNetLayers
chainer · Aug 2, 2017 · 8486edf · 8486edf
2 parents 302224c + 4352596
commit 8486edf
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/chainer/links/model/vision/resnet.py b/chainer/links/model/vision/resnet.py
@@ -696,14 +696,7 @@ def _make_npz(path_npz, path_caffemodel, model, n_layers):
             'from \'https://github.com/KaimingHe/deep-residual-networks\', '
             'and place it on {}'.format(path_caffemodel))
 
-    if n_layers == 50:
-        ResNet50Layers.convert_caffemodel_to_npz(path_caffemodel, path_npz, 50)
-    elif n_layers == 101:
-        ResNet101Layers.convert_caffemodel_to_npz(
-            path_caffemodel, path_npz, 101)
-    elif n_layers == 152:
-        ResNet152Layers.convert_caffemodel_to_npz(
-            path_caffemodel, path_npz, 152)
+    ResNetLayers.convert_caffemodel_to_npz(path_caffemodel, path_npz, n_layers)
     npz.load_npz(path_npz, model)
     return model