Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
556f1b6
bye keras models
bruAristimunha Feb 12, 2025
950aed6
bye keras models
bruAristimunha Feb 12, 2025
521bfea
no more keras models
bruAristimunha Feb 12, 2025
9a8ae9f
removing the docker and poetry comments
bruAristimunha Feb 12, 2025
cb4f809
updating the instruction list
bruAristimunha Feb 12, 2025
82bc803
updating poetry part
bruAristimunha Feb 12, 2025
63fe220
removing keras
bruAristimunha Feb 12, 2025
0db6742
removing keras
bruAristimunha Feb 12, 2025
0c95713
removing util deep learning from moabb
bruAristimunha Feb 12, 2025
ef370d6
updating the tests
bruAristimunha Feb 12, 2025
649a99e
removing scikeras
bruAristimunha Feb 12, 2025
feaa6f6
removing scikeras
bruAristimunha Feb 12, 2025
87c6da5
removing more keras
bruAristimunha Feb 12, 2025
4b4d178
updating import
bruAristimunha Feb 12, 2025
38741de
Merge branch 'develop' into bye-keras-model
bruAristimunha Feb 12, 2025
ff68b17
Updating the whats_new file
bruAristimunha Feb 12, 2025
78c7aec
Merge remote-tracking branch 'origin/bye-keras-model' into bye-keras-…
bruAristimunha Feb 12, 2025
f4284a2
bye m2r2
bruAristimunha Feb 12, 2025
32e6575
updating the docs dep
bruAristimunha Feb 12, 2025
20a340d
Updating the python version
bruAristimunha Feb 12, 2025
3045f25
- to _
bruAristimunha Feb 12, 2025
21e24b4
Apply suggestion from the review.
bruAristimunha Feb 12, 2025
5997294
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 12, 2025
45aa8aa
Merge branch 'develop' into bye-keras-model
bruAristimunha Feb 14, 2025
3c968f0
Merge branch 'develop' into bye-keras-model
bruAristimunha Feb 25, 2025
0cff396
Merge branch 'develop' into bye-keras-model
bruAristimunha Mar 4, 2025
ea74f99
Merge branch 'develop' into bye-keras-model
bruAristimunha Mar 5, 2025
afc663c
updating the docstring
bruAristimunha Mar 5, 2025
df62535
updating the docs yml file
bruAristimunha Mar 5, 2025
a3ad6b0
update to make the review easy
bruAristimunha Mar 5, 2025
d006e37
updating config
bruAristimunha Mar 5, 2025
8308407
Merge branch 'develop' into bye-keras-model
bruAristimunha Mar 7, 2025
e050a4f
fixing merging issue
bruAristimunha Mar 7, 2025
315d519
renaming
bruAristimunha Mar 7, 2025
58a0ce5
update whats new file
bruAristimunha Mar 7, 2025
d0ed0b2
Apply suggestions from code review
bruAristimunha Mar 7, 2025
a69f869
renaming
bruAristimunha Mar 7, 2025
db4bd99
Merge remote-tracking branch 'origin/bye-keras-model' into bye-keras-…
bruAristimunha Mar 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ _Note 2 (deep learning):_\
In case you want to install the optional deep learning dependencies (i.e. `pip install .[deeplearning]`),


### Tools used

### Tools used

MOABB uses [`pre-commit`](https://pre-commit.com/). It automatically runs variety of Code Quality
Expand Down
37 changes: 37 additions & 0 deletions docs/source/pipelines.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
=========
Pipelines
=========

.. automodule:: moabb.pipelines

.. currentmodule:: moabb.pipelines

---------
Pipelines
---------

.. autosummary::
:toctree: generated/
:template: class.rst

features.LogVariance
features.FM
features.ExtendedSSVEPSignal
features.AugmentedDataset
features.StandardScaler_Epoch
csp.TRCSP
classification.SSVEP_CCA
classification.SSVEP_TRCA
classification.SSVEP_MsetCCA


------------
Base & Utils
------------

.. autosummary::
:toctree: generated/
:template: function.rst

utils.create_pipeline_from_config
utils.FilterBank
2 changes: 2 additions & 0 deletions docs/source/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Bugs

API changes
~~~~~~~~~~~
- Removing the deep learning module from inside moabb in favour of braindecode integration (:gh:`692` by `Bruno Aristimunha`_ )


Version - 1.2.0 (Stable - PyPi)
Expand Down Expand Up @@ -66,6 +67,7 @@ API changes
- Removing the braindecode module from inside moabb (:gh:`666` by `Bruno Aristimunha`_ )



Version - 1.1.1
----------------

Expand Down
40 changes: 0 additions & 40 deletions examples/advanced_examples/pipelines_save/keras_deepconvnet.yml

This file was deleted.

32 changes: 3 additions & 29 deletions examples/data_management_and_configuration/noplot_load_model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
==============================================
Load Model (Scikit, Keras) with MOABB
Load Model (Scikit) with MOABB
==============================================

This example shows how to use load the pretrained pipeline in MOABB.
Expand All @@ -12,12 +12,7 @@

from pickle import load

import keras
from scikeras.wrappers import KerasClassifier
from sklearn.pipeline import Pipeline

from moabb import set_log_level
from moabb.pipelines.features import StandardScaler_Epoch
from moabb.utils import setup_seed


Expand All @@ -26,9 +21,7 @@
###############################################################################
# In this example, we will use the results computed by the following examples
#
# - plot_benchmark_
# - plot_benchmark_braindecode_
# - plot_benchmark_DL_
# - plot_benchmark
# ---------------------

# Set up reproducibility of Tensorflow and PyTorch
Expand All @@ -38,26 +31,7 @@
# Loading the Scikit-learn pipelines

with open(
"./results/Models_WithinSession/Zhou2016/1/0/CSP + SVM/fitted_model_best.pkl",
"../how_to_benchmark/results/Models_WithinSession/Zhou2016/1/0/csp+svm/fitted_model_best.pkl",
"rb",
) as pickle_file:
CSP_SVM_Trained = load(pickle_file)

###############################################################################
# Loading the Keras model
# We load the single Keras model, if we want we can set in the exact same pipeline.

model_Keras = keras.models.load_model(
"../how_to_benchmark/results/Models_WithinSession/BNCI2014-001/1/1E/Keras_DeepConvNet/kerasdeepconvnet_fitted_model_best.h5"
)
# Now we need to instantiate a new SciKeras object since we only saved the Keras model
Keras_DeepConvNet_Trained = KerasClassifier(model_Keras)
# Create the pipelines


pipes_keras = Pipeline(
[
("StandardScaler_Epoch", StandardScaler_Epoch),
("Keras_DeepConvNet_Trained", Keras_DeepConvNet_Trained),
]
)
124 changes: 0 additions & 124 deletions examples/how_to_benchmark/noplot_benchmark_dl.py

This file was deleted.

This file was deleted.

48 changes: 0 additions & 48 deletions examples/how_to_benchmark/pipelines_dl/keras_deepconvnet.yml

This file was deleted.

Loading
Loading