Merge 0a18e21 into f8ae421

chainer · Aug 21, 2017 · a4c28f2 · a4c28f2
2 parents f8ae421 + 0a18e21
commit a4c28f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/chainer/links/model/vision/googlenet.py b/chainer/links/model/vision/googlenet.py
@@ -10,6 +10,7 @@
     available = False
     _import_error = e
 
+import chainer
 from chainer.dataset.convert import concat_examples
 from chainer.dataset import download
 from chainer import function
@@ -301,7 +302,7 @@ def predict(self, images, oversample=True):
         else:
             x = x[:, :, 16:240, 16:240]
         # Use no_backprop_mode to reduce memory consumption
-        with function.no_backprop_mode():
+        with function.no_backprop_mode(), chainer.using_config('train', False):
             x = Variable(self.xp.asarray(x))
             y = self(x, layers=['prob'])['prob']
             if oversample:

diff --git a/chainer/links/model/vision/resnet.py b/chainer/links/model/vision/resnet.py
@@ -10,6 +10,7 @@
     available = False
     _import_error = e
 
+import chainer
 from chainer.dataset.convert import concat_examples
 from chainer.dataset import download
 from chainer import function
@@ -263,7 +264,7 @@ def predict(self, images, oversample=True):
         else:
             x = x[:, :, 16:240, 16:240]
         # Use no_backprop_mode to reduce memory consumption
-        with function.no_backprop_mode():
+        with function.no_backprop_mode(), chainer.using_config('train', False):
             x = Variable(self.xp.asarray(x))
             y = self(x, layers=['prob'])['prob']
             if oversample:

diff --git a/chainer/links/model/vision/vgg.py b/chainer/links/model/vision/vgg.py
@@ -10,6 +10,7 @@
     available = False
     _import_error = e
 
+import chainer
 from chainer.dataset.convert import concat_examples
 from chainer.dataset import download
 from chainer import function
@@ -266,7 +267,7 @@ def predict(self, images, oversample=True):
         else:
             x = x[:, :, 16:240, 16:240]
         # Use no_backprop_mode to reduce memory consumption
-        with function.no_backprop_mode():
+        with function.no_backprop_mode(), chainer.using_config('train', False):
             x = Variable(self.xp.asarray(x))
             y = self(x, layers=['prob'])['prob']
             if oversample: