Skip to content

Commit bd1b6e3

Browse files
author
PaulusBoskabouter
committed
Fixed merge-conflict
1 parent 9108387 commit bd1b6e3

3 files changed

Lines changed: 143 additions & 4 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ docs/source/api/
125125
examples/advanced_examples/Results/
126126
examples/benchmark/
127127
examples/results/
128-
/.conda
128+
/.conda

‎docs/source/sg_execution_times.rst‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
2+
:orphan:
3+
4+
.. _sphx_glr_sg_execution_times:
5+
6+
7+
Computation times
8+
=================
9+
**00:00.000** total execution time for 36 files **from all galleries**:
10+
11+
.. container::
12+
13+
.. raw:: html
14+
15+
<style scoped>
16+
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.3.0/css/bootstrap.min.css" rel="stylesheet" />
17+
<link href="https://cdn.datatables.net/1.13.6/css/dataTables.bootstrap5.min.css" rel="stylesheet" />
18+
</style>
19+
<script src="https://code.jquery.com/jquery-3.7.0.js"></script>
20+
<script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
21+
<script src="https://cdn.datatables.net/1.13.6/js/dataTables.bootstrap5.min.js"></script>
22+
<script type="text/javascript" class="init">
23+
$(document).ready( function () {
24+
$('table.sg-datatable').DataTable({order: [[1, 'desc']]});
25+
} );
26+
</script>
27+
28+
.. list-table::
29+
:header-rows: 1
30+
:class: table table-striped sg-datatable
31+
32+
* - Example
33+
- Time
34+
- Mem (MB)
35+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_dataset_bubbles.py` (``..\..\examples\advanced_examples\plot_dataset_bubbles.py``)
36+
- 00:00.000
37+
- 0.0
38+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_dreyer_clf_scores_vs_subj_info.py` (``..\..\examples\advanced_examples\plot_dreyer_clf_scores_vs_subj_info.py``)
39+
- 00:00.000
40+
- 0.0
41+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_filterbank_csp_vs_csp.py` (``..\..\examples\advanced_examples\plot_filterbank_csp_vs_csp.py``)
42+
- 00:00.000
43+
- 0.0
44+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_grid_search_withinsession.py` (``..\..\examples\advanced_examples\plot_grid_search_withinsession.py``)
45+
- 00:00.000
46+
- 0.0
47+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_hinss2021_classification.py` (``..\..\examples\advanced_examples\plot_hinss2021_classification.py``)
48+
- 00:00.000
49+
- 0.0
50+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_mne_and_scikit_estimators.py` (``..\..\examples\advanced_examples\plot_mne_and_scikit_estimators.py``)
51+
- 00:00.000
52+
- 0.0
53+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_mne_features_pipeline.py` (``..\..\examples\advanced_examples\plot_mne_features_pipeline.py``)
54+
- 00:00.000
55+
- 0.0
56+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_phmd_ml_spectrum.py` (``..\..\examples\advanced_examples\plot_phmd_ml_spectrum.py``)
57+
- 00:00.000
58+
- 0.0
59+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_pre_processing_steps.py` (``..\..\examples\advanced_examples\plot_pre_processing_steps.py``)
60+
- 00:00.000
61+
- 0.0
62+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_select_electrodes_resample.py` (``..\..\examples\advanced_examples\plot_select_electrodes_resample.py``)
63+
- 00:00.000
64+
- 0.0
65+
* - :ref:`sphx_glr_auto_examples_advanced_examples_plot_statistical_analysis.py` (``..\..\examples\advanced_examples\plot_statistical_analysis.py``)
66+
- 00:00.000
67+
- 0.0
68+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_noplot_load_model.py` (``..\..\examples\data_management_and_configuration\noplot_load_model.py``)
69+
- 00:00.000
70+
- 0.0
71+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_plot_bids_conversion.py` (``..\..\examples\data_management_and_configuration\plot_bids_conversion.py``)
72+
- 00:00.000
73+
- 0.0
74+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_plot_changing_download_directory.py` (``..\..\examples\data_management_and_configuration\plot_changing_download_directory.py``)
75+
- 00:00.000
76+
- 0.0
77+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_plot_disk_cache.py` (``..\..\examples\data_management_and_configuration\plot_disk_cache.py``)
78+
- 00:00.000
79+
- 0.0
80+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_plot_explore_paradigm.py` (``..\..\examples\data_management_and_configuration\plot_explore_paradigm.py``)
81+
- 00:00.000
82+
- 0.0
83+
* - :ref:`sphx_glr_auto_examples_data_management_and_configuration_plot_fixed_interval_windows.py` (``..\..\examples\data_management_and_configuration\plot_fixed_interval_windows.py``)
84+
- 00:00.000
85+
- 0.0
86+
* - :ref:`sphx_glr_auto_examples_how_to_benchmark_example_codecarbon.py` (``..\..\examples\how_to_benchmark\example_codecarbon.py``)
87+
- 00:00.000
88+
- 0.0
89+
* - :ref:`sphx_glr_auto_examples_how_to_benchmark_plot_benchmark.py` (``..\..\examples\how_to_benchmark\plot_benchmark.py``)
90+
- 00:00.000
91+
- 0.0
92+
* - :ref:`sphx_glr_auto_examples_how_to_benchmark_plot_benchmark_grid_search.py` (``..\..\examples\how_to_benchmark\plot_benchmark_grid_search.py``)
93+
- 00:00.000
94+
- 0.0
95+
* - :ref:`sphx_glr_auto_examples_how_to_benchmark_tutorial_6_within_session_splitter.py` (``..\..\examples\how_to_benchmark\tutorial_6_within_session_splitter.py``)
96+
- 00:00.000
97+
- 0.0
98+
* - :ref:`sphx_glr_auto_examples_learning_curve_noplot_learning_curve_p300_external.py` (``..\..\examples\learning_curve\noplot_learning_curve_p300_external.py``)
99+
- 00:00.000
100+
- 0.0
101+
* - :ref:`sphx_glr_auto_examples_learning_curve_plot_learning_curve_motor_imagery.py` (``..\..\examples\learning_curve\plot_learning_curve_motor_imagery.py``)
102+
- 00:00.000
103+
- 0.0
104+
* - :ref:`sphx_glr_auto_examples_learning_curve_plot_learning_curve_p300.py` (``..\..\examples\learning_curve\plot_learning_curve_p300.py``)
105+
- 00:00.000
106+
- 0.0
107+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_cross_session_motor_imagery.py` (``..\..\examples\paradigm_examples\plot_cross_session_motor_imagery.py``)
108+
- 00:00.000
109+
- 0.0
110+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_cross_session_multiple_datasets.py` (``..\..\examples\paradigm_examples\plot_cross_session_multiple_datasets.py``)
111+
- 00:00.000
112+
- 0.0
113+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_cross_subject_ssvep.py` (``..\..\examples\paradigm_examples\plot_cross_subject_ssvep.py``)
114+
- 00:00.000
115+
- 0.0
116+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_vr_pc_p300_different_epoch_size.py` (``..\..\examples\paradigm_examples\plot_vr_pc_p300_different_epoch_size.py``)
117+
- 00:00.000
118+
- 0.0
119+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_within_session_p300.py` (``..\..\examples\paradigm_examples\plot_within_session_p300.py``)
120+
- 00:00.000
121+
- 0.0
122+
* - :ref:`sphx_glr_auto_examples_paradigm_examples_plot_within_session_ssvep.py` (``..\..\examples\paradigm_examples\plot_within_session_ssvep.py``)
123+
- 00:00.000
124+
- 0.0
125+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_0_plot_getting_started.py` (``..\..\examples\tutorials\tutorial_0_plot_getting_started.py``)
126+
- 00:00.000
127+
- 0.0
128+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_1_simple_example_motor_imagery.py` (``..\..\examples\tutorials\tutorial_1_simple_example_motor_imagery.py``)
129+
- 00:00.000
130+
- 0.0
131+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_2_using_mulitple_datasets.py` (``..\..\examples\tutorials\tutorial_2_using_mulitple_datasets.py``)
132+
- 00:00.000
133+
- 0.0
134+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_3_benchmarking_multiple_pipelines.py` (``..\..\examples\tutorials\tutorial_3_benchmarking_multiple_pipelines.py``)
135+
- 00:00.000
136+
- 0.0
137+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_4_adding_a_dataset.py` (``..\..\examples\tutorials\tutorial_4_adding_a_dataset.py``)
138+
- 00:00.000
139+
- 0.0
140+
* - :ref:`sphx_glr_auto_examples_tutorials_tutorial_5_build_a_custom_dataset.py` (``..\..\examples\tutorials\tutorial_5_build_a_custom_dataset.py``)
141+
- 00:00.000
142+
- 0.0

‎examples/how_to_benchmark/tutorial_6_within_session_splitter.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
print(df.head())
165165

166166

167-
<<<<<<< HEAD
168167
###############################################################################
169168
# Summary of results
170169
###############################################################################
@@ -190,8 +189,6 @@
190189
plt.tight_layout()
191190
plt.show()
192191

193-
=======
194-
>>>>>>> e04448d76e639e8d75b1c12ba5bfd49b3d788cb6
195192
###############################################################################
196193
# Visualisation of the data split
197194
###############################################################################

0 commit comments

Comments
 (0)