Braindecode 1.5.0.dev1004__tar.gz → 1.5.0.dev1007__tar.gz

{braindecode-1.5.0.dev1004/braindecode.egg-info → braindecode-1.5.0.dev1007}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.5.0.dev1004
+Version: 1.5.0.dev1007
 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.5.0.dev1004 → braindecode-1.5.0.dev1007}/braindecode/models/base.py

@@ -33,25 +33,13 @@ huggingface_hub = _soft_import(
 HAS_HF_HUB = huggingface_hub is not False
 
 
-_HF_INSTALL_HINT = (
-    "requires the `huggingface_hub` package. "
-    "Install with: pip install 'braindecode[hub]'"
-)
-
-
-class _BaseHubMixinStub:
-    @classmethod
-    def from_pretrained(cls, *args, **kwargs):
-        raise ImportError(f"{cls.__name__}.from_pretrained() {_HF_INSTALL_HINT}")
-
-    def push_to_hub(self, *args, **kwargs):
-        raise ImportError(f"{type(self).__name__}.push_to_hub() {_HF_INSTALL_HINT}")
+class _BaseHubMixin:
+    pass
 
 
 # Define base class for hub mixin
-_BaseHubMixin: Type = (
-    huggingface_hub.PyTorchModelHubMixin if HAS_HF_HUB else _BaseHubMixinStub
-)
+if HAS_HF_HUB:
+    _BaseHubMixin: Type = huggingface_hub.PyTorchModelHubMixin  # type: ignore
 
 
 def deprecated_args(obj, *old_new_args):

{braindecode-1.5.0.dev1004 → braindecode-1.5.0.dev1007}/braindecode/preprocessing/preprocess.py

@@ -6,7 +6,6 @@
 #          David Sabbagh <dav.sabbagh@gmail.com>
 #          Bruno Aristimunha <b.aristimunha@gmail.com>
 #          Léo Burgund <leo.burgund@gmail.com>
-#          Sarthak Tayal <sarthaktayal2@gmail.com>
 #
 # License: BSD (3-clause)
 
@@ -218,7 +217,6 @@ def preprocess(
     offset: int = 0,
     copy_data: bool | None = None,
     parallel_kwargs: dict | None = None,
-    max_nbytes: int | str | None = "1M",
 ):
     """Apply preprocessors to a concat dataset.
 
@@ -246,20 +244,14 @@ def preprocess(
         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.
-    max_nbytes : int, str, or None
-        Threshold (in bytes; or e.g. ``"1M"``) above which joblib memory-maps
-        preloaded arrays as read-only when dispatching to worker processes.
-        Effective only when ``n_jobs != 1``. Pass ``None`` to disable memory
-        mapping when a preprocessor resizes the underlying data (for example
-        ``filterbank``), which would otherwise fail with an ``mmap can't
-        resize a readonly`` error. ``parallel_kwargs['max_nbytes']`` takes
-        precedence if both are provided.
 
     Returns
     -------
     BaseConcatDataset
         Preprocessed dataset.
     """
+    # In case of serialization, make sure directory is available before
+    # preprocessing
     if save_dir is not None and not overwrite:
         _check_save_dir_empty(save_dir)
 
@@ -274,35 +266,22 @@ def preprocess(
     parallel_params.setdefault(
         "prefer", "threads" if platform.system() == "Windows" else None
     )
-    parallel_params.setdefault("max_nbytes", max_nbytes)
-
-    try:
-        list_of_ds = Parallel(n_jobs=n_jobs, **parallel_params)(
-            delayed(_preprocess)(
-                ds,
-                i + offset,
-                preprocessors,
-                save_dir,
-                overwrite,
-                copy_data=(
-                    (parallel_processing and (save_dir is None))
-                    if copy_data is None
-                    else copy_data
-                ),
-            )
-            for i, ds in enumerate(concat_ds.datasets)
+
+    list_of_ds = Parallel(n_jobs=n_jobs, **parallel_params)(
+        delayed(_preprocess)(
+            ds,
+            i + offset,
+            preprocessors,
+            save_dir,
+            overwrite,
+            copy_data=(
+                (parallel_processing and (save_dir is None))
+                if copy_data is None
+                else copy_data
+            ),
         )
-    except (BufferError, ValueError, OSError) as exc:
-        msg = str(exc).lower().replace("-", "")
-        if "mmap" in msg and "readonly" in msg:
-            raise RuntimeError(
-                "Parallel preprocessing failed because joblib memory-mapped "
-                "a preloaded array that a preprocessor then attempted to "
-                "resize (e.g. ``filterbank``). Pass ``max_nbytes=None`` to "
-                "``preprocess`` to disable memory mapping, or supply a "
-                "``save_dir`` so the data is reloaded with ``preload=False``."
-            ) from exc
-        raise
+        for i, ds in enumerate(concat_ds.datasets)
+    )
 
     if save_dir is not None:  # Reload datasets and replace in concat_ds
         ids_to_load = [i + offset for i in range(len(concat_ds.datasets))]

braindecode-1.5.0.dev1007/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.5.0.dev1007"

{braindecode-1.5.0.dev1004 → braindecode-1.5.0.dev1007/braindecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.5.0.dev1004
+Version: 1.5.0.dev1007
 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.5.0.dev1004 → braindecode-1.5.0.dev1007}/docs/whats_new.rst

@@ -289,11 +289,6 @@ Requirements
 
 Bugs
 =====
-- Improve the error message when :meth:`from_pretrained` or :meth:`push_to_hub`
-  are called without the optional ``huggingface_hub`` dependency installed.
-  Users now get a clear :class:`ImportError` with installation instructions
-  (``pip install 'braindecode[hub]'``) instead of an ``AttributeError``.
-  (:gh:`1024` by `@copilot`_)
 - Fix the documentation header "Cite Braindecode" announcement link: it used a bare
   ``cite.html`` URL, which browsers resolve relative to the current page path and led
   to 404s (for example from ``install/install.html``). The link is now built with
@@ -346,14 +341,6 @@ Bugs
   marked all model-specific parameters as "The description is missing"
   when ``DOCSTRING_INHERITANCE_ENABLE=1`` was set during documentation
   builds (:gh:`971` by `Bruno Aristimunha`_)
-- Expose ``max_nbytes`` directly on
-  :func:`braindecode.preprocessing.preprocess.preprocess` and turn the
-  cryptic ``mmap can't resize a readonly`` failure (raised when joblib
-  memory-maps a preloaded array that a preprocessor later tries to
-  resize) into an actionable error explaining how to fix it: pass
-  ``max_nbytes=None`` to disable memory mapping, or supply a ``save_dir``
-  so data is reloaded with ``preload=False``
-  (:gh:`325` by `Sarthak Tayal`_)
 
 Code health
 ============

braindecode-1.5.0.dev1004/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.5.0.dev1004"