diff --git a/README.md b/README.md index ab976b1..c5c0f8a 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ from typing import Mapping, Sequence, Union from collatable import LabelField, TextField from collatable.extras import DataLoader, Dataset, DefaultBatchSampler, LabelIndexer, TokenIndexer from collatable.extras.datamodule import DataModule, LabelFieldTransform, TextFieldTransform -from collatable.util import debatched +from collatable.utils import debatched @dataclass diff --git a/collatable/collator.py b/collatable/collator.py index df32bff..7b1af10 100644 --- a/collatable/collator.py +++ b/collatable/collator.py @@ -1,7 +1,7 @@ from typing import Any, Dict, Mapping, Optional, Sequence, Set from collatable.fields import Field -from collatable.typing import DataArray, INamedTuple +from collatable.types import DataArray, INamedTuple class Collator: diff --git a/collatable/extras/dataloader.py b/collatable/extras/dataloader.py index e440b27..4442d2b 100644 --- a/collatable/extras/dataloader.py +++ b/collatable/extras/dataloader.py @@ -4,7 +4,7 @@ from collatable.collator import Collator from collatable.fields import Field -from collatable.typing import DataArray +from collatable.types import DataArray T = TypeVar("T") T_co = TypeVar("T_co", covariant=True) diff --git a/collatable/extras/datamodule.py b/collatable/extras/datamodule.py index fd09273..c68ad47 100644 --- a/collatable/extras/datamodule.py +++ b/collatable/extras/datamodule.py @@ -18,7 +18,7 @@ ) from collatable import Field, LabelField, TextField -from collatable.typing import DataArray, IntTensor, Scalar, Tensor +from collatable.types import DataArray, IntTensor, Scalar, Tensor S = TypeVar("S") T = TypeVar("T") diff --git a/collatable/extras/indexer.py b/collatable/extras/indexer.py index ef8ba92..4b753b6 100644 --- a/collatable/extras/indexer.py +++ b/collatable/extras/indexer.py @@ -17,7 +17,7 @@ import numpy -from collatable.typing import Tensor +from collatable.types import Tensor ValueT = TypeVar("ValueT", bound=Hashable) Self = TypeVar("Self", bound="Indexer") diff --git a/collatable/fields/adjacency_field.py b/collatable/fields/adjacency_field.py index cdd5b24..f037eba 100644 --- a/collatable/fields/adjacency_field.py +++ b/collatable/fields/adjacency_field.py @@ -4,7 +4,7 @@ from collatable.fields.field import Field, PaddingValue from collatable.fields.sequence_field import SequenceField -from collatable.typing import IntTensor +from collatable.types import IntTensor Self = TypeVar("Self", bound="AdjacencyField") LabelT = TypeVar("LabelT", bound=Hashable) diff --git a/collatable/fields/field.py b/collatable/fields/field.py index 1128e5f..8262e5b 100644 --- a/collatable/fields/field.py +++ b/collatable/fields/field.py @@ -4,8 +4,8 @@ import numpy -from collatable.typing import ArrayLike, DataArrayT -from collatable.util import stack_with_padding +from collatable.types import ArrayLike, DataArrayT +from collatable.utils import stack_with_padding Self = TypeVar("Self", bound="Field") PaddingValue = Union[Dict[str, ArrayLike], ArrayLike] diff --git a/collatable/fields/index_field.py b/collatable/fields/index_field.py index 29d7cb0..3ee443b 100644 --- a/collatable/fields/index_field.py +++ b/collatable/fields/index_field.py @@ -2,7 +2,7 @@ from collatable.fields.field import Field from collatable.fields.sequence_field import SequenceField -from collatable.typing import IntTensor +from collatable.types import IntTensor class IndexField(Field[IntTensor]): diff --git a/collatable/fields/label_field.py b/collatable/fields/label_field.py index 20d578b..76f5ae7 100644 --- a/collatable/fields/label_field.py +++ b/collatable/fields/label_field.py @@ -3,7 +3,7 @@ import numpy from collatable.fields.field import Field -from collatable.typing import IntTensor +from collatable.types import IntTensor Self = TypeVar("Self", bound="LabelField") LabelT = TypeVar("LabelT", bound=Hashable) diff --git a/collatable/fields/list_field.py b/collatable/fields/list_field.py index 112c836..2ab973b 100644 --- a/collatable/fields/list_field.py +++ b/collatable/fields/list_field.py @@ -2,7 +2,7 @@ from collatable.fields.field import Field, PaddingValue from collatable.fields.sequence_field import SequenceField -from collatable.typing import DataArrayT +from collatable.types import DataArrayT class ListField(Generic[DataArrayT], SequenceField[DataArrayT]): diff --git a/collatable/fields/scalar_field.py b/collatable/fields/scalar_field.py index a36088e..7036350 100644 --- a/collatable/fields/scalar_field.py +++ b/collatable/fields/scalar_field.py @@ -3,8 +3,8 @@ import numpy from collatable.fields.field import Field -from collatable.typing import ScalarT, Tensor -from collatable.util import get_scalar_default_value +from collatable.types import ScalarT, Tensor +from collatable.utils import get_scalar_default_value class ScalarField(Field[Tensor]): diff --git a/collatable/fields/sequence_field.py b/collatable/fields/sequence_field.py index c280a3a..dc099da 100644 --- a/collatable/fields/sequence_field.py +++ b/collatable/fields/sequence_field.py @@ -1,7 +1,7 @@ from typing import Generic, TypeVar from collatable.fields.field import Field -from collatable.typing import DataArrayT +from collatable.types import DataArrayT Self = TypeVar("Self", bound="SequenceField") diff --git a/collatable/fields/sequence_label_field.py b/collatable/fields/sequence_label_field.py index 13e063d..2e31b04 100644 --- a/collatable/fields/sequence_label_field.py +++ b/collatable/fields/sequence_label_field.py @@ -4,7 +4,7 @@ from collatable.fields.field import PaddingValue from collatable.fields.sequence_field import SequenceField -from collatable.typing import IntTensor +from collatable.types import IntTensor LabelT = TypeVar("LabelT", bound=Hashable) diff --git a/collatable/fields/span_field.py b/collatable/fields/span_field.py index dbbf076..6ffaa76 100644 --- a/collatable/fields/span_field.py +++ b/collatable/fields/span_field.py @@ -2,7 +2,7 @@ from collatable.fields.field import Field, PaddingValue from collatable.fields.sequence_field import SequenceField -from collatable.typing import IntTensor +from collatable.types import IntTensor class SpanField(Field[IntTensor]): diff --git a/collatable/fields/tensor_field.py b/collatable/fields/tensor_field.py index a16cd3f..3caf4b2 100644 --- a/collatable/fields/tensor_field.py +++ b/collatable/fields/tensor_field.py @@ -3,7 +3,7 @@ import numpy from collatable.fields.field import Field -from collatable.typing import ArrayLike, TensorT +from collatable.types import ArrayLike, TensorT class TensorField(Generic[TensorT], Field[TensorT]): diff --git a/collatable/typing.py b/collatable/types.py similarity index 100% rename from collatable/typing.py rename to collatable/types.py diff --git a/collatable/util.py b/collatable/utils.py similarity index 95% rename from collatable/util.py rename to collatable/utils.py index 45d5c78..38d027c 100644 --- a/collatable/util.py +++ b/collatable/utils.py @@ -2,7 +2,7 @@ import numpy -from collatable.typing import ArrayLike, DataArray, ScalarT, TensorT +from collatable.types import ArrayLike, DataArray, ScalarT, TensorT def stack_with_padding(