提交 f9653a6a 编写于 作者: W wanghaoshuang

1. Add model average option

2. Add ceil mode for pooling
上级 c9ce72a7
...@@ -26,7 +26,12 @@ def conv_bn_pool(input, ...@@ -26,7 +26,12 @@ def conv_bn_pool(input,
bias_attr=bias, bias_attr=bias,
is_test=is_test) is_test=is_test)
tmp = fluid.layers.pool2d( tmp = fluid.layers.pool2d(
input=tmp, pool_size=2, pool_type='max', pool_stride=2, use_cudnn=True) input=tmp,
pool_size=2,
pool_type='max',
pool_stride=2,
use_cudnn=True,
ceil_mode=True)
return tmp return tmp
...@@ -148,14 +153,20 @@ def ctc_train_net(images, label, args, num_classes): ...@@ -148,14 +153,20 @@ def ctc_train_net(images, label, args, num_classes):
optimizer = fluid.optimizer.Momentum( optimizer = fluid.optimizer.Momentum(
learning_rate=args.learning_rate, momentum=args.momentum) learning_rate=args.learning_rate, momentum=args.momentum)
optimizer.minimize(sum_cost) _, params_grads = optimizer.minimize(sum_cost)
model_average = None
if args.model_average:
model_average = fluid.optimizer.ModelAverage(
params_grads,
args.average_window,
min_average_window=args.min_average_window,
max_average_window=args.max_average_window)
decoded_out = fluid.layers.ctc_greedy_decoder( decoded_out = fluid.layers.ctc_greedy_decoder(
input=fc_out, blank=num_classes) input=fc_out, blank=num_classes)
casted_label = fluid.layers.cast(x=label, dtype='int64') casted_label = fluid.layers.cast(x=label, dtype='int64')
error_evaluator = fluid.evaluator.EditDistance( error_evaluator = fluid.evaluator.EditDistance(
input=decoded_out, label=casted_label) input=decoded_out, label=casted_label)
return sum_cost, error_evaluator return sum_cost, error_evaluator, model_average
def ctc_infer(images, num_classes): def ctc_infer(images, num_classes):
......
"""Trainer for OCR CTC model.""" """Trainer for OCR CTC model."""
import paddle.v2 as paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import dummy_reader import dummy_reader
import ctc_reader import ctc_reader
...@@ -24,12 +23,16 @@ add_arg('momentum', float, 0.9, "Momentum.") ...@@ -24,12 +23,16 @@ add_arg('momentum', float, 0.9, "Momentum.")
add_arg('rnn_hidden_size',int, 200, "Hidden size of rnn layers.") add_arg('rnn_hidden_size',int, 200, "Hidden size of rnn layers.")
add_arg('device', int, 0, "Device id.'-1' means running on CPU" add_arg('device', int, 0, "Device id.'-1' means running on CPU"
"while '0' means GPU-0.") "while '0' means GPU-0.")
add_arg('model_average', bool, True, "Whether to aevrage model for evaluation.")
add_arg('min_average_window', int, 10000, "Min average window.")
add_arg('max_average_window', int, 15625, "Max average window.")
add_arg('average_window', float, 0.15, "Average window.")
# yapf: disable # yapf: disable
def load_parameter(place): def load_parameter(place):
params = load_param('./name.map', './data/model/results_without_avg_window/pass-00000/') params = load_param('./name.map', './data/model/results_without_avg_window/pass-00000/')
for name in params: for name in params:
# print "param: %s" % name
t = fluid.global_scope().find_var(name).get_tensor() t = fluid.global_scope().find_var(name).get_tensor()
t.set(params[name], place) t.set(params[name], place)
...@@ -41,7 +44,8 @@ def train(args, data_reader=dummy_reader): ...@@ -41,7 +44,8 @@ def train(args, data_reader=dummy_reader):
# define network # define network
images = fluid.layers.data(name='pixel', shape=data_shape, dtype='float32') images = fluid.layers.data(name='pixel', shape=data_shape, dtype='float32')
label = fluid.layers.data(name='label', shape=[1], dtype='int32', lod_level=1) label = fluid.layers.data(name='label', shape=[1], dtype='int32', lod_level=1)
sum_cost, error_evaluator = ctc_train_net(images, label, args, num_classes) sum_cost, error_evaluator, model_average = ctc_train_net(images, label, args, num_classes)
# data reader # data reader
train_reader = data_reader.train(args.batch_size) train_reader = data_reader.train(args.batch_size)
test_reader = data_reader.test() test_reader = data_reader.test()
...@@ -51,7 +55,6 @@ def train(args, data_reader=dummy_reader): ...@@ -51,7 +55,6 @@ def train(args, data_reader=dummy_reader):
place = fluid.CUDAPlace(args.device) place = fluid.CUDAPlace(args.device)
exe = fluid.Executor(place) exe = fluid.Executor(place)
exe.run(fluid.default_startup_program()) exe.run(fluid.default_startup_program())
#load_parameter(place) #load_parameter(place)
inference_program = fluid.io.get_inference_program(error_evaluator) inference_program = fluid.io.get_inference_program(error_evaluator)
...@@ -78,11 +81,15 @@ def train(args, data_reader=dummy_reader): ...@@ -78,11 +81,15 @@ def train(args, data_reader=dummy_reader):
sys.stdout.flush() sys.stdout.flush()
batch_id += 1 batch_id += 1
# evaluate model on test data if model_average != None:
model_average.apply(exe)
error_evaluator.reset(exe) error_evaluator.reset(exe)
for data in test_reader(): for data in test_reader():
exe.run(inference_program, feed=get_feeder_data(data, place)) exe.run(inference_program, feed=get_feeder_data(data, place))
_, test_seq_error = error_evaluator.eval(exe) _, test_seq_error = error_evaluator.eval(exe)
if model_average != None:
model_average.restore(exe)
print "\nEnd pass[%d]; Test seq error: %s.\n" % ( print "\nEnd pass[%d]; Test seq error: %s.\n" % (
pass_id, str(test_seq_error[0])) pass_id, str(test_seq_error[0]))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册