Merge pull request #19 from Hiroshiba/follow-chainer2

work correctly on chainer>=2.0.0

Author: rezoo

i2v/chainer_i2v.py

@@ -4,9 +4,10 @@
 import numpy as np
 from scipy.ndimage import zoom
 from skimage.transform import resize
+import chainer
 from chainer import Variable
 from chainer.functions import average_pooling_2d, sigmoid
-from chainer.functions.caffe import CaffeFunction
+from chainer.links.caffe import CaffeFunction
 
 
 class ChainerI2V(Illustration2VecBase):
@@ -47,7 +48,8 @@ def _forward(self, inputs, layername):
         input_ -= self.mean  # subtract mean
         input_ = input_.transpose((0, 3, 1, 2))  # (N, H, W, C) -> (N, C, H, W)
         x = Variable(input_)
-        y, = self.net(inputs={'data': x}, outputs=[layername], train=False)
+        with chainer.using_config('train', False), chainer.using_config('enable_backprop', False):
+            y, = self.net(inputs={'data': x}, outputs=[layername])
         return y
 
     def _extract(self, inputs, layername):