diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml index b8429372c..2adb22648 100644 --- a/.github/azure-steps.yml +++ b/.github/azure-steps.yml @@ -64,7 +64,7 @@ steps: displayName: "Run GPU tests" condition: eq(${{ parameters.gpu }}, true) - # Disabled in parser refactor branch, requires spacy.TransitionBasedParser.v2. + # Re-enable when we have models trained for spacy.TransitionBasedParser.v3. #- script: | # python -m spacy download ca_core_news_sm # python -m spacy download ca_core_news_md @@ -94,14 +94,14 @@ steps: displayName: 'Test train CLI' condition: eq(variables['python_version'], '3.8') - # Disabled in parser refactor branch, requires spacy.TransitionBasedParser.v2. + # Re-enable when we have models trained for spacy.TransitionBasedParser.v3. # - script: | # python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_sm'}; config.to_disk('ner_source_sm.cfg')" # PYTHONWARNINGS="error,ignore::DeprecationWarning" python -m spacy assemble ner_source_sm.cfg output_dir # displayName: 'Test assemble CLI' # condition: eq(variables['python_version'], '3.8') - # Disabled in parser refactor branch, requires spacy.TransitionBasedParser.v2. + # Re-enable when we have models trained for spacy.TransitionBasedParser.v3. # - script: | # python -c "import spacy; config = spacy.util.load_config('ner.cfg'); config['components']['ner'] = {'source': 'ca_core_news_md'}; config.to_disk('ner_source_md.cfg')" # python -m spacy assemble ner_source_md.cfg output_dir 2>&1 | grep -q W113 diff --git a/spacy/tests/parser/test_parse.py b/spacy/tests/parser/test_parse.py index 074ec601e..c7427fac6 100644 --- a/spacy/tests/parser/test_parse.py +++ b/spacy/tests/parser/test_parse.py @@ -459,10 +459,6 @@ def test_overfitting_IO(pipe_name): @pytest.mark.parametrize( "parser_config", [ - # TransitionBasedParser V1, FIXME: re-enable - # ({"@architectures": "spacy.TransitionBasedParser.v1", "tok2vec": DEFAULT_TOK2VEC_MODEL, "state_type": "parser", "extra_state_tokens": False, "hidden_width": 64, "maxout_pieces": 2, "use_upper": True}), - # TransitionBasedParser V2, FIXME: re-enable - # ({"@architectures": "spacy.TransitionBasedParser.v2", "tok2vec": DEFAULT_TOK2VEC_MODEL, "state_type": "parser", "extra_state_tokens": False, "hidden_width": 64, "maxout_pieces": 2, "use_upper": True}), ({"@architectures": "spacy.TransitionBasedParser.v3", "tok2vec": DEFAULT_TOK2VEC_MODEL, "state_type": "parser", "extra_state_tokens": False, "hidden_width": 64, "maxout_pieces": 2}), ], ) diff --git a/website/docs/api/architectures.md b/website/docs/api/architectures.md index 93f7b762c..a7499f8e2 100644 --- a/website/docs/api/architectures.md +++ b/website/docs/api/architectures.md @@ -602,13 +602,6 @@ consists of either two or three subnetworks: | `nO` | The number of actions the model will predict between. Usually inferred from data at the beginning of training, or loaded from disk. ~~int~~ | | **CREATES** | The model using the architecture. ~~Model[List[Docs], List[List[Floats2d]]]~~ | - - -[TransitionBasedParser.v1](/api/legacy#TransitionBasedParser_v1) had the exact -same signature, but the `use_upper` argument was `True` by default. - - - ## Tagging architectures {#tagger source="spacy/ml/models/tagger.py"} ### spacy.Tagger.v2 {#Tagger} diff --git a/website/docs/api/cli.md b/website/docs/api/cli.md index cbd1f794a..7ad83de9c 100644 --- a/website/docs/api/cli.md +++ b/website/docs/api/cli.md @@ -359,7 +359,7 @@ Module spacy.language File /path/to/spacy/language.py (line 64) ℹ [components.ner.model] Registry @architectures -Name spacy.TransitionBasedParser.v1 +Name spacy.TransitionBasedParser.v3 Module spacy.ml.models.parser File /path/to/spacy/ml/models/parser.py (line 11) ℹ [components.ner.model.tok2vec] @@ -369,7 +369,7 @@ Module spacy.ml.models.tok2vec File /path/to/spacy/ml/models/tok2vec.py (line 16) ℹ [components.parser.model] Registry @architectures -Name spacy.TransitionBasedParser.v1 +Name spacy.TransitionBasedParser.v3 Module spacy.ml.models.parser File /path/to/spacy/ml/models/parser.py (line 11) ℹ [components.parser.model.tok2vec] @@ -695,7 +695,7 @@ scorer = {"@scorers":"spacy.ner_scorer.v1"} update_with_oracle_cut_size = 100 [components.ner.model] -@architectures = "spacy.TransitionBasedParser.v2" +@architectures = "spacy.TransitionBasedParser.v3" state_type = "ner" extra_state_tokens = false - hidden_width = 64 @@ -718,7 +718,7 @@ scorer = {"@scorers":"spacy.parser_scorer.v1"} update_with_oracle_cut_size = 100 [components.parser.model] -@architectures = "spacy.TransitionBasedParser.v2" +@architectures = "spacy.TransitionBasedParser.v3" state_type = "parser" extra_state_tokens = false hidden_width = 128 diff --git a/website/docs/api/legacy.md b/website/docs/api/legacy.md index 31d178b67..b93bdde0e 100644 --- a/website/docs/api/legacy.md +++ b/website/docs/api/legacy.md @@ -222,12 +222,6 @@ the others, but may not be as accurate, especially if texts are short. | `nO` | Output dimension, determined by the number of different labels. If not set, the [`TextCategorizer`](/api/textcategorizer) component will set it when `initialize` is called. ~~Optional[int]~~ | | **CREATES** | The model using the architecture. ~~Model[List[Doc], Floats2d]~~ | -### spacy.TransitionBasedParser.v1 {#TransitionBasedParser_v1} - -Identical to -[`spacy.TransitionBasedParser.v2`](/api/architectures#TransitionBasedParser) -except the `use_upper` was set to `True` by default. - ## Layers {#layers} These functions are available from `@spacy.registry.layers`.