Skip to content

Commit 582c342

Browse files
authored
Update pytorch ie 0.17.0 (#48)
* update pytorch-ie to 0.17.0 * use remove DatasetDict and import it from pytorch-ie * remove conll2003_extract fixture data * use target_layer property
1 parent 8e0d012 commit 582c342

File tree

11 files changed

+4
-943
lines changed

11 files changed

+4
-943
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import find_packages, setup
44

55
REQUIRED_PKGS = [
6-
"pytorch-ie>=0.16.0,<1.0.0",
6+
"pytorch-ie>=0.17.0,<1.0.0",
77
"asciidag", # for visualization
88
]
99

src/pie_utils/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
from .dataset_dict import DatasetDict

src/pie_utils/dataset_dict.py

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

src/pie_utils/document/processors/candidate_relation_adder.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from pytorch_ie import Dataset, IterableDataset
1010
from pytorch_ie.annotations import BinaryRelation
1111
from pytorch_ie.core import AnnotationList, Document
12-
from pytorch_ie.core.document import BaseAnnotationList
1312
from pytorch_ie.utils.span import is_contained_in
1413

1514
from pie_utils.document.processors.common import EnterDatasetMixin, ExitDatasetMixin
@@ -20,14 +19,6 @@
2019
D = TypeVar("D", bound=Document)
2120

2221

23-
def target_layers(layer: BaseAnnotationList) -> dict[str, AnnotationList]:
24-
return {
25-
target_layer_name: layer._document[target_layer_name]
26-
for target_layer_name in layer._targets
27-
if target_layer_name in layer._document
28-
}
29-
30-
3122
class CandidateRelationAdder(EnterDatasetMixin, ExitDatasetMixin):
3223
"""CandidateRelationAdder adds binary relations to a document based on various parameters. It
3324
goes through combinations of available entity pairs as possible candidates for new relations.
@@ -149,13 +140,8 @@ def __call__(self, document: D) -> D:
149140
available_partitions = document[self.partition_layer]
150141
else:
151142
available_partitions = [None]
152-
rel_target_layers = target_layers(layer=rel_layer)
153-
if not len(rel_target_layers) == 1:
154-
raise ValueError(
155-
f"Relation layer must have exactly one target layer but found the following target layers: "
156-
f"{list(rel_target_layers)}"
157-
)
158-
entity_layer = list(rel_target_layers.values())[0]
143+
144+
entity_layer = rel_layer.target_layer
159145
if self.use_predictions:
160146
entity_layer = entity_layer.predictions
161147

0 commit comments

Comments
 (0)