braindecode 1.3.0.dev171850369__tar.gz → 1.3.0.dev173909672__tar.gz

{braindecode-1.3.0.dev171850369/braindecode.egg-info → braindecode-1.3.0.dev173909672}/PKG-INFO

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

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672}/braindecode/datasets/sleep_physio_challe_18.py

@@ -22,7 +22,6 @@ from mne.datasets.utils import _get_path
 from mne.utils import warn
 
 from braindecode.datasets import BaseConcatDataset, BaseDataset
-from braindecode.preprocessing.preprocess import _preprocess
 
 PC18_DIR = op.join(op.dirname(__file__), "data", "pc18")
 PC18_RECORDS = op.join(PC18_DIR, "sleep_records.csv")
@@ -407,6 +406,8 @@ class SleepPhysionetChallenge2018(BaseConcatDataset):
         base_dataset = BaseDataset(raw_file, desc)
 
         if preproc is not None:
+            from braindecode.preprocessing.preprocess import _preprocess
+
             _preprocess(base_dataset, None, preproc)
 
         return base_dataset

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672}/braindecode/datautil/serialization.py

@@ -138,12 +138,17 @@ def _load_signals(fif_file, preload, is_raw):
         with open(pkl_file, "rb") as f:
             signals = pickle.load(f)
 
-        # If the file has been moved together with the pickle file, make sure
-        # the path links to correct fif file.
-        signals._fname = str(fif_file)
-        if preload:
-            signals.load_data()
-        return signals
+        if all(f.exists() for f in signals.filenames):
+            if preload:
+                signals.load_data()
+            return 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 "
+                "file(s) do not exist. Will read the fif file(s) directly "
+                "and re-create the pickle file.",
+                UserWarning,
+            )
 
     # If pickle didn't exist read via mne (likely slower) and save pkl after
     if is_raw:

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672}/braindecode/preprocessing/preprocess.py

@@ -112,6 +112,7 @@ def preprocess(
     n_jobs: int | None = None,
     offset: int = 0,
     copy_data: bool | None = None,
+    parallel_kwargs: dict | None = None,
 ):
     """Apply preprocessors to a concat dataset.
 
@@ -135,6 +136,10 @@ def preprocess(
         and saving very large datasets in chunks to preserve original positions.
     copy_data : bool | None
         Whether the data passed to parallel jobs should be copied or passed by reference.
+    parallel_kwargs : dict | None
+        Additional keyword arguments forwarded to ``joblib.Parallel``.
+        Defaults to None (equivalent to ``{}``).
+        See https://joblib.readthedocs.io/en/stable/generated/joblib.Parallel.html for details.
 
     Returns
     -------
@@ -153,8 +158,12 @@ def preprocess(
 
     parallel_processing = (n_jobs is not None) and (n_jobs != 1)
 
-    job_prefer = "threads" if platform.system() == "Windows" else None
-    list_of_ds = Parallel(n_jobs=n_jobs, prefer=job_prefer)(
+    parallel_params = {} if parallel_kwargs is None else dict(parallel_kwargs)
+    parallel_params.setdefault(
+        "prefer", "threads" if platform.system() == "Windows" else None
+    )
+
+    list_of_ds = Parallel(n_jobs=n_jobs, **parallel_params)(
         delayed(_preprocess)(
             ds,
             i + offset,

braindecode-1.3.0.dev173909672/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.0.dev173909672"

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672/braindecode.egg-info}/PKG-INFO

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

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672}/docs/install/install.rst

@@ -4,7 +4,7 @@
 Installation
 ================
 
-Braindecode is written in Python 3, specifically for version 3.8 or above.
+Braindecode is written in Python 3, specifically for version 3.10 or above.
 
 The package is distributed via Python package index (`PyPI <braindecode-pypi_>`_), and you can access the
 source code via `Github <braindecode-github_>`_ repository.

{braindecode-1.3.0.dev171850369 → braindecode-1.3.0.dev173909672}/docs/whats_new.rst

@@ -29,6 +29,7 @@ API changes
 Bugs
 ~~~~
 - Fixing the issues with :class:`braindecode.models.ATCNet` (:gh:`782` by `Hamdi Altaheri`_)
+- Fixing expired path when loading a preprocessed dataset that was moved (:gh:`786` by `Pierre Guetschel`_)
 
 
 Current 1.2 (stable)

braindecode-1.3.0.dev171850369/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.0.dev171850369"