Braindecode 1.3.0.dev173767962__tar.gz → 1.3.0.dev173909672__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.3.0.dev173767962
+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>
@@ -40,8 +40,6 @@ Requires-Dist: linear_attention_transformer
 Requires-Dist: docstring_inheritance
 Provides-Extra: moabb
 Requires-Dist: moabb>=1.2.0; extra == "moabb"
-Provides-Extra: hug
-Requires-Dist: huggingface_hub[torch]>=0.20.0; extra == "hug"
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -67,7 +65,7 @@ Requires-Dist: pre-commit; extra == "docs"
 Requires-Dist: openneuro-py; extra == "docs"
 Requires-Dist: plotly; extra == "docs"
 Provides-Extra: all
-Requires-Dist: braindecode[docs,hug,moabb,tests]; extra == "all"
+Requires-Dist: braindecode[docs,moabb,tests]; extra == "all"
 Dynamic: license-file
 
 .. image:: https://badges.gitter.im/braindecodechat/community.svg

{braindecode-1.3.0.dev173767962 → braindecode-1.3.0.dev173909672}/braindecode/augmentation/base.py

@@ -189,7 +189,7 @@ class AugmentedDataLoader(DataLoader):
 
     Parameters
     ----------
-    dataset : RecordDataset
+    dataset : BaseDataset
         The dataset containing the signals.
     transforms : list | Transform, optional
         Transform or sequence of Transform to be applied to each batch.

{braindecode-1.3.0.dev173767962 → braindecode-1.3.0.dev173909672}/braindecode/augmentation/functional.py

@@ -4,13 +4,9 @@
 #
 # License: BSD (3-clause)
 
-from __future__ import annotations
-
 from numbers import Real
-from typing import Literal
 
 import numpy as np
-import numpy.typing as npt
 import torch
 from mne.filter import notch_filter
 from scipy.interpolate import Rbf
@@ -19,7 +15,7 @@ from torch.fft import fft, ifft
 from torch.nn.functional import one_hot, pad
 
 
-def identity(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.Tensor]:
+def identity(X, y):
     """Identity operation.
 
     Parameters
@@ -39,7 +35,7 @@ def identity(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.Tens
     return X, y
 
 
-def time_reverse(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.Tensor]:
+def time_reverse(X, y):
     """Flip the time axis of each input.
 
     Parameters
