returnn 1.20251015.11141__py3-none-any.whl → 1.20251020.105935__py3-none-any.whl

returnn/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20251015.11141
+Version: 1.20251020.105935
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn/_setup_info_generated.py

@@ -1,2 +1,2 @@
-version = '1.20251015.011141'
-long_version = '1.20251015.011141+git.3f6ddf8'
+version = '1.20251020.105935'
+long_version = '1.20251020.105935+git.d9d5b9f'

returnn/tensor/_dim_extra.py

@@ -18,6 +18,8 @@ if TYPE_CHECKING:
     # just for type hints, otherwise use _d.Dim
     from .dim import Dim
 
+    from returnn.datasets.util.vocabulary import Vocabulary
+
 from . import dim as _d
 from . import tensor as _t
 from . import marked_dim as _m
@@ -41,54 +43,63 @@ class _DimExtra:
         self,
         *,
         dim: Dim,
-        kind=DimTypes.Unspecified,
-        vocab=None,
-        undefined=False,
-        special=False,
-        auto_generated=False,
-        match_priority=0,
-        derived_from_tag=None,
-        derived_from_op=None,
-        batch=None,
-        control_flow_ctx=None,
+        kind: Entity = DimTypes.Unspecified,
+        vocab: Union[None, Dict[str, Any], Vocabulary] = None,
+        undefined: bool = False,
+        special: bool = False,
+        auto_generated: bool = False,
+        match_priority: int = 0,
+        derived_from_tag: Optional[Dim] = None,
+        derived_from_op: Optional[Op] = None,
+        batch: Optional[BatchInfo] = None,
+        control_flow_ctx: Optional[ControlFlowContext] = None,
         src_data: Optional[_t.Tensor] = None,
         src_axis: Optional[int] = None,
     ):
         """
         :param dim:
-        :param Entity|None kind:
-        :param returnn.datasets.util.vocabulary.Vocabulary|None vocab:
-        :param bool undefined: When this is specified as `None` by the user via `shape`.
-        :param bool special: this can not be a dim tag of :class:`Tensor`.
+        :param kind:
+        :param vocab:
+        :param undefined: When this is specified as `None` by the user via `shape`.
+        :param special: this can not be a dim tag of :class:`Tensor`.
             But this dim tag also does not match anything except itself.
             So it can be used to represent special placeholders with special meanings like ``single_step``.
-        :param bool auto_generated:
+        :param auto_generated:
             This is auto-generated by RETURNN because it was not explicitly specified by the user.
             E.g. for ConvLayer and others.
             This implies certain behavior on equality, such as comparing the description,
             to allow for several independent creations of the dim tag during template construction.
-        :param Dim|None derived_from_tag:
+        :param derived_from_tag:
             Whether this new tag is reduced, down/up sampled, padded etc from this given other tag.
             In situations where dim tags are being matched (Data.get_common_data),
             the behavior is to consider them as equal,
             and assume that the chain of operations (e.g. padding + valid conv) results in the same dim.
-        :param Op|None derived_from_op:
-        :param int match_priority: when there is ambiguity between multiple dim tags, this value defines the order
+        :param derived_from_op:
+        :param match_priority: when there is ambiguity between multiple dim tags, this value defines the order
             in which the dimension are assigned to their matching counterparts.
             A dimension tag with a higher priority value is assigned first.
             E.g. for a square matrix used for a linear transformation,
             the reduce dim tag should have a higher priority.
-        :param BatchInfo|None batch: for batch-dim, or dynamic dims per batch
-        :param ControlFlowContext|None control_flow_ctx:
+        :param batch: for batch-dim, or dynamic dims per batch
+        :param control_flow_ctx:
         :param src_data:
         :param src_axis:
         """
         self.dim = dim
         assert kind is None or (isinstance(kind, Entity) and kind in DimTypes.Types)
         self.kind = kind
+        if vocab:
+            from returnn.datasets.util.vocabulary import Vocabulary
+
+            if isinstance(vocab, Vocabulary):
+                pass
+            elif isinstance(vocab, dict):
+                vocab = Vocabulary.create_vocab(**vocab)
+            else:
+                raise TypeError(f"invalid vocab {vocab!r} type {type(vocab)}")
         self.vocab = vocab
-        self.same_as = None  # type: Optional[_d.Dim]
-        self.copy_same_as = None  # type: Optional[_d.Dim]
+        self.same_as: Optional[Dim] = None
+        self.copy_same_as: Optional[Dim] = None
         self.derived_from_tag = derived_from_tag
         self.derived_from_op = derived_from_op
         if derived_from_op and not derived_from_op.output:
@@ -116,8 +127,8 @@ class _DimExtra:
         self.auto_generated = auto_generated
         # We can have different tag variants per batch info (e.g. with beam), or per control flow ctx.
         # They each have same_as = self. The same_base should have the base (global) batch info.
-        self.same_for_batch_ctx = {}  # type: Dict[Tuple[BatchInfo,Optional[ControlFlowContext]],_d.Dim]
-        self.cache_dyn_size_ext_dev = {}  # type: Dict[str,_t.Tensor]  # device -> dyn_size_ext
+        self.same_for_batch_ctx: Dict[Tuple[BatchInfo, Optional[ControlFlowContext]], Dim] = {}
+        self.cache_dyn_size_ext_dev: Dict[str, _t.Tensor] = {}  # device -> dyn_size_ext
         self.cache_seq_mask: Dict[Tuple[str, Optional[Tuple[Dim, ...]]], _t.Tensor] = {}  # (dev,dim_order) -> seq_mask
         self.cache_dim_math = _CacheDimMath()  # op (add,sub,...), operand -> Dim
 
