braindecode 0.1.8__tar.gz → 0.1.9__tar.gz

{Braindecode-0.1.8 → Braindecode-0.1.9}/Braindecode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Braindecode
-Version: 0.1.8
+Version: 0.1.9
 Summary: A deep learning toolbox to decode raw time-domain EEG.
 Home-page: https://github.com/robintibor/braindecode
 Author: Robin Tibor Schirrmeister

{Braindecode-0.1.8 → Braindecode-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Braindecode
-Version: 0.1.8
+Version: 0.1.9
 Summary: A deep learning toolbox to decode raw time-domain EEG.
 Home-page: https://github.com/robintibor/braindecode
 Author: Robin Tibor Schirrmeister

{Braindecode-0.1.8 → Braindecode-0.1.9}/braindecode/datautil/signalproc.py

@@ -17,7 +17,7 @@ def exponential_running_standardize(data, factor_new=0.001,
     :math:`m_t=\mathrm{factornew} \cdot mean(x_t) + (1 - \mathrm{factornew}) \cdot m_{t-1}`.
     
     Then, compute exponential running variance :math:`v_t` at time `t` as 
-    :math:`m_t=\mathrm{factornew} \cdot (m_t - x_t)^2 + (1 - \mathrm{factornew}) \cdot v_{t-1}`.
+    :math:`v_t=\mathrm{factornew} \cdot (m_t - x_t)^2 + (1 - \mathrm{factornew}) \cdot v_{t-1}`.
     
     Finally, standardize the data point :math:`x_t` at time `t` as:
     :math:`x'_t=(x_t - m_t) / max(\sqrt{v_t}, eps)`.
@@ -214,4 +214,3 @@ def filter_is_stable(a):
         "a: {:s}".format(str(a)))
     # from http://stackoverflow.com/a/8812737/1469195
     return np.all(np.abs(np.roots(a))<1)
-

{Braindecode-0.1.8 → Braindecode-0.1.9}/braindecode/models/deep4.py

@@ -45,7 +45,8 @@ class Deep4Net(object):
                  double_time_convs=False,
                  split_first_layer=True,
                  batch_norm=True,
-                 batch_norm_alpha=0.1):
+                 batch_norm_alpha=0.1,
+                 stride_before_pool=False):
         if final_conv_length == 'auto':
             assert input_time_length is not None
 
@@ -53,6 +54,12 @@ class Deep4Net(object):
         del self.self
 
     def create_network(self):
+        if self.stride_before_pool:
+            conv_stride = self.pool_time_stride
+            pool_stride = 1
+        else:
+            conv_stride = 1
+            pool_stride = self.pool_time_stride
         pool_class_dict = dict(max=nn.MaxPool2d, mean=AvgPool2dWithConv)
         first_pool_class = pool_class_dict[self.first_pool_mode]
         later_pool_class = pool_class_dict[self.later_pool_mode]
@@ -66,14 +73,15 @@ class Deep4Net(object):
                                                     stride=1, ))
             model.add_module('conv_spat',
                              nn.Conv2d(self.n_filters_time, self.n_filters_spat,
-                                       (1, self.in_chans), stride=1,
+                                       (1, self.in_chans),
+                                       stride=(conv_stride, 1),
                                        bias=not self.batch_norm))
             n_filters_conv = self.n_filters_spat
         else:
             model.add_module('conv_time',
                              nn.Conv2d(self.in_chans, self.n_filters_time,
                                        (self.filter_time_length, 1),
-                                       stride=1,
+                                       stride=(conv_stride, 1),
                                        bias=not self.batch_norm))
             n_filters_conv = self.n_filters_time
         if self.batch_norm:
@@ -86,7 +94,7 @@ class Deep4Net(object):
         model.add_module('pool',
                          first_pool_class(
                              kernel_size=(self.pool_time_length, 1),
-                             stride=(self.pool_time_stride, 1)))
+                             stride=(pool_stride, 1)))
         model.add_module('pool_nonlin', Expression(self.first_pool_nonlin))
 
         def add_conv_pool_block(model, n_filters_before,
@@ -97,7 +105,8 @@ class Deep4Net(object):
             model.add_module('conv' + suffix.format(block_nr),
                              nn.Conv2d(n_filters_before, n_filters,
                                        (filter_length, 1),
-                                       stride=1, bias=not self.batch_norm))
+                                       stride=(conv_stride, 1),
+                                       bias=not self.batch_norm))
             if self.batch_norm:
                 model.add_module('bnorm' + suffix,
                              nn.BatchNorm2d(n_filters,
@@ -110,7 +119,7 @@ class Deep4Net(object):
             model.add_module('pool' + suffix,
                              later_pool_class(
                                  kernel_size=(self.pool_time_length, 1),
-                                 stride=(self.pool_time_stride, 1)))
+                                 stride=(pool_stride, 1)))
             model.add_module('pool_nonlin' + suffix,
                              Expression(self.later_pool_nonlin))
 

{Braindecode-0.1.8 → Braindecode-0.1.9}/docs/conf.py

@@ -21,6 +21,8 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('..'))
+import matplotlib
+matplotlib.use('agg')
 
 
 
@@ -108,9 +110,9 @@ author = 'Robin Tibor Schirrmeister'
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.6'
+version = '0.1.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.6'
+release = '0.1.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.