returnn 1.20250828.142552__tar.gz → 1.20250830.114445__tar.gz

{returnn-1.20250828.142552/returnn.egg-info → returnn-1.20250830.114445}/PKG-INFO

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

returnn-1.20250830.114445/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20250830.114445'
+long_version = '1.20250830.114445+git.24547d9'

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/array_.py

@@ -341,7 +341,9 @@ def window(
     """
     if spatial_dim.need_masking():
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(
+                default=True, default_false_for_behavior_version_up_to=22, func_name="window"
+            )
         if use_mask:
             source = source.copy_masked(0, dims=[spatial_dim])
     assert window_dim.dimension is not None
@@ -905,7 +907,9 @@ def scatter(
     indices_dim = indices_dim if isinstance(indices_dim, (list, tuple)) else [indices_dim]
     if any(dim.need_masking() for dim in indices_dim):
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(
+                default=True, default_false_for_behavior_version_up_to=22, func_name="scatter"
+            )
         if use_mask:
             source = source.copy_masked(fill_value, dims=indices_dim)
     else:

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/conv.py

@@ -223,7 +223,7 @@ def conv(
     """
     if any(in_spatial_dim.need_masking() for in_spatial_dim in in_spatial_dims):
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22, func_name="conv")
         if use_mask:
             source = source.copy_masked(0, dims=in_spatial_dims)
     for in_spatial_dim in in_spatial_dims:
@@ -391,7 +391,9 @@ def transposed_conv(
     """transposed conv"""
     if any(in_spatial_dim.need_masking() for in_spatial_dim in in_spatial_dims):
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(
+                default=True, default_false_for_behavior_version_up_to=22, func_name="transposed_conv"
+            )
         if use_mask:
             source = source.copy_masked(0, dims=in_spatial_dims)
     if padding == "same" and _any_is_non_default(strides, default=1) and _should_use_consistent_same_padding():
@@ -503,7 +505,7 @@ def pool(
 
     if any(in_spatial_dim.need_masking() for in_spatial_dim in in_spatial_dims):
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22, func_name="pool")
         if use_mask:
             source = source.copy_masked({"max": float("-inf"), "avg": 0}[mode], dims=in_spatial_dims)
     else:

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/dims.py

@@ -3,7 +3,7 @@ Utilities for dimension tags, dimensions, axes.
 """
 
 from __future__ import annotations
-from typing import Optional, Union, TypeVar, Sequence, Tuple
+from typing import TYPE_CHECKING, Optional, Union, TypeVar, Sequence, Tuple
 from returnn.tensor import Tensor, Dim
 import returnn.frontend as rf
 from ._backend import get_backend_by_tensor, global_backend
@@ -25,6 +25,9 @@ __all__ = [
     "use_mask_default",
 ]
 
+if TYPE_CHECKING:
+    from returnn.config import Config
+
 
 def range_over_dim(dim: Dim, *, dtype: Optional[str] = None, device: Optional[str] = None) -> Tensor[T]:
     """
@@ -309,7 +312,10 @@ def last_frame_position_of_dim(
 
 
 def use_mask_default(
-    *, default: Optional[bool] = None, default_false_for_behavior_version_up_to: Optional[int] = None
+    *,
+    default: Optional[bool] = None,
+    default_false_for_behavior_version_up_to: Optional[int] = None,
+    func_name: Optional[str] = None,
 ) -> Optional[bool]:
     """
     Check the global RETURNN config for the ``rf_use_mask``
@@ -324,20 +330,20 @@ def use_mask_default(
         and if this is set, and the behavior version is less or equal,
         then return False by default, i.e. do not use the mask by default, if it is not defined in the config.
         This takes precedence over `default`.
+    :param func_name: if specified, also check
     :return: what to use for the ``use_mask`` argument by default
     """
     from returnn.config import get_global_config
 
     config = get_global_config(raise_exception=False)
-    config_value = None
     if config:
-        if "rf_use_mask" in config.typed_dict:
-            config_value = config.typed_dict["rf_use_mask"]
-            assert config_value is None or isinstance(config_value, bool)
-        elif "rf_use_mask" in config.dict:
-            config_value = config.bool("rf_use_mask", None)
-    if config_value is not None:
-        return config_value
+        config_value = _get_opt_bool_from_config(config, "rf_use_mask")
+        if config_value is not None:
+            return config_value
+        if func_name:
+            config_value = _get_opt_bool_from_config(config, f"rf_use_mask_{func_name}")
+            if config_value is not None:
+                return config_value
 
     if default_false_for_behavior_version_up_to is not None:
         from returnn.util.basic import BehaviorVersion
@@ -345,3 +351,13 @@ def use_mask_default(
         if BehaviorVersion.get() <= default_false_for_behavior_version_up_to:
             return False
     return default
+
+
+def _get_opt_bool_from_config(config: Config, key: str) -> Optional[bool]:
+    if key in config.typed_dict:
+        config_value = config.typed_dict[key]
+        assert config_value is None or isinstance(config_value, bool)
+        return config_value
+    elif key in config.dict:
+        return config.bool(key, None)
+    return None

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/hooks.py

@@ -16,7 +16,7 @@ T = TypeVar("T")
 
 
 def setup_post_hook_on_method(
-    obj: Any,
+    obj: T,
     attr: str,
     hook: Callable[[T, Tuple[Any, ...], Dict[str, Any], Any], Optional[Any]],
     *,
@@ -40,7 +40,7 @@ class MethodWithHooks:
     """
 
     @classmethod
-    def get(cls, obj: Any, attr: str) -> MethodWithHooks:
+    def get(cls, obj: T, attr: str) -> MethodWithHooks:
         """get existing or init new :class:`MethodWithHooks`"""
         method = getattr(obj, attr)
         if not isinstance(method, MethodWithHooks):
@@ -56,7 +56,7 @@ class MethodWithHooks:
             method.setup()
         return method
 
-    def __init__(self, obj: Any, attr: str):
+    def __init__(self, obj: T, attr: str):
         """
         :param obj:
         :param attr:

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/nested.py

@@ -115,7 +115,7 @@ def _mask(
                 return s
         if not allow_dim_extension or mask_value is None or (isinstance(mask_value, (int, float)) and mask_value == 0):
             if mask.dims_set.issubset(s.dims_set):
-                return rf.where(mask, s, mask_value)
+                return rf.where(mask, s, rf.cast(mask_value, s.dtype))
             assert not mask.dims_set.intersection(s.dims_set)  # not sure...
             return s
         assert isinstance(mask_value, (int, float, Tensor))

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/normalization.py

@@ -218,7 +218,7 @@ class BatchNorm(rf.Module):
 
         if any(d.need_masking() for d in source.dims if d != self.in_dim):
             if self.use_mask is None:
-                use_mask = rf.use_mask_default(default=True)
+                use_mask = rf.use_mask_default(default=True, func_name="BatchNorm")
             else:
                 use_mask = self.use_mask
         else:

{returnn-1.20250828.142552 → returnn-1.20250830.114445}/returnn/frontend/signal.py

@@ -71,7 +71,7 @@ def stft(
     """
     if in_spatial_dim.need_masking():
         if use_mask is None:
-            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22)
+            use_mask = rf.use_mask_default(default=True, default_false_for_behavior_version_up_to=22, func_name="stft")
         if use_mask:
             x = x.copy_masked(0, dims=[in_spatial_dim])
     fft_length = fft_length or frame_length

{returnn-1.20250828.142552 → returnn-1.20250830.114445/returnn.egg-info}/PKG-INFO

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

returnn-1.20250828.142552/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20250828.142552'
-long_version = '1.20250828.142552+git.f81cb9a'