@@ -134,6 +145,7 @@ class _DimExtra:
     def __setstate__(self, state):
         self.__dict__.update(state)
         if self.kind is not None:
+            # noinspection PyTypeChecker
             self.kind = {v.name: v for v in DimTypes.Types}[self.kind]
 
     def __sis_state__(self):

{returnn-1.20251015.11141.dist-info → returnn-1.20251020.105935.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20251015.11141
+Version: 1.20251020.105935
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

{returnn-1.20251015.11141.dist-info → returnn-1.20251020.105935.dist-info}/RECORD

@@ -1,9 +1,9 @@
-returnn/PKG-INFO,sha256=VOfgnMpcIvjpwzI4DzmATgDzvBRNh-Dj3a7YhBCilZc,5214
+returnn/PKG-INFO,sha256=d-HPlXh1xUoY5v04CS8o4TAtIlgaext6tyRN2PG_lkQ,5215
 returnn/__init__.py,sha256=biBtRsM0WZ406vShaeH-9WFoqJ8XwTbn6g0EeFJ7l8E,1012
 returnn/__main__.py,sha256=lHyZcu_0yc9f7Vf_Kfdy9PmeU0T76XVXnpalHi5WKro,31740
 returnn/__old_mod_loader__.py,sha256=nvsNY-xELdS_IPNkv66Q9Rmvg4dbGW0-EBRDcCmctos,7654
 returnn/__setup__.py,sha256=22kQn2fh11iPM0hLb2Fy5sLmoU1JGvmDxXRYuRgQkwU,4659
-returnn/_setup_info_generated.py,sha256=bVOlPSQ5P21CME4N5V6LA0SqMKNYsw9fQ9eqJvcU2kw,77
+returnn/_setup_info_generated.py,sha256=TchYaay6OjM0dabh0WfmCarERabRL3tGHUI6Squlpzc,77
 returnn/config.py,sha256=3tmKhB6FnQZaNdtcYsiB61JnEY--iZ2qmJ4yq0b6tE0,29140
 returnn/forward_iface.py,sha256=A_OJiaXsX4MlXQRzST86ylyxSUZbC402PQL1REcqHjM,911
 returnn/learning_rate_control.py,sha256=ZvWryAn_tv9DhV8sh1LV3eE34Yltl3On3mYZAG4hR9s,34684
@@ -155,7 +155,7 @@ returnn/sprint/extern_interface.py,sha256=l-v1X-Yg0UpTFe7Y3c4FwWOqpSNuv9Oy5EzqlK
 returnn/sprint/interface.py,sha256=1j5SB0V8hSW8A5song9ciZtcBnZoKKfNipk9ezOIMuA,36491
 returnn/tensor/README.md,sha256=X6BqcRLrPLPnwF9yR69uqIFrMnNluj9pBkOPHwNgzuo,501
 returnn/tensor/__init__.py,sha256=on6j5PEOQpck50UcsR4nJzJSDmoVy34z1Oq4efv6Ax0,154
-returnn/tensor/_dim_extra.py,sha256=N9qkz-1WZZY0XbpFjLg4aaNie3NfadvmanHcTOFoKeg,116154
+returnn/tensor/_dim_extra.py,sha256=sZMW5kwyOWOjUdRos5MIxUZOqgBHF99bu9zX2a4HV0Q,116604
 returnn/tensor/_tensor_extra.py,sha256=1UPNisRAbljkvfMcrEXaPAF-2Dz7AdgC3jAKVVAnAO8,165084
 returnn/tensor/_tensor_mixin_base.py,sha256=H5z86I0NejxrSgMH1c5oXQzBqS6L9HpvP4y7oegBaSc,643
 returnn/tensor/_tensor_op_overloads.py,sha256=HklwuTBjy7mH_665VKaCUdu-oC3aa7Uz1ZQiCz4jeZc,5448
@@ -254,8 +254,8 @@ returnn/util/sig_proc.py,sha256=Tjz0VOAVyqu2qDCF5HZ1JjALjcFsHcNkcd96WgZeKfE,7265
 returnn/util/task_system.py,sha256=y4sMVXQ25Qd2z0rx03uOlXlkE-jbCYC1Sjfn-XlraVU,26003
 returnn/util/train_proc_manager.py,sha256=Pjht28k6uz6BNQ47uW6Gf880iyq5q4wx7P_K2tmoAM8,3266
 returnn/util/watch_memory.py,sha256=BR5P2kvBN6UI81cE0_1WAA6Hd1SByLbBaiDxvLhPOew,4213
-returnn-1.20251015.11141.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
-returnn-1.20251015.11141.dist-info/METADATA,sha256=VOfgnMpcIvjpwzI4DzmATgDzvBRNh-Dj3a7YhBCilZc,5214
-returnn-1.20251015.11141.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-returnn-1.20251015.11141.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
-returnn-1.20251015.11141.dist-info/RECORD,,
+returnn-1.20251020.105935.dist-info/LICENSE,sha256=ywBD_U2aD4vpuoIgNAsjIGBYydl0tVKll3De0Z8s77c,11041
+returnn-1.20251020.105935.dist-info/METADATA,sha256=d-HPlXh1xUoY5v04CS8o4TAtIlgaext6tyRN2PG_lkQ,5215
+returnn-1.20251020.105935.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+returnn-1.20251020.105935.dist-info/top_level.txt,sha256=Lsn4WZc5Pbfk0-xDQOgnFCxOoqxL4CyeM3N1TFbJncw,8
+returnn-1.20251020.105935.dist-info/RECORD,,