Merge remote-tracking branch 'origin/develop' into feature/sentence-parsing

This commit is contained in:
Matthew Honnibal 2017-10-08 20:20:41 +02:00
commit e74c8d2fad
2 changed files with 3 additions and 2 deletions

View File

@ -264,7 +264,8 @@ def HistoryFeatures(nr_class, hist_size=8, nr_dim=8):
return layerize(noop()) return layerize(noop())
embed_tables = [Embed(nr_dim, nr_class, column=i, name='embed%d') embed_tables = [Embed(nr_dim, nr_class, column=i, name='embed%d')
for i in range(hist_size)] for i in range(hist_size)]
embed = concatenate(*embed_tables) embed = chain(concatenate(*embed_tables),
LN(Maxout(hist_size*nr_dim, hist_size*nr_dim)))
ops = embed.ops ops = embed.ops
def add_history_fwd(vectors_hists, drop=0.): def add_history_fwd(vectors_hists, drop=0.):
vectors, hist_ids = vectors_hists vectors, hist_ids = vectors_hists

View File

@ -239,7 +239,7 @@ cdef class Parser:
""" """
@classmethod @classmethod
def Model(cls, nr_class, **cfg): def Model(cls, nr_class, **cfg):
depth = util.env_opt('parser_hidden_depth', cfg.get('hidden_depth', 2)) depth = util.env_opt('parser_hidden_depth', cfg.get('hidden_depth', 1))
token_vector_width = util.env_opt('token_vector_width', cfg.get('token_vector_width', 128)) token_vector_width = util.env_opt('token_vector_width', cfg.get('token_vector_width', 128))
hidden_width = util.env_opt('hidden_width', cfg.get('hidden_width', 128)) hidden_width = util.env_opt('hidden_width', cfg.get('hidden_width', 128))
parser_maxout_pieces = util.env_opt('parser_maxout_pieces', cfg.get('maxout_pieces', 1)) parser_maxout_pieces = util.env_opt('parser_maxout_pieces', cfg.get('maxout_pieces', 1))