braindecode 0.8.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

braindecode/models/tidnet.py

@@ -1,13 +1,147 @@
 from math import ceil
 
 import torch
+from einops.layers.torch import Rearrange
 from torch import nn
 from torch.nn import init
-from torch.nn.utils import weight_norm
-from einops.layers.torch import Rearrange
+from torch.nn.utils.parametrizations import weight_norm
+
+from braindecode.models.base import EEGModuleMixin
+from braindecode.modules import Ensure4d
+
+
+class TIDNet(EEGModuleMixin, nn.Module):
+    """Thinker Invariance DenseNet model from Kostas et al. (2020) [TIDNet]_.
+
+    .. figure:: https://content.cld.iop.org/journals/1741-2552/17/5/056008/revision3/jneabb7a7f1_hr.jpg
+        :align: center
+        :alt: TIDNet Architecture
+
+    See [TIDNet]_ for details.
+
+    Parameters
+    ----------
+    s_growth : int
+        DenseNet-style growth factor (added filters per DenseFilter)
+    t_filters : int
+        Number of temporal filters.
+    drop_prob : float
+        Dropout probability
+    pooling : int
+        Max temporal pooling (width and stride)
+    temp_layers : int
+        Number of temporal layers
+    spat_layers : int
+        Number of DenseFilters
+    temp_span : float
+        Percentage of n_times that defines the temporal filter length:
+        temp_len = ceil(temp_span * n_times)
+        e.g A value of 0.05 for temp_span with 1500 n_times will yield a temporal
+        filter of length 75.
+    bottleneck : int
+        Bottleneck factor within Densefilter
+    summary : int
+        Output size of AdaptiveAvgPool1D layer. If set to -1, value will be calculated
+        automatically (n_times // pooling).
+    in_chans :
+        Alias for n_chans.
+    n_classes:
+        Alias for n_outputs.
+    input_window_samples :
+        Alias for n_times.
+    activation: nn.Module, default=nn.LeakyReLU
+        Activation function class to apply. Should be a PyTorch activation
+        module class like ``nn.ReLU`` or ``nn.ELU``. Default is ``nn.LeakyReLU``.
+
+    Notes
+    -----
+    Code adapted from: https://github.com/SPOClab-ca/ThinkerInvariance/
+
+    References
+    ----------
+    .. [TIDNet] Kostas, D. & Rudzicz, F.
+        Thinker invariance: enabling deep neural networks for BCI across more
+        people.
+        J. Neural Eng. 17, 056008 (2020).
+        doi: 10.1088/1741-2552/abb7a7.
+    """
+
+    def __init__(
+        self,
+        n_chans=None,
+        n_outputs=None,
+        n_times=None,
+        input_window_seconds=None,
+        sfreq=None,
+        chs_info=None,
+        s_growth: int = 24,
+        t_filters: int = 32,
+        drop_prob: float = 0.4,
+        pooling: int = 15,
+        temp_layers: int = 2,
+        spat_layers: int = 2,
+        temp_span: float = 0.05,
+        bottleneck: int = 3,
+        summary: int = -1,
+        activation: nn.Module = nn.LeakyReLU,
+    ):
+        super().__init__(
+            n_outputs=n_outputs,
+            n_chans=n_chans,
+            n_times=n_times,
+            input_window_seconds=input_window_seconds,
+            sfreq=sfreq,
+            chs_info=chs_info,
+        )
+        del n_outputs, n_chans, n_times, input_window_seconds, sfreq, chs_info
+
+        self.temp_len = ceil(temp_span * self.n_times)
+
+        self.dscnn = _TIDNetFeatures(
+            s_growth=s_growth,
+            t_filters=t_filters,
+            n_chans=self.n_chans,
+            n_times=self.n_times,
+            drop_prob=drop_prob,
+            pooling=pooling,
+            temp_layers=temp_layers,
+            spat_layers=spat_layers,
+            temp_span=temp_span,
+            bottleneck=bottleneck,
+            summary=summary,
+            activation=activation,
+        )
+
+        self._num_features = self.dscnn.num_features
+
+        self.flatten = nn.Flatten(start_dim=1)
+
+        self.final_layer = self._create_classifier(self.num_features, self.n_outputs)
 
