Merge e542884 into 48374f5

chainer/links/model/vision/googlenet.py

@@ -183,7 +183,7 @@ def convert_caffemodel_to_npz(cls, path_caffemodel, path_npz):
         _transfer_googlenet(caffemodel, chainermodel)
         npz.save_npz(path_npz, chainermodel, compression=False)
 
-    def __call__(self, x, layers=['prob'], **kwargs):
+    def __call__(self, x, layers=None, **kwargs):
         """__call__(self, x, layers=['prob'])
 
         Computes all the feature maps specified by ``layers``.
@@ -206,6 +206,9 @@ def __call__(self, x, layers=['prob'], **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['prob']
+
         argument.check_unexpected_kwargs(
             kwargs, train='train argument is not supported anymore. '
             'Use chainer.using_config')
@@ -238,7 +241,7 @@ def __call__(self, x, layers=['prob'], **kwargs):
 
         return activations
 
-    def extract(self, images, layers=['pool5'], size=(224, 224), **kwargs):
+    def extract(self, images, layers=None, size=(224, 224), **kwargs):
         """extract(self, images, layers=['pool5'], size=(224, 224))
 
         Extracts all the feature maps of given images.
@@ -273,6 +276,9 @@ def extract(self, images, layers=['pool5'], size=(224, 224), **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['pool5']
+
         argument.check_unexpected_kwargs(
             kwargs, train='train argument is not supported anymore. '
             'Use chainer.using_config',

chainer/links/model/vision/resnet.py

@@ -157,7 +157,7 @@ def convert_caffemodel_to_npz(cls, path_caffemodel, path_npz, n_layers=50):
                              ' or 152, but {} was given.'.format(n_layers))
         npz.save_npz(path_npz, chainermodel, compression=False)
 
-    def __call__(self, x, layers=['prob'], **kwargs):
+    def __call__(self, x, layers=None, **kwargs):
         """__call__(self, x, layers=['prob'])
 
         Computes all the feature maps specified by ``layers``.
@@ -180,6 +180,9 @@ def __call__(self, x, layers=['prob'], **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['prob']
+
         argument.check_unexpected_kwargs(
             kwargs, test='test argument is not supported anymore. '
             'Use chainer.using_config')
@@ -198,7 +201,7 @@ def __call__(self, x, layers=['prob'], **kwargs):
                 target_layers.remove(key)
         return activations
 
-    def extract(self, images, layers=['pool5'], size=(224, 224), **kwargs):
+    def extract(self, images, layers=None, size=(224, 224), **kwargs):
         """extract(self, images, layers=['pool5'], size=(224, 224))
 
         Extracts all the feature maps of given images.
@@ -233,6 +236,9 @@ def extract(self, images, layers=['pool5'], size=(224, 224), **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['pool5']
+
         argument.check_unexpected_kwargs(
             kwargs, test='test argument is not supported anymore. '
             'Use chainer.using_config',

chainer/links/model/vision/vgg.py

@@ -160,7 +160,7 @@ def convert_caffemodel_to_npz(cls, path_caffemodel, path_npz):
         caffemodel = CaffeFunction(path_caffemodel)
         npz.save_npz(path_npz, caffemodel, compression=False)
 
-    def __call__(self, x, layers=['prob'], **kwargs):
+    def __call__(self, x, layers=None, **kwargs):
         """__call__(self, x, layers=['prob'])
 
         Computes all the feature maps specified by ``layers``.
@@ -183,6 +183,9 @@ def __call__(self, x, layers=['prob'], **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['prob']
+
         argument.check_unexpected_kwargs(
             kwargs, test='test argument is not supported anymore. '
             'Use chainer.using_config')
@@ -201,7 +204,7 @@ def __call__(self, x, layers=['prob'], **kwargs):
                 target_layers.remove(key)
         return activations
 
-    def extract(self, images, layers=['fc7'], size=(224, 224), **kwargs):
+    def extract(self, images, layers=None, size=(224, 224), **kwargs):
         """extract(self, images, layers=['fc7'], size=(224, 224))
 
         Extracts all the feature maps of given images.
@@ -236,6 +239,9 @@ def extract(self, images, layers=['fc7'], size=(224, 224), **kwargs):
 
         """
 
+        if layers is None:
+            layers = ['fc7']
+
         argument.check_unexpected_kwargs(
             kwargs, test='test argument is not supported anymore. '
             'Use chainer.using_config',