@@ -59,7 +55,7 @@ def time_reverse(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.
     return torch.flip(X, [-1]), y
 
 
-def sign_flip(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.Tensor]:
+def sign_flip(X, y):
     """Flip the sign axis of each input.
 
     Parameters
@@ -79,13 +75,7 @@ def sign_flip(X: torch.Tensor, y: torch.Tensor) -> tuple[torch.Tensor, torch.Ten
     return -X, y
 
 
-def _new_random_fft_phase_odd(
-    batch_size: int,
-    c: int,
-    n: int,
-    device: torch.device,
-    random_state: int | np.random.RandomState | None,
-) -> torch.Tensor:
+def _new_random_fft_phase_odd(batch_size, c, n, device, random_state):
     rng = check_random_state(random_state)
     random_phase = torch.from_numpy(
         2j * np.pi * rng.random((batch_size, c, (n - 1) // 2))
@@ -100,13 +90,7 @@ def _new_random_fft_phase_odd(
     )
 
 
-def _new_random_fft_phase_even(
-    batch_size: int,
-    c: int,
-    n: int,
-    device: torch.device,
-    random_state: int | np.random.RandomState | None,
-) -> torch.Tensor:
+def _new_random_fft_phase_even(batch_size, c, n, device, random_state):
     rng = check_random_state(random_state)
     random_phase = torch.from_numpy(
         2j * np.pi * rng.random((batch_size, c, n // 2 - 1))
@@ -125,13 +109,7 @@ def _new_random_fft_phase_even(
 _new_random_fft_phase = {0: _new_random_fft_phase_even, 1: _new_random_fft_phase_odd}
 
 
-def ft_surrogate(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    phase_noise_magnitude: float,
-    channel_indep: bool,
-    random_state: int | np.random.RandomState | None = None,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def ft_surrogate(X, y, phase_noise_magnitude, channel_indep, random_state=None):
     """FT surrogate augmentation of a single EEG channel, as proposed in [1]_.
 
     Function copied from https://github.com/cliffordlab/sleep-convolutions-tf
@@ -197,9 +175,7 @@ def ft_surrogate(
     return transformed_X, y
 
 
-def _pick_channels_randomly(
-    X: torch.Tensor, p_pick: float, random_state: int | np.random.RandomState | None
-) -> torch.Tensor:
+def _pick_channels_randomly(X, p_pick, random_state):
     rng = check_random_state(random_state)
     batch_size, n_channels, _ = X.shape
     # allows to use the same RNG
@@ -212,12 +188,7 @@ def _pick_channels_randomly(
     return torch.sigmoid(1000 * (unif_samples - p_pick))
 
 
-def channels_dropout(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    p_drop: float,
-    random_state: int | np.random.RandomState | None = None,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def channels_dropout(X, y, p_drop, random_state=None):
     """Randomly set channels to flat signal.
 
     Part of the CMSAugment policy proposed in [1]_
@@ -251,9 +222,7 @@ def channels_dropout(
     return X * mask.unsqueeze(-1), y
 
 
-def _make_permutation_matrix(
-    X: torch.Tensor, mask: torch.Tensor, random_state: int | np.random.Generator | None
-) -> torch.Tensor:
+def _make_permutation_matrix(X, mask, random_state):
     rng = check_random_state(random_state)
     batch_size, n_channels, _ = X.shape
     hard_mask = mask.round()
@@ -272,12 +241,7 @@ def _make_permutation_matrix(
     return batch_permutations
 
 
-def channels_shuffle(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    p_shuffle: float,
-    random_state: int | np.random.RandomState | None = None,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def channels_shuffle(X, y, p_shuffle, random_state=None):
     """Randomly shuffle channels in EEG data matrix.
 
     Part of the CMSAugment policy proposed in [1]_
@@ -316,12 +280,7 @@ def channels_shuffle(
     return torch.matmul(batch_permutations, X), y
 
 
-def gaussian_noise(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    std: float,
-    random_state: int | np.random.RandomState | None = None,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def gaussian_noise(X, y, std, random_state=None):
     """Randomly add white Gaussian noise to all channels.
 
     Suggested e.g. in [1]_, [2]_ and [3]_
@@ -373,9 +332,7 @@ def gaussian_noise(
     return transformed_X, y
 
 
-def channels_permute(
-    X: torch.Tensor, y: torch.Tensor, permutation: list[int]
-) -> tuple[torch.Tensor, torch.Tensor]:
+def channels_permute(X, y, permutation):
     """Permute EEG channels according to fixed permutation matrix.
 
     Suggested e.g. in [1]_
@@ -405,12 +362,7 @@ def channels_permute(
     return X[..., permutation, :], y
 
 
-def smooth_time_mask(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    mask_start_per_sample: torch.Tensor,
-    mask_len_samples: int,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def smooth_time_mask(X, y, mask_start_per_sample, mask_len_samples):
     """Smoothly replace a contiguous part of all channels by zeros.
 
     Originally proposed in [1]_ and [2]_
@@ -460,13 +412,7 @@ def smooth_time_mask(
     return X * mask, y
 
 
-def bandstop_filter(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    sfreq: float,
-    bandwidth: float,
-    freqs_to_notch: npt.ArrayLike | None,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def bandstop_filter(X, y, sfreq, bandwidth, freqs_to_notch):
     """Apply a band-stop filter with desired bandwidth at the desired frequency
     position.
 
@@ -505,7 +451,7 @@ def bandstop_filter(
        Representation Learning for Electroencephalogram Classification. In
        Machine Learning for Health (pp. 238-253). PMLR.
     """
-    if bandwidth == 0 or freqs_to_notch is None:
+    if bandwidth == 0:
         return X, y
     transformed_X = X.clone()
     for c, (sample, notched_freq) in enumerate(zip(transformed_X, freqs_to_notch)):
@@ -523,7 +469,7 @@ def bandstop_filter(
     return transformed_X, y
 
 
-def _analytic_transform(x: torch.Tensor) -> torch.Tensor:
+def _analytic_transform(x):
     if torch.is_complex(x):
         raise ValueError("x must be real.")
 
@@ -540,12 +486,12 @@ def _analytic_transform(x: torch.Tensor) -> torch.Tensor:
     return ifft(f * h, dim=-1)
 
 
-def _nextpow2(n: int) -> int:
+def _nextpow2(n):
     """Return the first integer N such that 2**N >= abs(n)."""
     return int(np.ceil(np.log2(np.abs(n))))
 
 
-def _frequency_shift(X: torch.Tensor, fs: float, f_shift: float) -> torch.Tensor:
+def _frequency_shift(X, fs, f_shift):
     """
     Shift the specified signal by the specified frequency.
 
@@ -558,13 +504,9 @@ def _frequency_shift(X: torch.Tensor, fs: float, f_shift: float) -> torch.Tensor
     t = torch.arange(N_padded, device=X.device) / fs
     padded = pad(X, (0, N_padded - N_orig))
     analytical = _analytic_transform(padded)
-    if isinstance(f_shift, torch.Tensor):
-        _f_shift = f_shift
-    elif isinstance(f_shift, (float, int, np.ndarray, list)):
-        _f_shift = torch.as_tensor(f_shift).float()
-    else:
-        raise ValueError(f"Invalid f_shift type: {type(f_shift)}")
-    f_shift_stack = _f_shift.repeat(N_padded, n_channels, 1)
+    if isinstance(f_shift, (float, int, np.ndarray, list)):
+        f_shift = torch.as_tensor(f_shift).float()
+    f_shift_stack = f_shift.repeat(N_padded, n_channels, 1)
     reshaped_f_shift = f_shift_stack.permute(
         *torch.arange(f_shift_stack.ndim - 1, -1, -1)
     )
@@ -572,9 +514,7 @@ def _frequency_shift(X: torch.Tensor, fs: float, f_shift: float) -> torch.Tensor
     return shifted[..., :N_orig].real.float()
 
 
-def frequency_shift(
-    X: torch.Tensor, y: torch.Tensor, delta_freq: float, sfreq: float
-) -> tuple[torch.Tensor, torch.Tensor]:
+def frequency_shift(X, y, delta_freq, sfreq):
     """Adds a shift in the frequency domain to all channels.
 
     Note that here, the shift is the same for all channels of a single example.
@@ -605,7 +545,7 @@ def frequency_shift(
     return transformed_X, y
 
 
-def _torch_normalize_vectors(rr: torch.Tensor) -> torch.Tensor:
+def _torch_normalize_vectors(rr):
     """Normalize surface vertices."""
     norm = torch.linalg.norm(rr, axis=1, keepdim=True)
     mask = norm > 0
@@ -614,9 +554,7 @@ def _torch_normalize_vectors(rr: torch.Tensor) -> torch.Tensor:
     return new_rr
 
 
-def _torch_legval(
-    x: torch.Tensor, c: torch.Tensor, tensor: bool = True
-) -> torch.Tensor:
+def _torch_legval(x, c, tensor=True):
     """
     Evaluate a Legendre series at points x.
     If `c` is of length `n + 1`, this function returns the value:
@@ -724,9 +662,7 @@ def _torch_legval(
     return c0 + c1 * x
 
 
-def _torch_calc_g(
-    cosang: torch.Tensor, stiffness: float = 4, n_legendre_terms: int = 50
-) -> torch.Tensor:
+def _torch_calc_g(cosang, stiffness=4, n_legendre_terms=50):
     """Calculate spherical spline g function between points on a sphere.
 
     Parameters
@@ -782,25 +718,23 @@ def _torch_calc_g(
     return _torch_legval(cosang, [0] + factors)
 
 
-def _torch_make_interpolation_matrix(
-    pos_from: torch.Tensor, pos_to: torch.Tensor, alpha: float = 1e-5
-) -> torch.Tensor:
+def _torch_make_interpolation_matrix(pos_from, pos_to, alpha=1e-5):
     """Compute interpolation matrix based on spherical splines.
 
     Implementation based on [1]_
 
     Parameters
     ----------
-    pos_from : torch.Tensor of float, shape(n_good_sensors, 3)
+    pos_from : np.ndarray of float, shape(n_good_sensors, 3)
         The positions to interpolate from.
-    pos_to : torch.Tensor of float, shape(n_bad_sensors, 3)
+    pos_to : np.ndarray of float, shape(n_bad_sensors, 3)
         The positions to interpolate.
     alpha : float
         Regularization parameter. Defaults to 1e-5.
 
     Returns
     -------
-    interpolation : torch.Tensor of float, shape(len(pos_from), len(pos_to))
+    interpolation : np.ndarray of float, shape(len(pos_from), len(pos_to))
         The interpolation matrix that maps good signals to the location
         of bad signals.
 
@@ -888,12 +822,7 @@ def _torch_make_interpolation_matrix(
     return interpolation
 
 
-def _rotate_signals(
-    X: torch.Tensor,
-    rotations: list[torch.Tensor],
-    sensors_positions_matrix: torch.Tensor,
-    spherical: bool = True,
-) -> torch.Tensor:
+def _rotate_signals(X, rotations, sensors_positions_matrix, spherical=True):
     sensors_positions_matrix = sensors_positions_matrix.to(X.device)
     rot_sensors_matrices = [
         rotation.matmul(sensors_positions_matrix) for rotation in rotations
@@ -924,29 +853,22 @@ def _rotate_signals(
         return transformed_X
 
 
-def _make_rotation_matrix(
-    axis: Literal["x", "y", "z"],
-    angle: float | int | np.ndarray | list | torch.Tensor,
-    degrees: bool = True,
-) -> torch.Tensor:
+def _make_rotation_matrix(axis, angle, degrees=True):
     assert axis in ["x", "y", "z"], "axis should be either x, y or z."
-    if isinstance(angle, torch.Tensor):
-        _angle = angle
-    elif isinstance(angle, (float, int, np.ndarray, list)):
-        _angle = torch.as_tensor(angle)
-    else:
-        raise ValueError(f"Invalid angle type: {type(angle)}")
+
+    if isinstance(angle, (float, int, np.ndarray, list)):
+        angle = torch.as_tensor(angle)
 
     if degrees:
-        _angle = _angle * np.pi / 180
+        angle = angle * np.pi / 180
 
-    device = _angle.device
+    device = angle.device
     zero = torch.zeros(1, device=device)
     rot = torch.stack(
         [
             torch.as_tensor([1, 0, 0], device=device),
-            torch.hstack([zero, torch.cos(_angle), -torch.sin(_angle)]),
-            torch.hstack([zero, torch.sin(_angle), torch.cos(_angle)]),
+            torch.hstack([zero, torch.cos(angle), -torch.sin(angle)]),
+            torch.hstack([zero, torch.sin(angle), torch.cos(angle)]),
         ]
     )
     if axis == "x":
@@ -959,14 +881,7 @@ def _make_rotation_matrix(
         return rot[:, [1, 2, 0]]
 
 
-def sensors_rotation(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    sensors_positions_matrix: torch.Tensor,
-    axis: Literal["x", "y", "z"],
-    angles: npt.ArrayLike,
-    spherical_splines: bool,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def sensors_rotation(X, y, sensors_positions_matrix, axis, angles, spherical_splines):
     """Interpolates EEG signals over sensors rotated around the desired axis
     with the desired angle.
 
@@ -978,7 +893,7 @@ def sensors_rotation(
         EEG input example or batch.
     y : torch.Tensor
         EEG labels for the example or batch.
-    sensors_positions_matrix : torch.Tensor
+    sensors_positions_matrix : numpy.ndarray
         Matrix giving the positions of each sensor in a 3D cartesian coordinate
         system. Should have shape (3, n_channels), where n_channels is the
         number of channels. Standard 10-20 positions can be obtained from
@@ -1009,9 +924,7 @@ def sensors_rotation(
     return rotated_X, y
 
 
-def mixup(
-    X: torch.Tensor, y: torch.Tensor, lam: torch.Tensor, idx_perm: torch.Tensor
-) -> tuple[torch.Tensor, torch.Tensor]:
+def mixup(X, y, lam, idx_perm):
     """Mixes two channels of EEG data.
 
     See [1]_ for details.
@@ -1060,13 +973,8 @@ def mixup(
 
 
 def segmentation_reconstruction(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    n_segments: int,
-    data_classes: list[tuple[int, torch.Tensor]],
-    rand_indices: npt.ArrayLike,
-    idx_shuffle: npt.ArrayLike,
-) -> tuple[torch.Tensor, torch.Tensor]:
+    X, y, n_segments, data_classes, rand_indices, idx_shuffle
+):
     """Segment and reconstruct EEG data from [1]_.
 
     See [1]_ for details.
@@ -1079,8 +987,6 @@ def segmentation_reconstruction(
         EEG labels for the example or batch.
     n_segments : int
         Number of segments to use in the batch.
-    data_classes: list[tuple[int, torch.Tensor]]
-        List of tuples. Each tuple contains the class index and the corresponding EEG data.
     rand_indices: array-like
         Array of indices that indicates which trial to use in each segment.
     idx_shuffle: array-like
@@ -1099,8 +1005,8 @@ def segmentation_reconstruction(
     """
 
     # Initialize lists to store augmented data and corresponding labels
-    aug_data: list[torch.Tensor] = []
-    aug_label: list[torch.Tensor] = []
+    aug_data = []
+    aug_label = []
 
     # Iterate through each class to separate and augment data
     for class_index, X_class in data_classes:
@@ -1124,26 +1030,20 @@ def segmentation_reconstruction(
         aug_data.append(X_aug)
         aug_label.append(torch.full((n_trials,), class_index))
     # Concatenate the augmented data and labels
-    concat_aug_data = torch.cat(aug_data, dim=0)
-    concat_aug_data = concat_aug_data.to(dtype=X.dtype, device=X.device)
-    concat_aug_data = concat_aug_data[idx_shuffle]
+    aug_data = torch.cat(aug_data, dim=0)
+    aug_data = aug_data.to(dtype=X.dtype, device=X.device)
+    aug_data = aug_data[idx_shuffle]
 
     if y is not None:
-        concat_label = torch.cat(aug_label, dim=0)
-        concat_label = concat_label.to(dtype=y.dtype, device=y.device)
-        concat_label = concat_label[idx_shuffle]
-        return concat_aug_data, concat_label
+        aug_label = torch.cat(aug_label, dim=0)
+        aug_label = aug_label.to(dtype=y.dtype, device=y.device)
+        aug_label = aug_label[idx_shuffle]
+        return aug_data, aug_label
 
-    return concat_aug_data, None
+    return aug_data, y
 
 
-def mask_encoding(
-    X: torch.Tensor,
-    y: torch.Tensor,
-    time_start: torch.Tensor,
-    segment_length: int,
-    n_segments: int,
-) -> tuple[torch.Tensor, torch.Tensor]:
+def mask_encoding(X, y, time_start, segment_length, n_segments):
     """Mark encoding from Ding et al. (2024) from [ding2024]_.
 
     Replaces a contiguous part (or parts) of all channels by zeros

{braindecode-1.3.0.dev173767962 → braindecode-1.3.0.dev173909672}/braindecode/augmentation/transforms.py

@@ -161,10 +161,10 @@ class ChannelsDropout(Transform):
     ----------
     probability: float
         Float setting the probability of applying the operation.
-    p_drop: float | None, optional
+    proba_drop: float | None, optional
         Float between 0 and 1 setting the probability of dropping each channel.
         Defaults to 0.2.
-    random_state: int | numpy.random.RandomState, optional
+    random_state: int | numpy.random.Generator, optional
         Seed to be used to instantiate numpy random number generator instance.
         Used to decide whether or not to transform given the probability
         argument and to sample channels to erase. Defaults to None.

{braindecode-1.3.0.dev173767962 → braindecode-1.3.0.dev173909672}/braindecode/datasets/__init__.py

@@ -2,13 +2,7 @@
 Loader code for some datasets.
 """
 
-from .base import (
-    BaseConcatDataset,
-    EEGWindowsDataset,
-    RawDataset,
-    RecordDataset,
-    WindowsDataset,
-)
+from .base import BaseConcatDataset, BaseDataset, WindowsDataset
 from .bcicomp import BCICompetitionIVDataset4
 from .bids import BIDSDataset, BIDSEpochsDataset
 from .mne import create_from_mne_epochs, create_from_mne_raw
@@ -21,9 +15,7 @@ from .xy import create_from_X_y
 
 __all__ = [
     "WindowsDataset",
-    "EEGWindowsDataset",
-    "RecordDataset",
-    "RawDataset",
+    "BaseDataset",
     "BaseConcatDataset",
     "BIDSDataset",
     "BIDSEpochsDataset",