Braindecode 1.3.2.dev178306444__tar.gz → 1.3.2.dev178933134__tar.gz

{braindecode-1.3.2.dev178306444/braindecode.egg-info → braindecode-1.3.2.dev178933134}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.3.2.dev178306444
+Version: 1.3.2.dev178933134
 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>
@@ -34,7 +34,6 @@ Requires-Dist: wfdb
 Requires-Dist: linear_attention_transformer
 Requires-Dist: docstring_inheritance
 Requires-Dist: rotary_embedding_torch
-Requires-Dist: pandas<3.0.0
 Provides-Extra: moabb
 Requires-Dist: moabb>=1.4.3; extra == "moabb"
 Provides-Extra: eegprep

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/braindecode/datasets/bids/datasets.py

@@ -137,10 +137,6 @@ class BIDSDataset(BaseConcatDataset):
     )
     datatypes: str | list[str] | None = None
     check: bool = False
-    # Loading arguments for mne_bids.read_raw_bids:
-    extra_params: dict | None = None
-    on_ch_mismatch: str = "raise"
-    # Other arguments:
     preload: bool = False
     n_jobs: int = 1
 
@@ -186,12 +182,7 @@ class BIDSDataset(BaseConcatDataset):
 
     def _get_dataset(self, bids_path: mne_bids.BIDSPath) -> RawDataset:
         description = _description_from_bids_path(bids_path)
-        raw = mne_bids.read_raw_bids(
-            bids_path,
-            verbose=False,
-            on_ch_mismatch=self.on_ch_mismatch,
-            extra_params=self.extra_params,
-        )
+        raw = mne_bids.read_raw_bids(bids_path, verbose=False)
         if self.preload:
             raw.load_data()
         return RawDataset(raw, description)

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/braindecode/modules/filter.py

@@ -515,10 +515,8 @@ class GeneralizedGaussianFilter(nn.Module):
             requires_grad=affine_group_delay,
         )
 
-        # Construct filters from parameters and register as a buffer so
-        # torch.export / tracing treats it as a proper module buffer
-        # (it will be recomputed in forward anyway).
-        self.register_buffer("filters", self.construct_filters(), persistent=False)
+        # Construct filters from parameters
+        self.filters = self.construct_filters()
 
     @staticmethod
     def exponential_power(x, mean, fwhm, shape):

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/braindecode/preprocessing/windowers.py

