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

Commit 1a6daaa

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: 29f9e7eebcd25accd93b39c14b3cdf6d3efcd3e9
1 parent ed6191e commit 1a6daaa

18 files changed

+141
-895
lines changed

pytext/builtin_task.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
SemanticParsingTask,
2828
SemanticParsingTask_Deprecated,
2929
SeqNNTask,
30-
SeqNNTask_Deprecated,
3130
SquadQATask,
3231
WordTaggingTask,
33-
WordTaggingTask_Deprecated,
3432
)
3533

3634

@@ -84,9 +82,7 @@ def register_builtin_tasks():
8482
SemanticParsingTask,
8583
SemanticParsingTask_Deprecated,
8684
SeqNNTask,
87-
SeqNNTask_Deprecated,
8885
SquadQATask,
8986
WordTaggingTask,
90-
WordTaggingTask_Deprecated,
9187
)
9288
)

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 & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -24,109 +24,5 @@
2424
},
2525
"version": 6
2626
}
27-
},
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-
},
106-
{
107-
"original": {
108-
"task": {
109-
"SeqNNTask": {
110-
"data_handler": {
111-
"train_path": "tests/data/train_data_tiny.tsv",
112-
"eval_path": "tests/data/test_data_tiny.tsv",
113-
"test_path": "tests/data/test_data_tiny.tsv"
114-
}
115-
}
116-
},
117-
"version": 5
118-
},
119-
"adapted": {
120-
"task": {
121-
"SeqNNTask_Deprecated": {
122-
"data_handler": {
123-
"train_path": "tests/data/train_data_tiny.tsv",
124-
"eval_path": "tests/data/test_data_tiny.tsv",
125-
"test_path": "tests/data/test_data_tiny.tsv"
126-
}
127-
}
128-
},
129-
"version": 6
130-
}
13127
}
13228
]

pytext/data/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +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
18-
from .seq_data_handler import SeqModelDataHandler
1917
from .tensorizers import Tensorizer
2018

2119

@@ -33,11 +31,9 @@
3331
"DocClassificationDataHandler",
3432
"EvalBatchSampler",
3533
"generator_iterator",
36-
"JointModelDataHandler",
3734
"PoolingBatcher",
3835
"RandomizedBatchSampler",
3936
"RawData",
4037
"RoundRobinBatchSampler",
41-
"SeqModelDataHandler",
4238
"Tensorizer",
4339
]

pytext/data/joint_data_handler.py

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

0 commit comments

Comments
 (0)