Braindecode 1.8.0.dev1115__tar.gz → 1.8.0.dev1122__tar.gz

{braindecode-1.8.0.dev1115/braindecode.egg-info → braindecode-1.8.0.dev1122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.0.dev1115
+Version: 1.8.0.dev1122
 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.0.dev1115 → braindecode-1.8.0.dev1122}/braindecode/models/base.py

@@ -198,34 +198,7 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
     See :ref:`load-pretrained-models` for a complete tutorial.
     """
 
-    #: Attributes that :func:`torch.jit.script` must not introspect. The
-    #: signal-related properties raise :class:`ValueError` when their value was
-    #: neither given nor inferable, and ``mapping`` carries a postponed
-    #: annotation TorchScript cannot resolve. Either one aborts scripting
-    #: before ``forward`` is ever compiled.
-    __jit_ignored_attributes__ = [
-        *sorted(_EEG_PARAMS),
-        "_chs_info",
-        "input_shape",
-        "mapping",
-    ]
-    #: Rich MNE channel dictionaries are intentionally unavailable in scripted
-    #: forwards; they remain unchanged on eager models and in saved configs.
-    __jit_unused_properties__ = ["chs_info"]
-
     def __init_subclass__(cls, **kwargs):
-        # TorchScript only honours ``__jit_ignored_attributes__`` for
-        # properties defined directly on the concrete class: it collects them
-        # with ``vars(type(module))``, which skips inherited ones. Rebinding
-        # the very same property objects on each subclass makes them visible
-        # there without changing any runtime behaviour.
-        for name in cls.__jit_ignored_attributes__:
-            if name in cls.__dict__:
-                continue
-            prop = getattr(cls, name, None)
-            if isinstance(prop, property):
-                setattr(cls, name, prop)
-
         # Append model-specific Hub integration notes to the docstring.
         # This runs before the metaclass __init__, so the Hub notes will
         # be included in the docstring that the metaclass processes.
@@ -313,12 +286,6 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
         self._chs_info = chs_info  # type: ignore[assignment]
         self._n_outputs = n_outputs  # type: ignore[assignment]
         self._n_chans = n_chans  # type: ignore[assignment]
-        # TorchScript cannot represent the rich MNE dictionaries in _chs_info.
-        # Keep the original eager state above and expose only the derived scalar
-        # to scripted signal-property getters.
-        self._n_chans_for_jit = (
-            len(chs_info) if n_chans is None and chs_info is not None else n_chans
-        )
         self._n_times = n_times  # type: ignore[assignment]
         self._sfreq = sfreq  # type: ignore[assignment]
 
@@ -343,12 +310,6 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
 
     @property
     def n_chans(self) -> int:
-        if torch.jit.is_scripting():
-            if self._n_chans_for_jit is None:
-                raise ValueError(
-                    "n_chans could not be inferred. Either specify n_chans or chs_info."
-                )
-            return self._n_chans_for_jit
         if self._n_chans is None and self._chs_info is not None:
             return len(self._chs_info)
         elif self._n_chans is None:
@@ -358,7 +319,7 @@ class EEGModuleMixin(_BaseHubMixin, metaclass=_BraindecodeDocstringMeta):
         return self._n_chans
 
     @property
-    def chs_info(self) -> list[dict]:
+    def chs_info(self) -> list[str]:
         if self._chs_info is None:
             raise ValueError("chs_info not specified.")
         return self._chs_info

{braindecode-1.8.0.dev1115 → braindecode-1.8.0.dev1122}/braindecode/samplers/base.py

@@ -5,7 +5,6 @@ Sampler classes.
 # Authors: Hubert Banville <hubert.jbanville@gmail.com>
 #          Theo Gnassounou <>
 #          Young Truong <dt.young112@gmail.com>
-#          Sarthak Tayal <sarthaktayal2@gmail.com>
 #
 # License: BSD (3-clause)
 
@@ -220,9 +219,6 @@ class DistributedRecordingSampler(DistributedSampler):
 class SequenceSampler(RecordingSampler):
     """Sample sequences of consecutive windows.
 
-    Recordings holding fewer than ``n_windows`` windows cannot contain a full
-    sequence and contribute none.
-
     Parameters
     ----------
     metadata : pd.DataFrame
@@ -231,7 +227,7 @@ class SequenceSampler(RecordingSampler):
         Number of consecutive windows in a sequence.
     n_windows_stride : int
         Number of windows between two consecutive sequences.
-    randomize : bool
+    random : bool
         If True, sample sequences randomly. If False, sample sequences in
         order.
     random_state : np.random.RandomState | int | None
@@ -273,10 +269,7 @@ class SequenceSampler(RecordingSampler):
             .apply(lambda x: x[: end_offset : self.n_windows_stride])
             .values
         )
