Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

💫 Fix class mismap on parser deserializing (closes #3433) #3470

Merged
merged 7 commits into from
Mar 23, 2019
Merged

💫 Fix class mismap on parser deserializing (closes #3433) #3470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fca6ba
Fix skipped parser test
honnibal Mar 23, 2019
d014db0
Fix class mismap on parser deserialization
honnibal Mar 23, 2019
91aa303
Add passing test for #3433
honnibal Mar 23, 2019
715ce35
Merge branch 'master' into bugfix/parser-class-map
honnibal Mar 23, 2019
66117ca
Make parser test less flakey
honnibal Mar 23, 2019
1c0deb6
Merge branch 'bugfix/parser-class-map' of https://github.com/explosio…
honnibal Mar 23, 2019
c681a3e
Fix test
honnibal Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions spacy/syntax/nn_parser.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,12 @@ cdef class Parser:
cfg.setdefault('min_action_freq', 30)
actions = self.moves.get_actions(gold_parses=get_gold_tuples(),
min_freq=cfg.get('min_action_freq', 30))
previous_labels = dict(self.moves.labels)
for action, labels in self.moves.labels.items():
actions.setdefault(action, {})
for label, freq in labels.items():
if label not in actions[action]:
actions[action][label] = freq
self.moves.initialize_actions(actions)
for action, label_freqs in previous_labels.items():
for label in label_freqs:
self.moves.add_action(action, label)
cfg.setdefault('token_vector_width', 96)
if self.model is True:
self.model, cfg = self.Model(self.moves.n_moves, **cfg)
Expand Down
17 changes: 1 addition & 16 deletions spacy/tests/parser/test_add_label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _train_parser(parser):
parser.begin_training([], **parser.cfg)
sgd = Adam(NumpyOps(), 0.001)

for i in range(10):
for i in range(5):
losses = {}
doc = Doc(parser.vocab, words=["a", "b", "c", "d"])
gold = GoldParse(doc, heads=[1, 1, 3, 3], deps=["left", "ROOT", "left", "ROOT"])
Expand All @@ -43,21 +43,7 @@ def _train_parser(parser):

def test_add_label(parser):
parser = _train_parser(parser)
doc = Doc(parser.vocab, words=["a", "b", "c", "d"])
doc = parser(doc)
assert doc[0].head.i == 1
assert doc[0].dep_ == "left"
assert doc[1].head.i == 1
assert doc[2].head.i == 3
assert doc[2].head.i == 3
parser.add_label("right")
doc = Doc(parser.vocab, words=["a", "b", "c", "d"])
doc = parser(doc)
assert doc[0].head.i == 1
assert doc[0].dep_ == "left"
assert doc[1].head.i == 1
assert doc[2].head.i == 3
assert doc[2].head.i == 3
sgd = Adam(NumpyOps(), 0.001)
for i in range(10):
losses = {}
Expand All @@ -72,7 +58,6 @@ def test_add_label(parser):
assert doc[2].dep_ == "left"


@pytest.mark.xfail
def test_add_label_deserializes_correctly():
ner1 = EntityRecognizer(Vocab())
ner1.add_label("C")
Expand Down