@@ -517,18 +517,11 @@ def _create_windows_from_events(
 
     events, events_id = mne.events_from_annotations(ds.raw, mapping, verbose=verbose)
     onsets = events[:, 0]
-    ann = ds.raw.annotations
     # Onsets are relative to the beginning of the recording
     filtered_durations = np.array(
-        [a["duration"] for a in ann if a["description"] in events_id]
+        [a["duration"] for a in ds.raw.annotations if a["description"] in events_id]
     )
 
-    extras = None
-    if hasattr(ann, "extras"):
-        extras = [a["extras"] for a in ann if a["description"] in events_id]
-        if not any(extras):
-            extras = None
-
     stops = onsets + (filtered_durations * ds.raw.info["sfreq"]).astype(int)
     # XXX This could probably be simplified by using chunk_duration in
     #     `events_from_annotations`
@@ -566,11 +559,11 @@ def _create_windows_from_events(
             warnings.warn(
                 f"Dropping trials with different windows size {trials_drops}",
             )
+            bads_size_trials = checker_trials_size
             events = events[checker_trials_size]
             onsets = onsets[checker_trials_size]
             stops = stops[checker_trials_size]
-            if extras is not None:
-                extras = [e for i, e in enumerate(extras) if checker_trials_size[i]]
+
     description = events[:, -1]
 
     if not use_mne_epochs:
@@ -598,9 +591,6 @@ def _create_windows_from_events(
 
     description = events[:, -1]
 
-    if extras is not None:
-        extras = [extras[i_trials[i_start]] for i_start in range(len(starts))]
-
     metadata = pd.DataFrame(
         {
             "i_window_in_trial": i_window_in_trials,
@@ -609,15 +599,6 @@ def _create_windows_from_events(
             "target": description,
         }
     )
-    if extras is not None:
-        extras_df = pd.DataFrame(extras)
-        if forbidden_cols := set(metadata.columns).intersection(extras_df.columns):
-            warnings.warn(
-                f"Dropping extra columns that conflict with windowing metadata: {forbidden_cols}"
-            )
-            extras_df = extras_df.drop(columns=forbidden_cols)
-        metadata = pd.concat([metadata, extras_df.reset_index(drop=True)], axis=1)
-
     if use_mne_epochs:
         # window size - 1, since tmax is inclusive
         mne_epochs = mne.Epochs(

braindecode-1.3.2.dev178933134/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.2.dev178933134"

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134/braindecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.3.2.dev178306444
+Version: 1.3.2.dev178933134
 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>
@@ -34,7 +34,6 @@ Requires-Dist: wfdb
 Requires-Dist: linear_attention_transformer
 Requires-Dist: docstring_inheritance
 Requires-Dist: rotary_embedding_torch
-Requires-Dist: pandas<3.0.0
 Provides-Extra: moabb
 Requires-Dist: moabb>=1.4.3; extra == "moabb"
 Provides-Extra: eegprep

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/braindecode.egg-info/requires.txt

@@ -10,7 +10,6 @@ wfdb
 linear_attention_transformer
 docstring_inheritance
 rotary_embedding_torch
-pandas<3.0.0
 
 [all]
 braindecode[moabb]

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/docs/whats_new.rst

@@ -34,9 +34,6 @@ Enhancements
   pretrained weights available at `braindecode/eegpt-pretrained <https://huggingface.co/braindecode/eegpt-pretrained>`_
   (:gh:`908` by `Young Truong`_ and `Kuntal Kokate`_)
 - Add :class:`braindecode.models.CBraMod` model (:gh:`914` by `Pierre Guetschel`_)
-- Expose additional arguments of :func:`mne_bids.read_raw_bids` in :class:`braindecode.datasets.BIDSDataset` (:gh:`918` by `Pierre Guetschel`_)
-- Populate epochs metadata with the :class:`mne.Annotations`'s ``extras`` entries (:gh:`918` by `Pierre Guetschel`_)
-
 
 API changes
 ============
@@ -48,7 +45,7 @@ Requirements
 
 Bugs
 =====
-- Restrict to ``pandas>=3.0`` due to incompatibility with ``wfdb`` (:gh:`919` by `Pierre Guetschel`_)
+- None yet.
 
 Code health
 ============

{braindecode-1.3.2.dev178306444 → braindecode-1.3.2.dev178933134}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "braindecode"
 dynamic = ["version"]
 description = "Deep learning software to decode EEG, ECG or MEG signals"
-authors = [
+authors =  [
     { name = "Robin Tibor Schirrmeister", email = "robintibor@gmail.com" },
     { name = "Bruno Aristimunha Pinto", email = "b.aristimunha@gmail.com" },
     { name = "Alexandre Gramfort", email = "agramfort@meta.com" },
@@ -14,7 +14,7 @@ authors = [
 maintainers = [
     { name = "Alexandre Gramfort", email = "agramfort@meta.com" },
     { name = "Bruno Aristimunha Pinto", email = "b.aristimunha@gmail.com" },
-    { name = "Robin Tibor Schirrmeister", email = "robintibor@gmail.com" },
+    { name = "Robin Tibor Schirrmeister", email = "robintibor@gmail.com" }
 ]
 license = { text = "BSD-3-Clause" }
 keywords = [
@@ -29,7 +29,7 @@ keywords = [
     "magnetoencephalography",
     "electrocorticography",
     "ecog",
-    "electroencephalogram",
+    "electroencephalogram"
 ]
 classifiers = [
     'Development Status :: 3 - Alpha',
@@ -47,17 +47,16 @@ requires-python = ">=3.11"
 dependencies = [
     "torch>=2.2",
     "torchaudio>=2.0",
-    'mne>=1.11.0',                  # we get matplotlib, numpy, pandas, scipy from here
-    'mne_bids>=0.18',               # in theory we get the mne here, but we prefer to have it explicit
+    'mne>=1.11.0',  # we get matplotlib, numpy, pandas, scipy from here
+    'mne_bids>=0.18', # in theory we get the mne here, but we prefer to have it explicit
     'h5py',
     'skorch>=1.3.0',
     'joblib',
     'torchinfo',
-    'wfdb',                         # we got the requests and pandas from here
+    'wfdb', # we got the requests and pandas from here
     'linear_attention_transformer',
-    'docstring_inheritance',        # we get einops from here
+    'docstring_inheritance', # we get einops from here
     'rotary_embedding_torch',
-    'pandas<3.0.0',                 # to avoid incompatibility with wfdb https://github.com/MIT-LCP/wfdb-python/issues/560
 ]
 [project.urls]
 homepage = "https://braindecode.org"
@@ -77,7 +76,10 @@ tests = [
     "transformers>=4.57.0",
     "bids_validator",
 ]
-typing = ['exca==0.4', 'numpydantic>=1.7']
+typing = [
+    'exca==0.4',
+    'numpydantic>=1.7',
+]
 
 docs = [
     'sphinx_gallery',
@@ -115,15 +117,13 @@ all = [
 py-modules = []
 
 [tool.setuptools.dynamic]
-version = { attr = "braindecode.version.__version__" }
+version = {attr = "braindecode.version.__version__"}
 
 [tool.setuptools.packages.find]
-where = ["."] # list of folders that contain the packages (["."] by default)
-include = [
-    "braindecode*",
-] # package names should match these glob patterns (["*"] by default)
-exclude = [] # exclude packages matching these glob patterns (empty by default)
-namespaces = false # to disable scanning PEP 420 namespaces (true by default)
+where = ["."]  # list of folders that contain the packages (["."] by default)
+include = ["braindecode*"]  # package names should match these glob patterns (["*"] by default)
+exclude = []  # exclude packages matching these glob patterns (empty by default)
+namespaces = false  # to disable scanning PEP 420 namespaces (true by default)
 
 [tool.ruff]
 lint.ignore-init-module-imports = true
@@ -141,7 +141,9 @@ known_first_party = ["braindecode"]
 lines_between_sections = 1
 
 [tool.pytest.ini_options]
-testpaths = ["test"]
+testpaths = [
+  "test",
+]
 # which files count as test modules
 python_files = ["test_*.py", "*_test.py"]
 # which functions inside them count as tests

braindecode-1.3.2.dev178306444/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.2.dev178306444"