-        # a typed array keeps the ids integer when a recording yields no sequence
-        file_ids = [
-            np.full(len(inds), i, dtype=np.int64) for i, inds in enumerate(start_inds)
-        ]
+        file_ids = [[i] * len(inds) for i, inds in enumerate(start_inds)]
         return np.concatenate(start_inds), np.concatenate(file_ids)
 
     def __len__(self):
@@ -303,10 +296,6 @@ class BalancedSequenceSampler(RecordingSampler):
     3. Sample a window of the corresponding class in the selected recording.
     4. Extract a sequence of windows around the sampled window.
 
-    Recordings holding fewer than ``n_windows`` windows cannot contain a full
-    sequence and are left out of step 1, as they are in
-    :class:`SequenceSampler`.
-
     Parameters
     ----------
     metadata : pd.DataFrame
@@ -333,33 +322,6 @@ class BalancedSequenceSampler(RecordingSampler):
         self.n_windows = n_windows
         self.n_sequences = n_sequences
         self.info_class = self._init_info(metadata, required_keys=["target"])
-        self.long_enough_recordings = self._find_long_enough_recordings()
-
-    def _find_long_enough_recordings(self):
-        """Return the indices of the recordings that can hold a full sequence.
-
-        Returns
-        -------
-        np.ndarray :
-            Array of recording indices holding at least ``n_windows`` windows.
-        """
-        n_windows_per_rec = self.info["index"].apply(len).to_numpy()
-        if n_windows_per_rec.size == 0:
-            raise ValueError("Cannot build sequences from empty metadata.")
-
-        long_enough = np.flatnonzero(n_windows_per_rec >= self.n_windows)
-        if len(long_enough) == 0:
-            raise ValueError(
-                f"No recording holds enough windows to build a sequence of "
-                f"{self.n_windows} windows. The longest recording has "
-                f"{n_windows_per_rec.max()} windows. Reduce n_windows to at "
-                f"most that value."
-            )
-        return long_enough
-
-    def sample_recording(self):
-        """Return a random recording index among the ones long enough."""
-        return self.rng.choice(self.long_enough_recordings)
 
     def sample_class(self, rec_ind=None):
         """Return a random class.

braindecode-1.8.0.dev1122/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.8.0.dev1122"

{braindecode-1.8.0.dev1115 → braindecode-1.8.0.dev1122/braindecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.0.dev1115
+Version: 1.8.0.dev1122
 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.0.dev1115 → braindecode-1.8.0.dev1122}/docs/whats_new.rst

@@ -28,14 +28,6 @@ Current 1.8.0 (GitHub)
 Enhancements
 ============
 
-- Models with TorchScript-compatible forward paths can now be passed straight
-  to :func:`torch.jit.script`, without first being rebuilt as a plain
-  :class:`torch.nn.Module`.
-  :class:`braindecode.models.base.EEGModuleMixin` hides its signal-related
-  properties and the ``mapping`` attribute from TorchScript introspection, so
-  scripting reaches ``forward`` instead of failing on the class attributes.
-  (:gh:`1115` by `Aditya Singh`_)
-
 - Add a transfer-learning tutorial illustrating the TUAB-to-NMT pathology
   workflow with offline synthetic recordings
   (:gh:`580` by `Mohammad Javad D`_ and `Bruno Aristimunha`_).
@@ -91,25 +83,6 @@ Bug fixes
   which no longer exposes the ``eegprep.utils`` namespace used for sampling-rate
   validation (:gh:`1123` by `Bruno Aristimunha`_).
 
-- Leave recordings shorter than ``n_windows`` out of the draw in
-  :class:`braindecode.samplers.BalancedSequenceSampler` instead of failing on
-  them. Such a recording holds no valid sequence start, which made the sampling
-  range empty and raised ``ValueError: high <= 0`` on the first sequence that
-  landed there. :class:`braindecode.samplers.SequenceSampler` already skips
-  those recordings. A clear error now names the longest recording when none of
-  them can hold a sequence (:gh:`1125` by `Sarthak Tayal`_).
-
-- Keep ``file_ids`` of :class:`braindecode.samplers.SequenceSampler` integer.
-  The ids were built from untyped lists, so an empty list coming from a
-  recording too short for a sequence turned the concatenated array into
-  ``float64``, against the documented dtype and unusable as an index
-  (:gh:`1125` by `Sarthak Tayal`_).
-
-- Document the ``randomize`` parameter of
-  :class:`braindecode.samplers.SequenceSampler` under its own name. The
-  docstring described it as ``random``, which no signature accepts
-  (:gh:`1125` by `Sarthak Tayal`_).
-
 Code health
 ============
 
@@ -1620,4 +1593,3 @@ Authors
 .. _Fashad Ahmed: https://github.com/Fashad-Ahmed
 .. _Bhargav Kowshik: https://github.com/bkowshik
 .. _Jon Huml: https://github.com/jonathanhuml
-.. _Aditya Singh: https://github.com/adityasingh2400

braindecode-1.8.0.dev1115/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.8.0.dev1115"