Skip to content

Commit

Permalink
Rename namespaces to suppress warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepinyourhat committed Jul 12, 2019
1 parent 4142bb6 commit 0cf7b23
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions jiant/tasks/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def _make_instance(input1, input2, labels, idx):
else:
d["labels"] = NumericField(labels)

d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)

return Instance(d)

Expand Down Expand Up @@ -723,7 +723,7 @@ def _make_instance(input1, labels, tagids):
d["sent1_str"] = MetadataField(" ".join(input1[1:-1]))
d["labels"] = LabelField(labels, label_namespace="labels", skip_indexing=True)
d["tagmask"] = MultiLabelField(
tagids, label_namespace="tagids", skip_indexing=True, num_labels=len(self.tag_list)
tagids, label_namespace="tags", skip_indexing=True, num_labels=len(self.tag_list)
)
return Instance(d)

Expand Down Expand Up @@ -1339,7 +1339,7 @@ def create_labels_from_tags(fields_dict, ix_to_tag_dict, tag_arr, tag_group):
# 1.
is_tag_group = 1 if len(tag_arr) != 0 else 0
fields_dict[tag_group] = LabelField(
is_tag_group, label_namespace=tag_group, skip_indexing=True
is_tag_group, label_namespace=tag_group + "-tags", skip_indexing=True
)
# For every possible tag in the column set 1 if the tag is present for
# this example, 0 otherwise.
Expand All @@ -1348,7 +1348,7 @@ def create_labels_from_tags(fields_dict, ix_to_tag_dict, tag_arr, tag_group):
continue
is_present = 1 if ix in tag_arr else 0
fields_dict["%s__%s" % (tag_group, tag)] = LabelField(
is_present, label_namespace="%s__%s" % (tag_group, tag), skip_indexing=True
is_present, label_namespace="%s__%s-tags" % (tag_group, tag), skip_indexing=True
)
return

Expand All @@ -1362,7 +1362,7 @@ def _make_instance(input1, input2, label, idx, lex_sem, pr_ar_str, logic, knowle
d["input1"] = sentence_to_text_field(input1, indexers)
d["input2"] = sentence_to_text_field(input2, indexers)
d["labels"] = LabelField(label, label_namespace="labels", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idx", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idx-tags", skip_indexing=True)
d["sent1_str"] = MetadataField(" ".join(input1[1:-1]))
d["sent2_str"] = MetadataField(" ".join(input2[1:-1]))

Expand Down Expand Up @@ -1568,8 +1568,8 @@ def _make_instance(input1, input2, labels, idx, pair_id):
d["input2"] = sentence_to_text_field(input2, indexers)
d["sent2_str"] = MetadataField(" ".join(input2[1:-1]))
d["labels"] = LabelField(labels, label_namespace="labels", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
d["pair_id"] = LabelField(pair_id, label_namespace="pair_id", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)
d["pair_id"] = LabelField(pair_id, label_namespace="pair_id-tags", skip_indexing=True)
return Instance(d)

instances = map(_make_instance, *split)
Expand Down Expand Up @@ -2131,7 +2131,7 @@ def process_split(self, split, indexers) -> Iterable[Type[Instance]]:
for sent in split[2]
]
mask = [
MultiLabelField(mask, label_namespace="indices", skip_indexing=True, num_labels=511)
MultiLabelField(mask, label_namespace="idx-tags", skip_indexing=True, num_labels=511)
for mask in split[3]
]
instances = [
Expand Down Expand Up @@ -2535,7 +2535,7 @@ def _make_instance(input1, input2, idxs1, idxs2, labels, idx):
d["idx1"] = ListField([NumericField(i) for i in range(idxs1[0], idxs1[1])])
d["idx2"] = ListField([NumericField(i) for i in range(idxs2[0], idxs2[1])])
d["labels"] = LabelField(labels, label_namespace="labels", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)

return Instance(d)

Expand Down Expand Up @@ -2630,7 +2630,7 @@ def _make_instance(context, choices, question, label, idx):
d["choice%d" % choice_idx] = sentence_to_text_field(inp, indexers)
d["choice%d_str" % choice_idx] = MetadataField(" ".join(choice[1:-1]))
d["label"] = LabelField(label, label_namespace="labels", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)
return Instance(d)

split = list(split)
Expand Down Expand Up @@ -2709,7 +2709,7 @@ def _make_instance(question, choices, label, idx):
d["choice%d" % choice_idx] = sentence_to_text_field(inp, indexers)
d["choice%d_str" % choice_idx] = MetadataField(" ".join(choice[1:-1]))
d["label"] = LabelField(label, label_namespace="labels", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)
return Instance(d)

split = list(split)
Expand Down Expand Up @@ -2821,7 +2821,7 @@ def _make_instance(d, idx):
psg_qst = d["passage"][:-1] + d["question"]
new_d["inputs"] = sentence_to_text_field(psg_qst, indexers)
new_d["labels"] = LabelField(d["label"], label_namespace="labels", skip_indexing=True)
new_d["idx"] = LabelField(idx, label_namespace="idxs", skip_indexing=True)
new_d["idx"] = LabelField(idx, label_namespace="idxs-tags", skip_indexing=True)
return Instance(new_d)

split = [split, itertools.count()]
Expand Down

0 comments on commit 0cf7b23

Please sign in to comment.