-from .modules import Ensure4d
-from .base import EEGModuleMixin, deprecated_args
+    def _create_classifier(self, incoming: int, n_outputs: int):
+        classifier = nn.Linear(incoming, n_outputs)
+        init.xavier_normal_(classifier.weight)
+        classifier.bias.data.zero_()
+        seq_clf = nn.Sequential(classifier, nn.Identity())
+
+        return seq_clf
+
+    def forward(self, x: torch.Tensor) -> torch.Tensor:
+        """Forward pass.
+
+        Parameters
+        ----------
+        x: torch.Tensor
+            Batch of EEG windows of shape (batch_size, n_channels, n_times).
+        """
+
+        x = self.dscnn(x)
+        x = self.flatten(x)
+        return self.final_layer(x)
+
+    @property
+    def num_features(self):
+        return self._num_features
 
 
 class _BatchNormZG(nn.BatchNorm2d):
@@ -25,27 +159,49 @@ class _ConvBlock2D(nn.Module):
     Convolution, dropout, activation, batch-norm
     """
 
-    def __init__(self, in_filters, out_filters, kernel, stride=(1, 1), padding=0, dilation=1,
-                 groups=1, drop_prob=0.5, batch_norm=True, activation=nn.LeakyReLU, residual=False):
+    def __init__(
+        self,
+        in_filters: int,
+        out_filters: int,
+        kernel: tuple[int, int],
+        stride: tuple[int, int] = (1, 1),
+        padding: int = 0,
+        dilation: int = 1,
+        groups: int = 1,
+        drop_prob: float = 0.5,
+        batch_norm: bool = True,
+        activation: type[nn.Module] = nn.LeakyReLU,
+        residual: bool = False,
+    ):
         super().__init__()
         self.kernel = kernel
         self.activation = activation()
         self.residual = residual
 
-        self.conv = nn.Conv2d(in_filters, out_filters, kernel, stride=stride, padding=padding,
-                              dilation=dilation, groups=groups, bias=not batch_norm)
-        self.dropout = nn.Dropout2d(p=drop_prob)
+        self.conv = nn.Conv2d(
+            in_filters,
+            out_filters,
+            kernel,
+            stride=stride,
+            padding=padding,
+            dilation=dilation,
+            groups=groups,
+            bias=not batch_norm,
+        )
+        self.dropout = nn.Dropout2d(p=float(drop_prob))
         self.batch_norm = (
             _BatchNormZG(out_filters)
             if residual
             else nn.BatchNorm2d(out_filters)
             if batch_norm
-            else lambda x: x
+            else nn.Identity()
         )
 
-    def forward(self, input):
+    def forward(self, input: torch.Tensor) -> torch.Tensor:
         res = input
-        input = self.conv(input, )
+        input = self.conv(
+            input,
+        )
         input = self.dropout(input)
         input = self.activation(input)
         input = self.batch_norm(input)
@@ -53,12 +209,20 @@ class _ConvBlock2D(nn.Module):
 
 
 class _DenseFilter(nn.Module):
-    def __init__(self, in_features, growth_rate, filter_len=5, drop_prob=0.5, bottleneck=2,
-                 activation=nn.LeakyReLU, dim=-2):
+    def __init__(
+        self,
+        in_features: int,
+        growth_rate: int,
+        filter_len: int = 5,
+        drop_prob: float = 0.5,
+        bottleneck: int = 2,
+        activation: type[nn.Module] = nn.LeakyReLU,
+        dim: int = -2,
+    ):
         super().__init__()
         dim = dim if dim > 0 else dim + 4
         if dim < 2 or dim > 3:
-            raise ValueError('Only last two dimensions supported')
+            raise ValueError("Only last two dimensions supported")
         kernel = (filter_len, 1) if dim == 2 else (1, filter_len)
 
         self.net = nn.Sequential(
@@ -67,29 +231,52 @@ class _DenseFilter(nn.Module):
             nn.Conv2d(in_features, bottleneck * growth_rate, 1),
             nn.BatchNorm2d(bottleneck * growth_rate),
             activation(),
-            nn.Conv2d(bottleneck * growth_rate, growth_rate, kernel,
-                      padding=tuple((k // 2 for k in kernel))),
-            nn.Dropout2d(drop_prob)
+            nn.Conv2d(
+                bottleneck * growth_rate,
+                growth_rate,
+                kernel,
+                padding=tuple((k // 2 for k in kernel)),
+            ),
+            nn.Dropout2d(p=float(drop_prob)),
         )
 
-    def forward(self, x):
+    def forward(self, x: torch.Tensor) -> torch.Tensor:
         return torch.cat((x, self.net(x)), dim=1)
 
 
 class _DenseSpatialFilter(nn.Module):
-    def __init__(self, n_chans, growth, depth, in_ch=1, bottleneck=4, drop_prob=0.0,
-                 activation=nn.LeakyReLU, collapse=True):
+    def __init__(
+        self,
+        n_chans: int,
+        growth: int,
+        depth: int,
+        in_ch: int = 1,
+        bottleneck: int = 4,
+        drop_prob: float = 0.0,
+        activation: type[nn.Module] = nn.LeakyReLU,
+        collapse: bool = True,
+    ):
         super().__init__()
-        self.net = nn.Sequential(*[
-            _DenseFilter(in_ch + growth * d, growth, bottleneck=bottleneck, drop_prob=drop_prob,
-                         activation=activation) for d in range(depth)
-        ])
+        self.net = nn.Sequential(
+            *[
+                _DenseFilter(
+                    in_ch + growth * d,
+                    growth,
+                    bottleneck=bottleneck,
+                    drop_prob=drop_prob,
+                    activation=activation,
+                )
+                for d in range(depth)
+            ]
+        )
         n_filters = in_ch + growth * depth
         self.collapse = collapse
         if collapse:
-            self.channel_collapse = _ConvBlock2D(n_filters, n_filters, (n_chans, 1), drop_prob=0)
+            self.channel_collapse = _ConvBlock2D(
+                n_filters, n_filters, (n_chans, 1), drop_prob=0, activation=activation
+            )
 
-    def forward(self, x):
+    def forward(self, x: torch.Tensor) -> torch.Tensor:
         if len(x.shape) < 4:
             x = x.unsqueeze(1).permute([0, 1, 3, 2])
         x = self.net(x)
@@ -99,8 +286,16 @@ class _DenseSpatialFilter(nn.Module):
 
 
 class _TemporalFilter(nn.Module):
-    def __init__(self, n_chans, filters, depth, temp_len, drop_prob=0., activation=nn.LeakyReLU,
-                 residual='netwise'):
+    def __init__(
+        self,
+        n_chans: int,
+        filters: int,
+        depth: int,
+        temp_len: int,
+        drop_prob: float = 0.0,
+        activation: type[nn.Module] = nn.LeakyReLU,
+        residual: str = "netwise",
+    ):
         super().__init__()
         temp_len = temp_len + 1 - temp_len % 2
         self.residual_style = str(residual)
@@ -108,32 +303,54 @@ class _TemporalFilter(nn.Module):
 
         for i in range(depth):
             dil = depth - i
-            conv = weight_norm(nn.Conv2d(n_chans if i == 0 else filters, filters,
-                                         kernel_size=(1, temp_len), dilation=dil,
-                                         padding=(0, dil * (temp_len - 1) // 2)))
-            net.append(nn.Sequential(
-                conv,
-                activation(),
-                nn.Dropout2d(drop_prob)
-            ))
-        if self.residual_style.lower() == 'netwise':
+            conv = weight_norm(
+                nn.Conv2d(
+                    n_chans if i == 0 else filters,
+                    filters,
+                    kernel_size=(1, temp_len),
+                    dilation=dil,
+                    padding=(0, dil * (temp_len - 1) // 2),
+                )
+            )
+            net.append(
+                nn.Sequential(conv, activation(), nn.Dropout2d(p=float(drop_prob)))
+            )
+        if self.residual_style.lower() == "netwise":
             self.net = nn.Sequential(*net)
             self.residual = nn.Conv2d(n_chans, filters, (1, 1))
-        elif residual.lower() == 'dense':
+        elif residual.lower() == "dense":
             self.net = net
 
-    def forward(self, x):
-        if self.residual_style.lower() == 'netwise':
+    def forward(self, x: torch.Tensor) -> torch.Tensor:
+        style = self.residual_style.lower()
+        if style == "netwise":
             return self.net(x) + self.residual(x)
-        elif self.residual_style.lower() == 'dense':
+        elif style == "dense":
             for layer in self.net:
                 x = torch.cat((x, layer(x)), dim=1)
             return x
+        # TorchScript now knows this path always returns or errors
+        else:
+            # Use an assertion so TorchScript can compile it
+            assert False, f"Unsupported residual style: {self.residual_style}"
 
 
 class _TIDNetFeatures(nn.Module):
-    def __init__(self, s_growth, t_filters, n_chans, n_times, drop_prob, pooling,
-                 temp_layers, spat_layers, temp_span, bottleneck, summary):
+    def __init__(
+        self,
+        s_growth: int,
+        t_filters: int,
+        n_chans: int,
+        n_times: int,
+        drop_prob: float,
+        pooling: int,
+        temp_layers: int,
+        spat_layers: int,
+        temp_span: float,
+        bottleneck: int,
+        summary: int,
+        activation: type[nn.Module] = nn.LeakyReLU,
+    ):
         super().__init__()
         self.n_chans = n_chans
         self.temp_len = ceil(temp_span * n_times)
@@ -141,17 +358,29 @@ class _TIDNetFeatures(nn.Module):
         self.temporal = nn.Sequential(
             Ensure4d(),
             Rearrange("batch C T 1 -> batch 1 C T"),
-            _TemporalFilter(1, t_filters, depth=temp_layers, temp_len=self.temp_len),
+            _TemporalFilter(
+                1,
+                t_filters,
+                depth=temp_layers,
+                temp_len=self.temp_len,
+                activation=activation,
+            ),
             nn.MaxPool2d((1, pooling)),
-            nn.Dropout2d(drop_prob),
+            nn.Dropout2d(p=float(drop_prob)),
         )
         summary = n_times // pooling if summary == -1 else summary
 
-        self.spatial = _DenseSpatialFilter(n_chans, s_growth, spat_layers, in_ch=t_filters,
-                                           drop_prob=drop_prob, bottleneck=bottleneck)
+        self.spatial = _DenseSpatialFilter(
+            n_chans=n_chans,
+            growth=s_growth,
+            depth=spat_layers,
+            in_ch=t_filters,
+            drop_prob=drop_prob,
+            bottleneck=bottleneck,
+            activation=activation,
+        )
         self.extract_features = nn.Sequential(
-            nn.AdaptiveAvgPool1d(int(summary)),
-            nn.Flatten(start_dim=1)
+            nn.AdaptiveAvgPool1d(int(summary)), nn.Flatten(start_dim=1)
         )
 
         self._num_features = (t_filters + s_growth * spat_layers) * summary
@@ -160,123 +389,7 @@ class _TIDNetFeatures(nn.Module):
     def num_features(self):
         return self._num_features
 
-    def forward(self, x):
+    def forward(self, x: torch.Tensor) -> torch.Tensor:
         x = self.temporal(x)
         x = self.spatial(x)
         return self.extract_features(x)
-
-
-class TIDNet(EEGModuleMixin, nn.Module):
-    """Thinker Invariance DenseNet model from Kostas et al 2020.
-
-    See [TIDNet]_ for details.
-
-    Parameters
-    ----------
-    s_growth : int
-        DenseNet-style growth factor (added filters per DenseFilter)
-    t_filters : int
-        Number of temporal filters.
-    drop_prob : float
-        Dropout probability
-    pooling : int
-        Max temporal pooling (width and stride)
-    temp_layers : int
-        Number of temporal layers
-    spat_layers : int
-        Number of DenseFilters
-    temp_span : float
-        Percentage of n_times that defines the temporal filter length:
-        temp_len = ceil(temp_span * n_times)
-        e.g A value of 0.05 for temp_span with 1500 n_times will yield a temporal
-        filter of length 75.
-    bottleneck : int
-        Bottleneck factor within Densefilter
-    summary : int
-        Output size of AdaptiveAvgPool1D layer. If set to -1, value will be calculated
-        automatically (n_times // pooling).
-    in_chans :
-        Alias for n_chans.
-    n_classes:
-        Alias for n_outputs.
-    input_window_samples :
-        Alias for n_times.
-
-    Notes
-    -----
-    Code adapted from: https://github.com/SPOClab-ca/ThinkerInvariance/
-
-    References
-    ----------
-    .. [TIDNet] Kostas, D. & Rudzicz, F.
-        Thinker invariance: enabling deep neural networks for BCI across more
-        people.
-        J. Neural Eng. 17, 056008 (2020).
-        doi: 10.1088/1741-2552/abb7a7.
-    """
-
-    def __init__(self, n_chans=None, n_outputs=None, n_times=None,
-                 in_chans=None, n_classes=None, input_window_samples=None,
-                 s_growth=24, t_filters=32, drop_prob=0.4, pooling=15,
-                 temp_layers=2, spat_layers=2, temp_span=0.05,
-                 bottleneck=3, summary=-1, add_log_softmax=True):
-        n_chans, n_outputs, n_times = deprecated_args(
-            self,
-            ('in_chans', 'n_chans', in_chans, n_chans),
-            ('n_classes', 'n_outputs', n_classes, n_outputs),
-            ('input_window_samples', 'n_times', input_window_samples, n_times),
-        )
-        super().__init__(
-            n_outputs=n_outputs,
-            n_chans=n_chans,
-            n_times=n_times,
-            add_log_softmax=add_log_softmax,
-        )
-        del n_outputs, n_chans, n_times
-        del in_chans, n_classes, input_window_samples
-
-        self.mapping = {
-            'classify.1.weight': 'final_layer.0.weight',
-            'classify.1.bias': 'final_layer.0.bias'
-        }
-
-        self.temp_len = ceil(temp_span * self.n_times)
-
-        self.dscnn = _TIDNetFeatures(s_growth=s_growth, t_filters=t_filters, n_chans=self.n_chans,
-                                     n_times=self.n_times,
-                                     drop_prob=drop_prob, pooling=pooling, temp_layers=temp_layers,
-                                     spat_layers=spat_layers, temp_span=temp_span,
-                                     bottleneck=bottleneck, summary=summary)
-
-        self._num_features = self.dscnn.num_features
-
-        self.flatten = nn.Flatten(start_dim=1)
-
-        self.final_layer = self._create_classifier(self.num_features, self.n_outputs)
-
-    def _create_classifier(self, incoming, n_outputs):
-        classifier = nn.Linear(incoming, n_outputs)
-        init.xavier_normal_(classifier.weight)
-        classifier.bias.data.zero_()
-        seq_clf = nn.Sequential(
-            classifier,
-            nn.LogSoftmax(dim=-1) if self.add_log_softmax else nn.Identity())
-
-        return seq_clf
-
-    def forward(self, x):
-        """Forward pass.
-
-        Parameters
-        ----------
-        x: torch.Tensor
-            Batch of EEG windows of shape (batch_size, n_channels, n_times).
-        """
-
-        x = self.dscnn(x)
-        x = self.flatten(x)
-        return self.final_layer(x)
-
-    @property
-    def num_features(self):
-        return self._num_features