Skip to content

Commit 5952dcf

Browse files
committed
changes:
- `core` just re-exports everything from `pie_core` - `metrics` just re-exports everything from `pie_documents.metrics` - `annotations` just re-exports everything from `pie_documents.annotations` - `documents` just re-exports everything from `pie_documents.documents` - remove `utils.hydra` - remove `auto`
1 parent 13eda35 commit 5952dcf

File tree

8 files changed

+6
-92
lines changed

8 files changed

+6
-92
lines changed

src/pytorch_ie/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# flake8: noqa
22

3-
from pytorch_ie.auto import AutoModel, AutoTaskModule
43
from pytorch_ie.core import *
54
from pytorch_ie.datamodule import PieDataModule
65
from pytorch_ie.dataset import IterableTaskEncodingDataset, TaskEncodingDataset
6+
from pytorch_ie.model import PyTorchIEModel
77
from pytorch_ie.pipeline import PyTorchIEPipeline

src/pytorch_ie/annotations.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
# backward compatibility
2-
from pie_documents.annotations import (
3-
BinaryRelation,
4-
Label,
5-
LabeledMultiSpan,
6-
LabeledSpan,
7-
MultiLabel,
8-
MultiLabeledBinaryRelation,
9-
MultiLabeledSpan,
10-
MultiSpan,
11-
NaryRelation,
12-
Span,
13-
)
1+
from pie_documents.annotations import *

src/pytorch_ie/auto.py

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

src/pytorch_ie/core/__init__.py

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1 @@
1-
import sys
2-
3-
import pie_core
4-
from pie_core import taskmodule
5-
from pie_core.document import Annotation, AnnotationLayer, Document, annotation_field
6-
from pie_core.metric import DocumentMetric
7-
from pie_core.module_mixins import (
8-
EnterDatasetDictMixin,
9-
EnterDatasetMixin,
10-
ExitDatasetDictMixin,
11-
ExitDatasetMixin,
12-
WithDocumentTypeMixin,
13-
)
14-
from pie_core.preparable import PreparableMixin
15-
from pie_core.statistic import DocumentStatistic
16-
from pie_core.taskencoding import TaskEncoding, TaskEncodingSequence
17-
from pie_core.taskmodule import TaskModule
18-
19-
from pytorch_ie import model
20-
from pytorch_ie.dataset import IterableTaskEncodingDataset, TaskEncodingDataset
21-
from pytorch_ie.model import PyTorchIEModel
22-
23-
submodules = ["document", "taskmodule", "metric", "statistic"]
24-
for sub in submodules:
25-
module = getattr(pie_core, sub)
26-
sys.modules[f"{__name__}.{sub}"] = module
27-
28-
sys.modules[f"{__name__}.model"] = model
29-
30-
taskmodule.TaskEncodingDataset = TaskEncodingDataset
31-
taskmodule.IterableTaskEncodingDataset = IterableTaskEncodingDataset
32-
33-
# backwards compatibility
34-
AnnotationList = AnnotationLayer
35-
RequiresDocumentTypeMixin = WithDocumentTypeMixin
1+
from pie_core import *

src/pytorch_ie/documents.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1 @@
1-
# backwards compatibility
2-
from pie_documents.documents import (
3-
DocumentWithLabel,
4-
DocumentWithMultiLabel,
5-
TextBasedDocument,
6-
TextDocumentWithLabel,
7-
TextDocumentWithLabeledMultiSpans,
8-
TextDocumentWithLabeledMultiSpansAndBinaryRelations,
9-
TextDocumentWithLabeledMultiSpansAndLabeledPartitions,
10-
TextDocumentWithLabeledMultiSpansBinaryRelationsAndLabeledPartitions,
11-
TextDocumentWithLabeledPartitions,
12-
TextDocumentWithLabeledSpans,
13-
TextDocumentWithLabeledSpansAndBinaryRelations,
14-
TextDocumentWithLabeledSpansAndLabeledPartitions,
15-
TextDocumentWithLabeledSpansAndSentences,
16-
TextDocumentWithLabeledSpansBinaryRelationsAndLabeledPartitions,
17-
TextDocumentWithMultiLabel,
18-
TextDocumentWithSentences,
19-
TextDocumentWithSpans,
20-
TextDocumentWithSpansAndBinaryRelations,
21-
TextDocumentWithSpansAndLabeledPartitions,
22-
TextDocumentWithSpansBinaryRelationsAndLabeledPartitions,
23-
TokenBasedDocument,
24-
WithMetadata,
25-
WithText,
26-
WithTokens,
27-
)
28-
from typing_extensions import TypeAlias
29-
30-
# backwards compatibility
31-
TextDocument: TypeAlias = TextBasedDocument
1+
from pie_documents.documents import *

src/pytorch_ie/metrics/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# backwards compatibility
2-
from pie_documents.metrics import ConfusionMatrix, F1Metric, SQuADF1
1+
from pie_documents.metrics import *

src/pytorch_ie/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Any, Dict
22

33
import torch
4-
from pie_core import Auto, Model
4+
from pie_core import Model
55
from pytorch_lightning import LightningModule
66

77

src/pytorch_ie/utils/hydra.py

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

0 commit comments

Comments
 (0)