Skip to content
This repository was archived by the owner on Jul 2, 2021. It is now read-only.

Set train=False in predict #407

Merged
merged 5 commits into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion chainercv/links/model/faster_rcnn/faster_rcnn.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ def predict(self, imgs):
labels = list()
scores = list()
for img, scale in zip(prepared_imgs, scales):
with chainer.function.no_backprop_mode():
with chainer.using_config('train', False), \
chainer.function.no_backprop_mode():
img_var = chainer.Variable(self.xp.asarray(img[None]))
H, W = img_var.shape[2:]
roi_cls_locs, roi_scores, rois, _ = self.__call__(
Expand Down
3 changes: 2 additions & 1 deletion chainercv/links/model/feature_predictor.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ def predict(self, imgs):
# (B, N, C, H, W) -> (B * N, C, H, W)
imgs = imgs.reshape(shape)

with chainer.function.no_backprop_mode():
with chainer.using_config('train', False), \
chainer.function.no_backprop_mode():
imgs = chainer.Variable(imgs)
features = self.extractor(imgs)

Expand Down
3 changes: 2 additions & 1 deletion chainercv/links/model/segnet/segnet_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ def predict(self, imgs):
labels = []
for img in imgs:
C, H, W = img.shape
with chainer.function.no_backprop_mode():
with chainer.using_config('train', False), \
chainer.function.no_backprop_mode():
x = chainer.Variable(self.xp.asarray(img[np.newaxis]))
score = self.__call__(x)[0].data
score = chainer.cuda.to_cpu(score)
Expand Down
3 changes: 2 additions & 1 deletion chainercv/links/model/ssd/ssd.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ def predict(self, imgs):
x.append(self.xp.array(img))
sizes.append((H, W))

with chainer.function.no_backprop_mode():
with chainer.using_config('train', False), \
chainer.function.no_backprop_mode():
x = chainer.Variable(self.xp.stack(x))
mb_locs, mb_confs = self(x)
mb_locs, mb_confs = mb_locs.data, mb_confs.data
Expand Down
2 changes: 0 additions & 2 deletions examples/classification/eval_imagenet.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ def __call__(self, imgs, pred_values, gt_values):


def main():
chainer.config.train = False

parser = argparse.ArgumentParser(
description='Learning convnet from ILSVRC2012 dataset')
parser.add_argument('val', help='Path to root of the validation dataset')
Expand Down
2 changes: 0 additions & 2 deletions examples/detection/eval_voc07.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ def __call__(self, imgs, pred_values, gt_values):


def main():
chainer.config.train = False

parser = argparse.ArgumentParser()
parser.add_argument(
'--model', choices=('faster_rcnn', 'ssd300', 'ssd512'),
Expand Down
4 changes: 0 additions & 4 deletions examples/detection/visualize_models.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from matplotlib.font_manager import FontProperties
import matplotlib.pyplot as plot

import chainer

from chainercv.links import FasterRCNNVGG16
from chainercv.links import SSD300
from chainercv.links import SSD512
Expand All @@ -13,8 +11,6 @@


def main():
chainer.config.train = False

dataset = VOCDetectionDataset(year='2007', split='test')
models = [
('Faster R-CNN', FasterRCNNVGG16(pretrained_model='voc07')),
Expand Down
2 changes: 0 additions & 2 deletions examples/faster_rcnn/demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@


def main():
chainer.config.train = False

parser = argparse.ArgumentParser()
parser.add_argument('--gpu', type=int, default=-1)
parser.add_argument('--pretrained_model', default='voc07')
Expand Down
2 changes: 0 additions & 2 deletions examples/segnet/eval_camvid.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ def main():

model = calc_bn_statistics(model, args.batchsize)

chainer.config.train = False

test = CamVidDataset(split='test')
it = chainer.iterators.SerialIterator(test, batch_size=args.batchsize,
repeat=False, shuffle=False)
Expand Down
2 changes: 0 additions & 2 deletions examples/ssd/demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@


def main():
chainer.config.train = False

parser = argparse.ArgumentParser()
parser.add_argument(
'--model', choices=('ssd300', 'ssd512'), default='ssd300')
Expand Down