Rename modules

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

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:

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)

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")

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")

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)

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]

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]):

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)

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]):

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]):

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")
 

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)
 

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]):

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]):

collatable/util.py → 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(