Commit 7e9d09a8 authored by Yuxin Wu's avatar Yuxin Wu

fix docs and naming

parent 22c0f6ac
...@@ -34,7 +34,7 @@ import mock ...@@ -34,7 +34,7 @@ import mock
#', '.join(map(str, args)) + ', ' \ #', '.join(map(str, args)) + ', ' \
#+ ', '.join(["{}={}".format(k,v) for k,v in kwargs.items()]) + ')' #+ ', '.join(["{}={}".format(k,v) for k,v in kwargs.items()]) + ')'
MOCK_MODULES = ['numpy', 'scipy', 'tensorflow', 'scipy.misc', 'h5py', 'nltk', MOCK_MODULES = ['scipy', 'tensorflow', 'scipy.misc', 'h5py', 'nltk',
'cv2', 'scipy.io', 'dill', 'zmq', 'subprocess32', 'lmdb', 'tornado.concurrent', 'cv2', 'scipy.io', 'dill', 'zmq', 'subprocess32', 'lmdb', 'tornado.concurrent',
'tornado', 'msgpack', 'msgpack_numpy', 'ale_python_interface'] 'tornado', 'msgpack', 'msgpack_numpy', 'ale_python_interface']
for mod_name in MOCK_MODULES: for mod_name in MOCK_MODULES:
......
termcolor termcolor
numpy
tqdm tqdm
nltk nltk
decorator decorator
......
...@@ -144,10 +144,10 @@ class Model(ModelDesc): ...@@ -144,10 +144,10 @@ class Model(ModelDesc):
wrong = prediction_incorrect(logits, label, 1) wrong = prediction_incorrect(logits, label, 1)
nr_wrong = tf.reduce_sum(wrong, name='wrong-top1') nr_wrong = tf.reduce_sum(wrong, name='wrong-top1')
add_moving_summary(tf.reduce_mean(wrong, name='train_error_top1')) add_moving_summary(tf.reduce_mean(wrong, name='train-error-top1'))
wrong = prediction_incorrect(logits, label, 5) wrong = prediction_incorrect(logits, label, 5)
nr_wrong = tf.reduce_sum(wrong, name='wrong-top5') nr_wrong = tf.reduce_sum(wrong, name='wrong-top5')
add_moving_summary(tf.reduce_mean(wrong, name='train_error_top5')) add_moving_summary(tf.reduce_mean(wrong, name='train-error-top5'))
# weight decay on all W of fc layers # weight decay on all W of fc layers
wd_cost = regularize_cost('fc.*/W', l2_regularizer(5e-6)) wd_cost = regularize_cost('fc.*/W', l2_regularizer(5e-6))
...@@ -235,8 +235,8 @@ def get_config(): ...@@ -235,8 +235,8 @@ def get_config():
'learning_rate', [(56, 2e-5), (64, 4e-6)]), 'learning_rate', [(56, 2e-5), (64, 4e-6)]),
InferenceRunner(data_test, InferenceRunner(data_test,
[ScalarStats('cost'), [ScalarStats('cost'),
ClassificationError('wrong-top1', 'val-top1-error'), ClassificationError('wrong-top1', 'val-error-top1'),
ClassificationError('wrong-top5', 'val-top5-error')]) ClassificationError('wrong-top5', 'val-error-top1')])
]), ]),
model=Model(), model=Model(),
step_per_epoch=10000, step_per_epoch=10000,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment