Skip to content

Fix import error when using chainer #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Katsuya-Ishiyama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix import error when using chainer #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions i2v/chainer_i2v.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
import json
import warnings
import numpy as np
from distutils.version import StrictVersion
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
try:
from chainer.functions.caffe import CaffeFunction
except:
from chainer.links.caffe import CaffeFunction


class ChainerI2V(Illustration2VecBase):
Expand Down Expand Up @@ -47,7 +52,14 @@ 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)

# train argument is not supported from Ver2.
if StrictVersion(chainer.__version__) < StrictVersion('2.0.0'):
y, = self.net(inputs={'data': x}, outputs=[layername], train=False)
else:
chainer.using_config('train', False)
y, = self.net(inputs={'data': x}, outputs=[layername])

return y

def _extract(self, inputs, layername):
Expand Down