Braindecode 1.8.1.dev178237886__tar.gz → 1.8.1.dev178298903__tar.gz

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/NOTICE.txt

@@ -52,6 +52,7 @@ The following components are licensed under the MIT License:
 - `braindecode/modules/linear_attention.py`
 - `braindecode/models/seizure_transformer.py`
 - `docs/_static/model/seizure_transformer_arch.png`
+- `braindecode/models/guetschel2026.py`
 - `braindecode/models/tmsanet.py`
 
 The `brainomni.py` file is a derivative of `OpenTSLab/BrainOmni` (MIT), whose

{braindecode-1.8.1.dev178237886/braindecode.egg-info → braindecode-1.8.1.dev178298903}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.1.dev178237886
+Version: 1.8.1.dev178298903
 Summary: Deep learning software to decode EEG, ECG or MEG signals
 Author-email: Robin Tibor Schirrmeister <robintibor@gmail.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Alexandre Gramfort <agramfort@meta.com>
 Maintainer-email: Alexandre Gramfort <agramfort@meta.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Robin Tibor Schirrmeister <robintibor@gmail.com>

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/augmentation/functional.py

@@ -932,7 +932,7 @@ def _rotate_signals(
         transformed_X = X.clone()
         sensors_positions = list(sensors_positions_matrix)
         for s, rot_sensors_matrix in enumerate(rot_sensors_matrices):
-            rot_sensors_positions = list(rot_sensors_matrix.T)
+            rot_sensors_positions = list(rot_sensors_matrix)
             for time in range(X.shape[-1]):
                 interpolator_t = Rbf(*sensors_positions, X[s, :, time])
                 transformed_X[s, :, time] = torch.from_numpy(

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/datasets/base.py

@@ -14,13 +14,16 @@ from __future__ import annotations
 import bisect
 import html as _html
 import json
+import mmap
 import os
 import shutil
 import warnings
 from abc import abstractmethod
 from collections import Counter
-from collections.abc import Callable, Hashable
+from collections.abc import Callable, Hashable, Sequence
 from glob import glob
+from itertools import chain
+from operator import attrgetter
 from pathlib import Path
 from typing import Any, Generic, Iterable, no_type_check
 
@@ -28,6 +31,7 @@ import mne
 import mne.io
 import numpy as np
 import pandas as pd
+from mne.io.constants import FIFF
 from mne.utils import _soft_import
 from mne.utils.docs import deprecated
 from torch.utils.data import ConcatDataset, Dataset, IterableDataset
@@ -220,6 +224,125 @@ def _compute_ch_pos(info, targets_from):
     return pos
 
 
+_TAG_ROW = attrgetter("kind", "type", "size", "next", "pos")
+
+
+def _tag_rows(tags):
+    """(kind, type, size, next, pos) of FIF tags as an int64 array (n, 5)."""
+    flat = chain.from_iterable(map(_TAG_ROW, tags))
+    return np.fromiter(flat, np.int64, 5 * len(tags)).reshape(-1, 5)
+
+
+class _FifTagTable(Sequence):
+    """The data-buffer tags of a lazy FIF raw as one int64 array.
+
+    mne's FIF reader keeps one ``Tag`` object per data buffer in
+    ``raw._raw_extras[i]["ent"]`` (one per second of signal with mne's default
+    buffers), each with its attribute dict and integers once unpickled. A lazy
+    dataset of many recordings holds millions of them in RAM, and every forked
+    DataLoader worker copies the memory pages of those it reads (reference
+    counts). This holds the same fields in 40 bytes per buffer and returns an
+    equal ``Tag`` on access, so mne's own reads are unchanged.
+    """
+
+    def __init__(self, tags):
+        self.tag_class = type(tags[0])
+        self.table = _tag_rows(tags)
+
+    def __len__(self):
+        return len(self.table)
+
+    def __getitem__(self, i):
+        if isinstance(i, slice):
+            return [self.tag_class(*row) for row in self.table[i].tolist()]
+        return self.tag_class(*self.table[i].tolist())
+
+
+_TAG_FIELDS = ("kind", "type", "size", "next", "pos", "data")
+
+
+def _compact_fif_tags(inst):
+    """Swap the ``Tag`` lists of a FIF raw for `_FifTagTable` (in place).
+
+    Only gap-free lists of directory tags (no ``None``, no ``data``) with mne's
+    ``Tag`` fields are swapped; anything else is left as mne built it.
+    """
+    for extra in getattr(inst, "_raw_extras", ()):
+        tags = extra.get("ent")
+        if not isinstance(tags, list) or not tags:
+            continue
+        cls = type(tags[0])
+        if tuple(getattr(cls, "__dataclass_fields__", ())) == _TAG_FIELDS and all(
+            type(t) is cls and t.data is None for t in tags
+        ):
+            extra["ent"] = _FifTagTable(tags)
+    return inst
+
+
+def _read_fif_window(raw, start, stop, willneed=False):
+    """Samples ``start:stop`` of a lazy FIF raw, copied from the file in one go.
+
+    mne reads, casts and calibrates the FIF data buffers of a range one at a
+    time (60 Python steps for a 60-s window saved with 1-s buffers, each through
+    a buffered file whose buffer is 4 MB on network file systems). Here one
+    slice of the memory-mapped file holds the bytes of every buffer in the
+    range and one multiply calibrates them, with mne's arithmetic (float64 data
+    times ``raw._cals``), so the values equal ``raw._getitem``'s. Returns None
+    (the caller uses mne) unless ``raw`` is a lazy, single-file, uncompressed
+    FIF raw of float32 buffers without projector, compensation or gaps.
+
+    With ``willneed=True`` nothing is read and None is returned: the OS is
+    only asked to start reading the window's bytes into the page cache in the
+    background (``posix_fadvise(POSIX_FADV_WILLNEED)``).
+    """
+    if (
+        not isinstance(raw, mne.io.Raw)
+        or raw.preload
+        or len(raw._raw_extras) != 1
+        or raw._projector is not None
+        or raw._comp is not None
+    ):
+        return None
+    extra = raw._raw_extras[0]
+    fname, bounds = extra["filename"], extra["bounds"]
+    if not isinstance(fname, Path) or fname.suffix == ".gz":
+        return None
+    start, stop = start + raw._first_samps[0], stop + raw._first_samps[0]
+    first = np.searchsorted(bounds, start, side="right") - 1
+    tags = extra["ent"]
+    if isinstance(tags, _FifTagTable):
+        rows = tags.table[first : np.searchsorted(bounds, stop)]
+    else:
+        tags = tags[first : np.searchsorted(bounds, stop)]
+        if any(t is None for t in tags):
+            return None
+        rows = _tag_rows(tags)
+    if not len(rows) or (rows[:, 1] != FIFF.FIFFT_FLOAT).any():
+        return None
+    size, pos = rows[:, 2].tolist(), rows[:, 4].tolist()
+    if willneed:  # only a hint: any error is left to the read itself
+        try:
+            with open(fname, "rb") as f:
+                os.posix_fadvise(
+                    f.fileno(),
+                    pos[0],
+                    pos[-1] + 16 + size[-1] - pos[0],
+                    os.POSIX_FADV_WILLNEED,
+                )
+        except OSError:
+            pass
+        return None
+    # mmap: no copy through a 4 MB read buffer, and a cold file is read around
+    # the window by the kernel (as mne's 4 MB reads did), not window by window
+    with open(fname, "rb") as f, mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as m:
+        buf = m[pos[0] : pos[-1] + 16 + size[-1]]
+    one = np.concatenate(
+        [np.frombuffer(buf, ">f4", s // 4, p + 16 - pos[0]) for s, p in zip(size, pos)]
+    ).reshape(-1, extra["orig_nchan"])[start - bounds[first] : stop - bounds[first]]
+    picked = one[:, raw._read_picks[0]].T
+    return np.multiply(picked, raw._cals[:, np.newaxis], order="C")
+
+
 def _window_info(crop_inds, sfreq):
     """Extract window size from crop indices.
 
@@ -823,9 +946,11 @@ class EEGWindowsDataset(_ZarrMixin, RecordDataset):
         if self._zarr_data is not None:
             X = self._zarr_data[:, i_start:i_stop]
         else:
-            X = self.raw._getitem(
-                (slice(None), slice(i_start, i_stop)), return_times=False
-            )
+            X = _read_fif_window(self.raw, i_start, i_stop)
+            if X is None:
+                X = self.raw._getitem(
+                    (slice(None), slice(i_start, i_stop)), return_times=False
+                )
         X = np.array(X, dtype="float32")
         if self.transform is not None:
             X = self.transform(X)
@@ -1253,7 +1378,8 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
     def __len__(self):
         return self._ensure_cumulative_sizes()[-1]
 
-    def _get_single_item(self, idx: int):
+    def _locate(self, idx: int):
+        """The dataset that holds item ``idx`` and the item's index in it."""
         if idx < 0:
             if -idx > len(self):
                 raise ValueError(
@@ -1267,7 +1393,33 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
             sample_idx = idx
         else:
             sample_idx = idx - cumulative_sizes[dataset_idx - 1]
-        return self.datasets[dataset_idx][sample_idx]
+        return self.datasets[dataset_idx], sample_idx
+
+    def _get_single_item(self, idx: int):
+        ds, i = self._locate(idx)
+        return ds[i]
+
+    def __getitems__(self, indices):
+        """Items ``indices``, as ``[self[i] for i in indices]``.
+
+        A :class:`~torch.utils.data.DataLoader` fetches each batch through
+        this. The lazy FIF windows of the batch are first requested from the
+        OS all at once (``posix_fadvise(POSIX_FADV_WILLNEED)``, where it
+        exists), so their reads from disk overlap instead of running one after
+        another: on a network file system a batch read from cold files then
+        costs about one round trip, not one per window.
+        """
+        # ponytail: advises the whole batch at once; chunk it if a batch's
+        # windows ever outgrow the page cache
+        if hasattr(os, "posix_fadvise"):
+            for idx in indices:
+                if not isinstance(idx, (int, np.integer)):
+                    continue  # e.g. a SequenceSampler tuple: read, not advised
+                ds, i = self._locate(idx)
+                if isinstance(ds, EEGWindowsDataset) and ds._zarr_data is None:
+                    _, start, stop = ds.crop_inds[i].tolist()
+                    _read_fif_window(ds.raw, start, stop, willneed=True)
+        return [self[idx] for idx in indices]
 
     def __getitem__(self, idx: int | list):
         """
@@ -1672,7 +1824,8 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
                 kwargs_path = os.path.join(path, ".".join([kwarg_name, "json"]))
                 kwargs = getattr(self, kwarg_name)
                 if kwargs is not None:
-                    json.dump(kwargs, open(kwargs_path, "w"))
+                    with open(kwargs_path, "w") as f:
+                        json.dump(kwargs, f)
 
     @property
     def description(self) -> pd.DataFrame:
@@ -1742,7 +1895,10 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
         # Create path if it doesn't exist
         os.makedirs(path, exist_ok=True)
 
-        path_contents = os.listdir(path)
+        # With an offset the caller fills one directory piece by piece (preprocess
+        # saves each recording at its index), so the other entries are expected:
+        # skip the scan that would stat them all on every call and list them in a warning.
+        path_contents = os.listdir(path) if offset == 0 else []
         n_sub_dirs = len(
             [e for e in path_contents if os.path.isdir(os.path.join(path, e))]
         )

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/datasets/tuh.py

@@ -11,10 +11,12 @@ TUH Abnormal EEG Corpus.
 from __future__ import annotations
 
 import glob
+import json
 import os
 import re
 import warnings
 from datetime import datetime, timezone
+from functools import cache
 from pathlib import Path
 from typing import Iterable, Literal
 from unittest import mock
@@ -183,11 +185,8 @@ class TUH(BaseConcatDataset):
         }
         raw.rename_channels(mapping_strip)
 
-        montage1005 = mne.channels.make_standard_montage(
-            resolve_montage_name("standard_1005")
-        )
         mapping_eeg_names = {
-            c.upper(): c for c in montage1005.ch_names if c.upper() in raw.ch_names
+            c.upper(): c for c in _standard_1005().ch_names if c.upper() in raw.ch_names
         }
 
         # Set channels whose type could not be inferred (defaulted to "eeg") to "misc":
@@ -210,10 +209,7 @@ class TUH(BaseConcatDataset):
 
     @staticmethod
     def _set_montage(raw):
-        montage = mne.channels.make_standard_montage(
-            resolve_montage_name("standard_1005")
-        )
-        raw.set_montage(montage, on_missing="ignore")
+        raw.set_montage(_standard_1005(), on_missing="ignore")
 
     @staticmethod
     def _create_dataset(
@@ -245,7 +241,11 @@ class TUH(BaseConcatDataset):
         # file paths, use this instead as before
         if "year" in description:
             meas_date = meas_date.replace(*description[["year", "month", "day"]])
-        raw.set_meas_date(meas_date)
+        # FIF (e.g. preprocess(..., save_dir=...)) stores dates from 1901-12-13 to
+        # 2038-01-19 only: undated recordings (year 1 above) and de-identified ones
+        # (TUAB has 1899-12-30) keep their date in the description only.
+        in_fif_range = -(2**31) <= meas_date.timestamp() < 2**31
+        raw.set_meas_date(meas_date if in_fif_range else None)
 
         d = {
             "age": int(age),
@@ -255,9 +255,9 @@ class TUH(BaseConcatDataset):
         # if not, get it from meas_date in raw.info and add to description
         # if meas_date is None, create fake one
         if "year" not in description:
-            d["year"] = raw.info["meas_date"].year
-            d["month"] = raw.info["meas_date"].month
-            d["day"] = raw.info["meas_date"].day
+            d["year"] = meas_date.year
+            d["month"] = meas_date.month
+            d["day"] = meas_date.day
 
         # read info relevant for preprocessing from raw without loading it
         if add_physician_reports:
@@ -269,6 +269,12 @@ class TUH(BaseConcatDataset):
         return base_dataset
 
 
+@cache
+def _standard_1005():
+    # Built once per process: set_montage copies the montage before using it.
+    return mne.channels.make_standard_montage(resolve_montage_name("standard_1005"))
+
+
 def _create_description(file_paths, version, ds_name):
     descriptions = [
         _parse_description_from_file_path(f, version, ds_name) for f in file_paths
@@ -289,7 +295,8 @@ def _read_date(file_path):
     date_path = file_path.replace(".edf", "_date.txt")
     # if date file exists, read it
     if os.path.exists(date_path):
-        description = pd.read_json(date_path, typ="series").to_dict()
+        with open(date_path) as f:
+            description = json.load(f)
     # otherwise read edf file, extract date and store to file
     else:
         raw = mne.io.read_raw_edf(file_path, preload=False, verbose="error")

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/datautil/serialization.py

@@ -21,6 +21,7 @@ from ..datasets.base import (
     EEGWindowsDataset,
     RawDataset,
     WindowsDataset,
+    _compact_fif_tags,
 )
 
 
@@ -79,7 +80,8 @@ def _outdated_load_concat_dataset(path, preload, ids_to_load=None, target_name=N
     for path in paths:
         if is_raw and target_name is None:
             target_file_name = path / "target_name.json"
-            target_name = json.load(open(target_file_name, "r"))["target_name"]
+            with open(target_file_name) as f:
+                target_name = json.load(f)["target_name"]
 
         all_signals, description = _load_signals_and_description(
             path=path, preload=preload, is_raw=is_raw, ids_to_load=ids_to_load
@@ -141,7 +143,7 @@ def _load_signals(fif_file, preload, is_raw):
         if all(Path(f).exists() for f in signals.filenames):
             if preload:
                 signals.load_data()
-            return signals
+            return _compact_fif_tags(signals)
         else:  # This may happen if the file has been moved together with the pickle file.
             warnings.warn(
                 f"Pickle file {pkl_file} exists, but the referenced fif "
@@ -171,7 +173,8 @@ def _load_signals(fif_file, preload, is_raw):
             if preload:
                 signals._data, signals.preload = data, True
 
-    return signals
+    # after the pickle above, which keeps mne's own layout on disk
+    return _compact_fif_tags(signals)
 
 
 def load_concat_dataset(path, preload, ids_to_load=None, target_name=None, n_jobs=1):
@@ -264,7 +267,8 @@ def _load_parallel(path, i, preload, is_raw, has_stored_windows):
     target_file_path = sub_dir / "target_name.json"
     target_name = None
     if target_file_path.exists():
-        target_name = json.load(open(target_file_path, "r"))["target_name"]
+        with open(target_file_path) as f:
+            target_name = json.load(f)["target_name"]
 
     if is_raw and (not has_stored_windows):
         dataset = RawDataset(signals, description, target_name)
@@ -304,8 +308,8 @@ def _load_kwargs_json(kwargs_name, sub_dir):
     kwargs_file_name = ".".join([kwargs_name, "json"])
     kwargs_file_path = os.path.join(sub_dir, kwargs_file_name)
     if os.path.exists(kwargs_file_path):
-        kwargs = json.load(open(kwargs_file_path, "r"))
-        return kwargs
+        with open(kwargs_file_path) as f:
+            return json.load(f)
 
 
 def _is_outdated_saved(path):

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/__init__.py

@@ -39,6 +39,7 @@ from .emg2qwerty import EMG2QwertyNet
 from .fbcnet import FBCNet
 from .fblightconvnet import FBLightConvNet
 from .fbmsnet import FBMSNet
+from .guetschel2026 import Guetschel2026
 from .hybrid import HybridNet
 from .ifnet import IFNet
 from .labram import Labram
@@ -139,6 +140,7 @@ __all__ = [
     "FBCNet",
     "FBLightConvNet",
     "FBMSNet",
+    "Guetschel2026",
     "MetaNeuromotorHand",
     "HybridNet",
     "IFNet",

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/attn_sleep.py

@@ -143,6 +143,10 @@ class AttnSleep(EEGModuleMixin, nn.Module):
             sfreq=sfreq,
         )
         del n_outputs, n_chans, chs_info, n_times, input_window_seconds, sfreq
+        if self._n_chans_for_jit not in (None, 1):
+            raise ValueError(
+                f"AttnSleep takes single-channel input; got n_chans={self._n_chans_for_jit}."
+            )
 
         self.mapping = {
             "fc.weight": "final_layer.weight",

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/axon.py

@@ -363,8 +363,11 @@ class _AXONEncoder(nn.Module):
         position = spatial.unsqueeze(1) + temporal.unsqueeze(0)  # (C, P, D)
         tokens = tokens + position.unsqueeze(0).to(tokens.dtype)
 
-        index = torch.arange(n_patches, device=tokens.device)
-        band = (index.unsqueeze(0) - index.unsqueeze(1)).abs() <= self.temporal_window
+        # Up to temporal_window + 1 patches the band covers every pair: no mask.
+        band: Optional[torch.Tensor] = None
+        if n_patches > self.temporal_window + 1:
+            index = torch.arange(n_patches, device=tokens.device)
+            band = (index[None] - index[:, None]).abs() <= self.temporal_window
 
         for block in self.blocks:
             tokens = block(tokens, band)
@@ -464,19 +467,23 @@ class _AxisAttention(nn.Module):
         )
         return attended.transpose(1, 2).reshape(n_seq, length, -1)
 
-    def forward(self, x: torch.Tensor, band: torch.Tensor) -> torch.Tensor:
+    def forward(self, x: torch.Tensor, band: Optional[torch.Tensor]) -> torch.Tensor:
         batch, n_chans, n_patches, dim = x.shape
         axis_weights = self.axis_gate(x)  # (B, C, P, 2)
         scale_weights = self.scale_gate(x)  # (B, C, P, 2)
 
-        # Temporal path: one sequence of P tokens per electrode.
+        # Temporal path: one sequence of P tokens per electrode. Without a band
+        # the restricted branch is the full one; attend once unless the two
+        # branches draw their own attention dropout.
         per_channel = self.temporal_qkv(x.reshape(batch * n_chans, n_patches, dim))
         restricted = self.temporal_out(self._attend(per_channel, band)).reshape(
             batch, n_chans, n_patches, dim
         )
-        full = self.temporal_out(self._attend(per_channel, None)).reshape(
-            batch, n_chans, n_patches, dim
-        )
+        full = restricted
+        if band is not None or (self.training and self.att_drop_prob > 0):
+            full = self.temporal_out(self._attend(per_channel, None)).reshape(
+                batch, n_chans, n_patches, dim
+            )
         temporal = scale_weights[..., 0:1] * restricted + scale_weights[..., 1:2] * full
 
         # Spatial path: one sequence of C tokens per time step.
@@ -511,6 +518,6 @@ class _AXONBlock(nn.Module):
         self.norm_ffn = nn.RMSNorm(embed_dim, eps=1e-8)
         self.ffn = _GatedFeedForward(embed_dim, ffn_expansion)
 
-    def forward(self, x: torch.Tensor, band: torch.Tensor) -> torch.Tensor:
+    def forward(self, x: torch.Tensor, band: Optional[torch.Tensor]) -> torch.Tensor:
         x = x + self.attn(self.norm_attn(x), band)
         return x + self.ffn(self.norm_ffn(x))

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/base.py

@@ -46,6 +46,24 @@ _GEOMETRY_KWARGS = (
 )
 
 
+def _too_short_input_error(exc: RuntimeError, input_shape) -> Optional[ValueError]:
+    """ValueError for a layer that found the input too short, else None."""
+    if not str(exc).endswith(
+        (
+            "Output size is too small",
+            "Kernel size can't be greater than actual input size",
+        )
+    ):
+        return None
+    return ValueError(
+        "During model prediction RuntimeError was thrown showing that at some "
+        f"layer `{str(exc).split('.')[-1]}` (see above in the stacktrace). This "
+        "could be caused by providing too small `n_times`/`input_window_seconds`. "
+        "Model may require longer chunks of signal in the input than "
+        f"{input_shape}."
+    )
+
+
 _HF_INSTALL_HINT = (
     "requires the `huggingface_hub` package. "
     "Install with: pip install 'braindecode[hub]'"
@@ -483,6 +501,18 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
         # Called by torch.jit.script before compiling the model.
         return make_parametrizations_scriptable(self)
 
+    def __call__(self, *args, **kwargs):
+        # An input shorter than the layers need raises ValueError, not a torch
+        # RuntimeError from deep inside forward.
+        try:
+            return super().__call__(*args, **kwargs)
+        except RuntimeError as exc:
+            shape = tuple(args[0].shape) if args and hasattr(args[0], "shape") else None
+            error = _too_short_input_error(exc, shape)
+            if error is None:
+                raise
+            raise error from exc
+
     def get_output_shape(self) -> tuple[int, ...]:
         """Returns shape of neural network output for batch size equal 1.
 
@@ -506,21 +536,10 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
                     .shape
                 )
             except RuntimeError as exc:
-                if str(exc).endswith(
-                    (
-                        "Output size is too small",
-                        "Kernel size can't be greater than actual input size",
-                    )
-                ):
-                    msg = (
-                        "During model prediction RuntimeError was thrown showing that at some "
-                        f"layer `{str(exc).split('.')[-1]}` (see above in the stacktrace). This "
-                        "could be caused by providing too small `n_times`/`input_window_seconds`. "
-                        "Model may require longer chunks of signal in the input than "
-                        f"{self.input_shape}."
-                    )
-                    raise ValueError(msg) from exc
-                raise exc
+                error = _too_short_input_error(exc, self.input_shape)
+                if error is None:
+                    raise
+                raise error from exc
 
     def get_config(self) -> dict:
         """Return a JSON-serializable dict of all ``__init__`` parameters.

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/brainomni.py

@@ -29,15 +29,21 @@ from braindecode.modules.quantization import ResidualVectorQuantizer
 
 
 class _SELU(nn.SELU):
-    """``nn.SELU`` written as ``scale * x`` / ELU: same values and gradients, and
-    trainable on Gaudi, whose ELU backward only supports ``scale == 1``."""
+    """``nn.SELU`` as ``ELU(x, alpha * scale)`` times ``scale`` where ``x > 0``:
+    same values and gradients, and trainable on Gaudi, whose ELU backward only
+    supports ``scale == 1``."""
 
     def forward(self, x: torch.Tensor) -> torch.Tensor:
         alpha, scale = (
             1.6732632423543772848170429916717,
             1.0507009873554804934193349852946,
         )
-        return torch.where(x > 0, x * scale, F.elu(x, alpha * scale))
+        # ELU is x on the positive side, so this equals the where(x > 0, x * scale,
+        # elu) form bit for bit, without its zero-filled where backward. The
+        # factor is at least float32, like the scalar multiply's compute type.
+        one = x.new_ones((), dtype=torch.promote_types(x.dtype, torch.float32))
+        factor = torch.where(x > 0, one * scale, one)
+        return (F.elu(x, alpha * scale) * factor).to(x.dtype)
 
 
 class BrainTokenizer(EEGModuleMixin, nn.Module, license="mit"):
@@ -863,9 +869,13 @@ class _SEANetConv1d(nn.Module):
         extra = (kernel_size - padding_total - x.shape[-1]) % stride
         right = padding_total // 2
         padding = (padding_total - right, right + extra)
+        if max(padding) == 0:  # 1x1 convs: padding would only copy x
+            return self.conv(x)
         # Zero-extend a signal too short to reflect, as EnCodec does.
         short = max(max(padding) - x.shape[-1] + 1, 0)
-        x = F.pad(F.pad(x, (0, short)), padding, mode="reflect")
+        if short > 0:  # F.pad with nothing to pad still copies x
+            x = F.pad(x, (0, short))
+        x = F.pad(x, padding, mode="reflect")
         return self.conv(x[..., : x.shape[-1] - short])
 
 

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/codebrain.py

@@ -15,6 +15,7 @@ from torch import nn
 from torch.nn.utils.parametrizations import weight_norm
 
 from braindecode.functional import spectral_input
+from braindecode.functional.functions import _next_fast_len
 from braindecode.models.base import EEGModuleMixin
 
 
@@ -521,16 +522,21 @@ class _GConv(nn.Module):
             kernel = F.pad(k_fwd, (0, seq_len)) + F.pad(k_bwd.flip(-1), (seq_len, 0))
 
         # FFT-based convolution: O(N log N)
+        # The bidirectional kernel is circular (lags 0..L-1, then -L..-1).
+        # Rolled to lags -L..L-1 it is a linear convolution read from lag 0,
+        # so any FFT length >= 2 * seq_len works: take a 5-smooth (fast) one.
+        start = seq_len if self.bidirectional else 0
+        n_fft = 2 * _next_fast_len(seq_len)
         # kernel_freq: (channels, d_model, freq_bins)
         # spectral_input(x) dtype: x's, at least float32 (the reference's .float()).
         x_in = spectral_input(x)
-        kernel_freq = torch.fft.rfft(kernel.to(x_in), n=2 * seq_len)
+        kernel_freq = torch.fft.rfft(kernel.roll(start, -1).to(x_in), n=n_fft)
         # x_freq: (batch, d_model, freq_bins)
-        x_freq = torch.fft.rfft(x_in, n=2 * seq_len)
+        x_freq = torch.fft.rfft(x_in, n=n_fft)
         # out_freq: (batch, channels, d_model, freq_bins)
         out_freq = torch.einsum("bhl,chl->bchl", x_freq, kernel_freq)
         # out: (batch, channels, d_model, seq_len)
-        out = torch.fft.irfft(out_freq, n=2 * seq_len)[..., :seq_len].to(x)
+        out = torch.fft.irfft(out_freq, n=n_fft)[..., start : start + seq_len].to(x)
 
         # Skip connection via learnable D matrix
         # (batch, channels, d_model, seq_len)

{braindecode-1.8.1.dev178237886 → braindecode-1.8.1.dev178298903}/braindecode/models/contrawr.py

@@ -4,7 +4,7 @@ import torch
 import torch.nn as nn
 from mne.utils import warn
 
-from braindecode.functional import spectral_input
+from braindecode.functional import _real_dft, spectral_input
 from braindecode.models.base import EEGModuleMixin
 from braindecode.models.util import _disable_batch_norm_training_if_batch_size_one
 
@@ -297,6 +297,8 @@ class _STFTModule(nn.Module):
 
     def forward(self, x: torch.Tensor) -> torch.Tensor:
         # x: (B, C, T)
+        if _real_dft.needs_real_dft(x) and self.center and self.one_sided:
+            return self._forward_real_dft(x).to(x)
         B, C, T = x.shape
         # flatten batch & channel into one dim
         x_flat = spectral_input(x.reshape(B * C, T))
@@ -319,3 +321,23 @@ class _STFTModule(nn.Module):
         spec = spec_flat.view(B, C, F, L)
 
         return torch.abs(spec).to(x)
+
+    @torch.jit.unused
+    @_real_dft.fp32_island
+    def _forward_real_dft(self, x):
+        # The magnitude above without complex tensors, on the device (Intel
+        # Gaudi / HPU), instead of a host STFT and a host-to-device copy of
+        # the whole spectrogram: reflect-padded frames (gathered, not a
+        # strided unfold) times the one-sided DFT basis. No annotations: with
+        # postponed annotations torch.jit.unused cannot resolve them.
+        pad = self.n_fft // 2
+        x = nn.functional.pad(x, (pad, pad), mode="reflect")
+        n_frames = 1 + (x.shape[-1] - self.n_fft) // self.hop_length
+        starts = torch.arange(n_frames, device=x.device) * self.hop_length
+        index = (starts[:, None] + torch.arange(self.n_fft, device=x.device)).flatten()
+        frames = x.index_select(-1, index).unflatten(-1, (n_frames, self.n_fft))
+        real, imag = _real_dft.real_rfft(frames)
+        magnitude = torch.sqrt(real * real + imag * imag)
+        if self.normalized:
+            magnitude = magnitude / self.n_fft**0.5
+        return magnitude.transpose(-1, -2)