explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-10-31 16:07:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pass cfg through parser, and have is_valid default to 1, not 0 when resetting state

Browse Source
This commit is contained in:
Matthew Honnibal 2016-11-25 09:00:21 -06:00
parent cc7e607a8a
commit 608d8f5421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spacy/syntax/parser.pyx
View File

@ -75,11 +75,11 @@ cdef class ParserModel(AveragedPerceptron):
cdef class Parser: cdef class Parser:
@classmethod @classmethod
def load(cls, path, Vocab vocab, TransitionSystem=None, require=False): def load(cls, path, Vocab vocab, TransitionSystem=None, require=False, **cfg):
with (path / 'config.json').open() as file_: with (path / 'config.json').open() as file_:
cfg = json.load(file_) cfg = json.load(file_)
# TODO: remove this shim when we don't have to support older data # TODO: remove this shim when we don't have to support older data
if 'labels' in cfg: if 'labels' in cfg and 'actions' not in cfg:
cfg['actions'] = cfg.pop('labels') cfg['actions'] = cfg.pop('labels')
self = cls(vocab, TransitionSystem=TransitionSystem, model=None, **cfg) self = cls(vocab, TransitionSystem=TransitionSystem, model=None, **cfg)
if (path / 'model').exists(): if (path / 'model').exists():
@ -215,7 +215,7 @@ cdef class Parser:
loss += eg.costs[eg.guess] loss += eg.costs[eg.guess]
eg.fill_scores(0, eg.nr_class) eg.fill_scores(0, eg.nr_class)
eg.fill_costs(0, eg.nr_class) eg.fill_costs(0, eg.nr_class)
eg.fill_is_valid(0, eg.nr_class) eg.fill_is_valid(1, eg.nr_class)
return loss return loss
def step_through(self, Doc doc): def step_through(self, Doc doc):