braindecode 1.8.1.dev180125779__tar.gz → 1.8.1.dev180519461__tar.gz

{braindecode-1.8.1.dev180125779 → braindecode-1.8.1.dev180519461}/NOTICE.txt

@@ -14,8 +14,7 @@ The following components are licensed under the Creative Commons Attribution-Non
 - `braindecode/models/eegminer.py`
 - `braindecode/models/meta_neuromotor.py`
 - `braindecode/models/brainmodule.py`
-
-As well as class later imported into the `braindecode.models.module` named as GeneralizedGaussianFilter.
+- `braindecode/models/neurorvq.py`
 
 The `meta_neuromotor.py` file is a derivative of
 `facebookresearch/generic-neuromotor-interface`, released by Meta Platforms,

{braindecode-1.8.1.dev180125779/braindecode.egg-info → braindecode-1.8.1.dev180519461}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.1.dev180125779
+Version: 1.8.1.dev180519461
 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.dev180125779 → braindecode-1.8.1.dev180519461}/braindecode/models/__init__.py

@@ -9,11 +9,12 @@ from .bendr import BENDR, InterpolatedBENDR
 from .biot import BIOT, InterpolatedBIOT
 from .brainbert import BrainBERT
 from .brainmodule import BrainModule
-from .brainomni import BrainTokenizer
+from .brainomni import BrainOmni, BrainTokenizer
 from .brant import Brant
 from .cbramod import CBraMod
 from .codebrain import CodeBrain
 from .contrawr import ContraWR
+from .csbrain import CSBrain
 from .ctnet import CTNet
 from .dance import DANCE
 from .deep4 import Deep4Net
@@ -49,6 +50,7 @@ from .mscformer import MSCFormer
 from .msvtnet import MSVTNet
 from .mvpformer import MVPFormer
 from .neuropose import NeuroPose
+from .neurorvq import NeuroRVQ
 from .patchedtransformer import PBT
 from .popt import PopulationTransformer
 from .reve import REVE
@@ -99,10 +101,12 @@ __all__ = [
     "BIOT",
     "BENDR",
     "BrainBERT",
+    "BrainOmni",
     "BrainTokenizer",
     "CBraMod",
     "CodeBrain",
     "ContraWR",
+    "CSBrain",
     "CTNet",
     "DANCE",
     "Deep4Net",
@@ -146,6 +150,7 @@ __all__ = [
     "MAPA",
     "MEDFormer",
     "MIRepNet",
+    "NeuroRVQ",
     "MSCFormer",
     "MSVTNet",
     "MVPFormer",

{braindecode-1.8.1.dev180125779 → braindecode-1.8.1.dev180519461}/braindecode/models/base.py

@@ -779,6 +779,22 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
 
     if HAS_HF_HUB:
 
+        @classmethod
+        def from_pretrained(cls, *args, **kwargs):
+            # The Hub mixin fills omitted __init__ args from config.json; pin the
+            # derived geometry arg so it cannot clash with the caller's one
+            # (e.g. caller chs_info vs saved n_chans) in __init__'s checks.
+            if "chs_info" in kwargs and "n_chans" not in kwargs:
+                chs_info = kwargs["chs_info"]
+                kwargs["n_chans"] = None if chs_info is None else len(chs_info)
+            elif "n_chans" in kwargs and "chs_info" not in kwargs:
+                kwargs["chs_info"] = None
+            if ("n_times" in kwargs or "sfreq" in kwargs) and (
+                "input_window_seconds" not in kwargs
+            ):
+                kwargs["input_window_seconds"] = None
+            return super().from_pretrained(*args, **kwargs)
+
         @classmethod
         def _from_pretrained(
             cls,

{braindecode-1.8.1.dev180125779 → braindecode-1.8.1.dev180519461}/braindecode/models/bendr.py

@@ -11,6 +11,7 @@ from einops.layers.torch import Rearrange
 from torch import nn
 
 from braindecode.models.base import EEGModuleMixin
+from braindecode.modules.channel_tokenizer import ChannelTokenizer
 
 # The 20 channels used to pre-train BENDR, in the order expected by the
 # `braindecode/braindecode-bendr` checkpoint. The first 19 entries are the
@@ -288,26 +289,25 @@ class BENDR(EEGModuleMixin, nn.Module):
         # Keep these parameters if needed later, otherwise they are captured by the mixin
         del n_outputs, n_chans, chs_info, n_times, input_window_seconds, sfreq
 
-        # If the user supplies chs_info, require it to match BENDR_CHANNEL_ORDER
-        # exactly (case-insensitive). Arbitrary channel sets should go through
-        # InterpolatedBENDR — same pattern as Labram / InterpolatedLaBraM.
-        # When chs_info is absent (the usual n_chans=20 path, incl.
-        # from_pretrained), no check is performed.
+        # No chs_info (incl. from_pretrained) or the canonical order: no
+        # tokenizer, so released checkpoints stay bit-identical. Any other
+        # montage is projected onto the 20 canonical channels.
         try:
             _chs_info = self.chs_info
         except ValueError:
             _chs_info = None
+        self.channel_tokenizer = None
+        backbone_n_chans = self.n_chans
         if _chs_info is not None:
             user_names = [ch["ch_name"] for ch in _chs_info]  # type: ignore[index]
             canonical = BENDR_CHANNEL_ORDER
             if [n.lower() for n in user_names] != [n.lower() for n in canonical]:
-                raise ValueError(
-                    f"BENDR requires chs_info to match BENDR_CHANNEL_ORDER exactly "
-                    f"({len(canonical)} channels, specific order; last is 'SCALE'). "
-                    f"Got {len(user_names)} channel(s). For arbitrary channel sets, "
-                    f"use InterpolatedBENDR "
-                    f"(from braindecode.models import InterpolatedBENDR)."
+                self.channel_tokenizer = ChannelTokenizer(
+                    strategy="fixed_order",
+                    src_chs_info=_chs_info,
+                    target_chs_info=_BENDR_TARGET_CHS_INFO,
                 )
+                backbone_n_chans = len(_BENDR_TARGET_CHS_INFO)
 
         self.encoder_h = encoder_h
         self.contextualizer_hidden = contextualizer_hidden
@@ -315,7 +315,7 @@ class BENDR(EEGModuleMixin, nn.Module):
         self.encoder_only = encoder_only
 
         self.encoder = _ConvEncoderBENDR(
-            in_features=self.n_chans,
+            in_features=backbone_n_chans,
             encoder_h=encoder_h,
             dropout=drop_prob,
             projection_head=projection_head,
@@ -361,6 +361,8 @@ class BENDR(EEGModuleMixin, nn.Module):
         self._build_head(n_outputs)
 
     def forward(self, x, return_features=False):
+        if self.channel_tokenizer is not None:
+            x = self.channel_tokenizer(x)
         encoded = self.encoder(x)
         # encoded: [batch_size, encoder_h, n_encoded_times]