Skip to content
This repository was archived by the owner on Nov 22, 2022. It is now read-only.

Commit 203b937

Browse files
geof90facebook-github-bot
authored andcommitted
Migrate Wit workflows to new data design, delete deprecated Word Tagging tasks, models and data handlers (#910)
Summary: Pull Request resolved: #910 as title Differential Revision: D16827032 fbshipit-source-id: 3e5aa85ce72c22111ba1732b4de8b3691480118b
1 parent 8aded25 commit 203b937

File tree

16 files changed

+139
-686
lines changed

16 files changed

+139
-686
lines changed

pytext/builtin_task.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
SeqNNTask_Deprecated,
3131
SquadQATask,
3232
WordTaggingTask,
33-
WordTaggingTask_Deprecated,
3433
)
3534

3635

@@ -87,6 +86,5 @@ def register_builtin_tasks():
8786
SeqNNTask_Deprecated,
8887
SquadQATask,
8988
WordTaggingTask,
90-
WordTaggingTask_Deprecated,
9189
)
9290
)

pytext/config/config_adapter.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ def old_tasks_deprecated(json_config):
315315
deprecate(json_config, "ShallowTaggingTask")
316316
deprecate(json_config, "SpanClassificationTask")
317317
deprecate(json_config, "TreeParserTask")
318-
deprecate(json_config, "WordTaggingTask")
319318

320319
return json_config
321320

@@ -385,7 +384,6 @@ def new_tasks_rename(json_config):
385384
"QueryDocumentPairwiseRankingModel",
386385
"QueryDocumentPairwiseRankingModel_Deprecated",
387386
)
388-
rename(json_config, "WordTaggingModel", "WordTaggingModel_Deprecated")
389387
# New
390388
rename(json_config, "NewDocModel", "DocModel")
391389
rename(json_config, "NewDocRegressionModel", "DocRegressionModel")
@@ -461,19 +459,15 @@ def v12_to_v13(json_config):
461459

462460
[(task_name, task)] = json_config["task"].items()
463461
if task_name not in (
464-
"EnsembleTask_Deprecated",
465462
"EnsembleTask",
466463
"DocClassificationTask_Deprecated",
467464
"DocumentClassificationTask",
468465
"PairwiseClassificationTask",
469-
"SeqNNTask_Deprecated",
470466
"SeqNNTask",
471467
"ShallowClassificationTask_Deprecated",
472468
"KDDocClassificationTask_Deprecated",
473-
"ElmoDocClassificationTask_Deprecated",
474469
"PairwiseAttentionClassificationTask_Deprecated",
475470
"ElmoFineTunePairwiseClassificationTask_Deprecated",
476-
"ElmoKDClassificationTask_Deprecated",
477471
"XLMDocumentClassification",
478472
"XLMPairClassification",
479473
"NewBertClassificationTask",
@@ -542,13 +536,7 @@ def update_model_config(model_config):
542536

543537
@register_adapter(from_version=14)
544538
def flatten_deprecated_ensemble_config(json_config):
545-
[(task_name, task)] = json_config["task"].items()
546-
if task_name != "EnsembleTask_Deprecated":
547-
return json_config
548-
549-
# Joint ensemble model is deleted, so we no longer have a union type, hence
550-
# we flatten the config.
551-
task["model"] = task["model"]["BaggingDocEnsemble_Deprecated"]
539+
# Deprecated ensemble is removed from codebase, so this is now just a no-op
552540
return json_config
553541

554542

pytext/config/test/json_config/v6.json

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -25,84 +25,6 @@
2525
"version": 6
2626
}
2727
},
28-
{
29-
"original": {
30-
"task": {
31-
"WordTaggingTask": {
32-
"data_handler": {
33-
"train_path": "tests/data/train_data_tiny.tsv",
34-
"eval_path": "tests/data/test_data_tiny.tsv",
35-
"test_path": "tests/data/test_data_tiny.tsv"
36-
}
37-
}
38-
},
39-
"version": 5
40-
},
41-
"adapted": {
42-
"task": {
43-
"WordTaggingTask_Deprecated": {
44-
"data_handler": {
45-
"train_path": "tests/data/train_data_tiny.tsv",
46-
"eval_path": "tests/data/test_data_tiny.tsv",
47-
"test_path": "tests/data/test_data_tiny.tsv"
48-
}
49-
}
50-
},
51-
"version": 6
52-
}
53-
},
54-
{
55-
"original": {
56-
"task": {
57-
"WordTaggingTask": {
58-
"data_handler": {
59-
"train_path": "tests/data/train_data_tiny.tsv",
60-
"eval_path": "tests/data/test_data_tiny.tsv",
61-
"test_path": "tests/data/test_data_tiny.tsv"
62-
}
63-
}
64-
},
65-
"version": 5
66-
},
67-
"adapted": {
68-
"task": {
69-
"WordTaggingTask_Deprecated": {
70-
"data_handler": {
71-
"train_path": "tests/data/train_data_tiny.tsv",
72-
"eval_path": "tests/data/test_data_tiny.tsv",
73-
"test_path": "tests/data/test_data_tiny.tsv"
74-
}
75-
}
76-
},
77-
"version": 6
78-
}
79-
},
80-
{
81-
"original": {
82-
"task": {
83-
"WordTaggingTask": {
84-
"data_handler": {
85-
"train_path": "tests/data/train_data_tiny.tsv",
86-
"eval_path": "tests/data/test_data_tiny.tsv",
87-
"test_path": "tests/data/test_data_tiny.tsv"
88-
}
89-
}
90-
},
91-
"version": 5
92-
},
93-
"adapted": {
94-
"task": {
95-
"WordTaggingTask_Deprecated": {
96-
"data_handler": {
97-
"train_path": "tests/data/train_data_tiny.tsv",
98-
"eval_path": "tests/data/test_data_tiny.tsv",
99-
"test_path": "tests/data/test_data_tiny.tsv"
100-
}
101-
}
102-
},
103-
"version": 6
104-
}
105-
},
10628
{
10729
"original": {
10830
"task": {

pytext/data/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from .disjoint_multitask_data import DisjointMultitaskData
1515
from .disjoint_multitask_data_handler import DisjointMultitaskDataHandler
1616
from .doc_classification_data_handler import DocClassificationDataHandler, RawData
17-
from .joint_data_handler import JointModelDataHandler
1817
from .seq_data_handler import SeqModelDataHandler
1918
from .tensorizers import Tensorizer
2019

@@ -33,7 +32,6 @@
3332
"DocClassificationDataHandler",
3433
"EvalBatchSampler",
3534
"generator_iterator",
36-
"JointModelDataHandler",
3735
"PoolingBatcher",
3836
"RandomizedBatchSampler",
3937
"RawData",

pytext/data/joint_data_handler.py

Lines changed: 0 additions & 177 deletions
This file was deleted.

0 commit comments

Comments
 (0)