Fix tests.

Author: samuelgarcia

src/spikeinterface/benchmark/benchmark_matching.py

@@ -77,6 +77,7 @@ def plot_performances_vs_snr(self, case_keys=None, figsize=None, metrics=["accur
         if case_keys is None:
             case_keys = list(self.cases.keys())
 
+        import matplotlib.pyplot as plt
         fig, axs = plt.subplots(ncols=1, nrows=len(metrics), figsize=figsize, squeeze=False)
 
         for count, k in enumerate(metrics):

src/spikeinterface/benchmark/benchmark_tools.py

@@ -1,2 +0,0 @@
-from spikeinterface.benchmark.benchmark_base import Benchmark, BenchmarkStudy
-from spikeinterface.benchmark.benchmark_plot_tools import _simpleaxis

src/spikeinterface/benchmark/tests/test_benchmark_clustering.py

@@ -3,11 +3,13 @@
 
 import shutil
 
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import make_dataset
-from spikeinterface.sortingcomponents.benchmark.benchmark_clustering import ClusteringStudy
+from spikeinterface.benchmark.tests.common_benchmark_testing import make_dataset
+from spikeinterface.benchmark.benchmark_clustering import ClusteringStudy
 from spikeinterface.core.sortinganalyzer import create_sorting_analyzer
 from spikeinterface.core.template_tools import get_template_extremum_channel
 
+from pathlib import Path
+
 
 @pytest.mark.skip()
 def test_benchmark_clustering(create_cache_folder):
@@ -78,4 +80,5 @@ def test_benchmark_clustering(create_cache_folder):
 
 
 if __name__ == "__main__":
-    test_benchmark_clustering()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_clustering(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_matching.py

@@ -1,18 +1,19 @@
 import pytest
 
 import shutil
+from pathlib import Path
 
 
 from spikeinterface.core import (
     get_noise_levels,
     compute_sparsity,
 )
 
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import (
+from spikeinterface.benchmark.tests.common_benchmark_testing import (
     make_dataset,
     compute_gt_templates,
 )
-from spikeinterface.sortingcomponents.benchmark.benchmark_matching import MatchingStudy
+from spikeinterface.benchmark.benchmark_matching import MatchingStudy
 
 
 @pytest.mark.skip()
@@ -72,4 +73,5 @@ def test_benchmark_matching(create_cache_folder):
 
 
 if __name__ == "__main__":
-    test_benchmark_matching()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_matching(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_motion_estimation.py

@@ -2,12 +2,13 @@
 
 
 import shutil
+from pathlib import Path
 
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import (
+from spikeinterface.benchmark.tests.common_benchmark_testing import (
     make_drifting_dataset,
 )
 
-from spikeinterface.sortingcomponents.benchmark.benchmark_motion_estimation import MotionEstimationStudy
+from spikeinterface.benchmark.benchmark_motion_estimation import MotionEstimationStudy
 
 
 @pytest.mark.skip()
@@ -75,4 +76,5 @@ def test_benchmark_motion_estimaton(create_cache_folder):
 
 
 if __name__ == "__main__":
-    test_benchmark_motion_estimaton()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_motion_estimaton(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_motion_interpolation.py

@@ -4,14 +4,14 @@
 import numpy as np
 
 import shutil
+from pathlib import Path
 
-
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import (
+from spikeinterface.benchmark.tests.common_benchmark_testing import (
     make_drifting_dataset,
 )
 
-from spikeinterface.sortingcomponents.benchmark.benchmark_motion_interpolation import MotionInterpolationStudy
-from spikeinterface.sortingcomponents.benchmark.benchmark_motion_estimation import (
+from spikeinterface.benchmark.benchmark_motion_interpolation import MotionInterpolationStudy
+from spikeinterface.benchmark.benchmark_motion_estimation import (
     # get_unit_displacement,
     get_gt_motion_from_unit_displacement,
 )
@@ -139,4 +139,5 @@ def test_benchmark_motion_interpolation(create_cache_folder):
 
 
 if __name__ == "__main__":
-    test_benchmark_motion_interpolation()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_motion_interpolation(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_peak_detection.py

@@ -1,10 +1,10 @@
 import pytest
 
 import shutil
+from pathlib import Path
 
-
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import make_dataset
-from spikeinterface.sortingcomponents.benchmark.benchmark_peak_detection import PeakDetectionStudy
+from spikeinterface.benchmark.tests.common_benchmark_testing import make_dataset
+from spikeinterface.benchmark.benchmark_peak_detection import PeakDetectionStudy
 from spikeinterface.core.sortinganalyzer import create_sorting_analyzer
 from spikeinterface.core.template_tools import get_template_extremum_channel
 
@@ -69,5 +69,5 @@ def test_benchmark_peak_detection(create_cache_folder):
 
 
 if __name__ == "__main__":
-    # test_benchmark_peak_localization()
-    test_benchmark_peak_detection()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_peak_detection(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_peak_localization.py

@@ -1,12 +1,12 @@
 import pytest
 
 import shutil
+from pathlib import Path
 
+from spikeinterface.benchmark.tests.common_benchmark_testing import make_dataset
 
-from spikeinterface.sortingcomponents.benchmark.tests.common_benchmark_testing import make_dataset
-
-from spikeinterface.sortingcomponents.benchmark.benchmark_peak_localization import PeakLocalizationStudy
-from spikeinterface.sortingcomponents.benchmark.benchmark_peak_localization import UnitLocalizationStudy
+from spikeinterface.benchmark.benchmark_peak_localization import PeakLocalizationStudy
+from spikeinterface.benchmark.benchmark_peak_localization import UnitLocalizationStudy
 
 
 @pytest.mark.skip()
@@ -28,7 +28,8 @@ def test_benchmark_peak_localization(create_cache_folder):
             "init_kwargs": {"gt_positions": gt_sorting.get_property("gt_unit_locations")},
             "params": {
                 "method": method,
-                "method_kwargs": {"ms_before": 2},
+                "ms_before": 2.0,
+                "method_kwargs": {},
             },
         }
 
@@ -60,7 +61,7 @@ def test_benchmark_unit_locations(create_cache_folder):
     cache_folder = create_cache_folder
     job_kwargs = dict(n_jobs=0.8, chunk_duration="100ms")
 
-    recording, gt_sorting = make_dataset()
+    recording, gt_sorting, gt_analyzer = make_dataset()
 
     # create study
     study_folder = cache_folder / "study_unit_locations"
@@ -71,7 +72,7 @@ def test_benchmark_unit_locations(create_cache_folder):
             "label": f"{method} on toy",
             "dataset": "toy",
             "init_kwargs": {"gt_positions": gt_sorting.get_property("gt_unit_locations")},
-            "params": {"method": method, "method_kwargs": {"ms_before": 2}},
+            "params": {"method": method, "ms_before": 2.0, "method_kwargs": {}},
         }
 
     if study_folder.exists():
@@ -99,5 +100,6 @@ def test_benchmark_unit_locations(create_cache_folder):
 
 
 if __name__ == "__main__":
-    # test_benchmark_peak_localization()
-    test_benchmark_unit_locations()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    # test_benchmark_peak_localization(cache_folder)
+    test_benchmark_unit_locations(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_peak_selection.py

@@ -1,11 +1,12 @@
 import pytest
 
+from pathlib import Path
 
 @pytest.mark.skip()
 def test_benchmark_peak_selection(create_cache_folder):
     cache_folder = create_cache_folder
-    pass
 
 
 if __name__ == "__main__":
-    test_benchmark_peak_selection()
+    cache_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks"
+    test_benchmark_peak_selection(cache_folder)

src/spikeinterface/benchmark/tests/test_benchmark_sorter.py

@@ -86,5 +86,5 @@ def test_SorterStudy(setup_module):
 
 if __name__ == "__main__":
     study_folder = Path(__file__).resolve().parents[4] / "cache_folder" / "benchmarks" / "test_SorterStudy"
-    # create_a_study(study_folder)
+    create_a_study(study_folder)
     test_SorterStudy(study_folder)