Merge branch 'perfTuning' into perfTuningMaster

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
This commit is contained in:
Avadh Patel 2018-01-21 15:17:50 -06:00
commit c66f80ab9f
1 changed files with 2 additions and 4 deletions

View File

@ -269,10 +269,6 @@ cdef class Parser:
zero_init(Affine(nr_class, hidden_width, drop_factor=0.0)) zero_init(Affine(nr_class, hidden_width, drop_factor=0.0))
) )
# TODO: This is an unfortunate hack atm!
# Used to set input dimensions in network.
if not cfg.get('from_disk', False):
lower.begin_training(lower.ops.allocate((500, token_vector_width)))
cfg = { cfg = {
'nr_class': nr_class, 'nr_class': nr_class,
'hidden_depth': depth, 'hidden_depth': depth,
@ -836,6 +832,8 @@ cdef class Parser:
self.model, cfg = self.Model(self.moves.n_moves, **cfg) self.model, cfg = self.Model(self.moves.n_moves, **cfg)
if sgd is None: if sgd is None:
sgd = self.create_optimizer() sgd = self.create_optimizer()
self.model[1].begin_training(
self.model[1].ops.allocate((5, cfg['token_vector_width'])))
self.init_multitask_objectives(gold_tuples, pipeline, sgd=sgd, **cfg) self.init_multitask_objectives(gold_tuples, pipeline, sgd=sgd, **cfg)
link_vectors_to_models(self.vocab) link_vectors_to_models(self.vocab)
self.cfg.update(cfg) self.cfg.update(cfg)