Solve conflicts 2

Author: alejoe91

src/spikeinterface/sorters/internal/spyking_circus2.py

@@ -34,7 +34,7 @@ class Spykingcircus2Sorter(ComponentsBasedSorter):
         "apply_motion_correction": True,
         "motion_correction": {"preset": "dredge_fast"},
         "merging": {"max_distance_um": 50},
-        "clustering": {"method": "circus-clustering", "method_kwargs": dict(remove_small_snr=True)},
+        "clustering": {"method": "circus", "method_kwargs": dict()},
         "matching": {"method": "circus-omp-svd", "method_kwargs": dict(), "gather_mode": "memory"},
         "apply_preprocessing": True,
         "templates_from_svd": True,
@@ -386,8 +386,9 @@ def _run_from_folder(cls, sorter_output_folder, params, verbose):
             matching_params["templates"] = templates
 
             if matching_method is not None:
+                gather_kwargs = {}
                 if gather_mode == "npy":
-                    gather_kwargs["folder"] = gather_kwargs.get("folder", sorter_output_folder / "matching")
+                    gather_kwargs["folder"] = sorter_output_folder / "matching"
                 spikes = find_spikes_from_templates(
                     recording_w,
                     matching_method,

src/spikeinterface/sorters/internal/tests/test_spykingcircus2.py

@@ -9,6 +9,7 @@
 class SpykingCircus2SorterCommonTestSuite(SorterCommonTestSuite, unittest.TestCase):
     SorterClass = Spykingcircus2Sorter
 
+    @unittest.skip("performance reason")
     def test_with_numpy_gather(self):
         recording = self.recording
         sorter_name = self.SorterClass.sorter_name

src/spikeinterface/sorters/internal/tests/test_tridesclous2.py

@@ -10,6 +10,7 @@
 class Tridesclous2SorterCommonTestSuite(SorterCommonTestSuite, unittest.TestCase):
     SorterClass = Tridesclous2Sorter
 
+    @unittest.skip("performance reason")
     def test_with_numpy_gather(self):
         recording = self.recording
         sorter_name = self.SorterClass.sorter_name

src/spikeinterface/sorters/internal/tridesclous2.py

@@ -278,13 +278,13 @@ def _run_from_folder(cls, sorter_output_folder, params, verbose):
         ## peeler
         matching_method = params["matching"].pop("method")
         gather_mode = params["matching"].pop("gather_mode", "memory")
-        gather_kwargs = params["matching"].pop("gather_kwargs", {})
         matching_params = params["matching"].get("matching_kwargs", {}).copy()
         matching_params["templates"] = templates
         if matching_method in ("tdc-peeler",):
             matching_params["noise_levels"] = noise_levels
+        gather_kwargs = {}
         if gather_mode == "npy":
-            gather_kwargs = {"folder": gather_kwargs.get("folder", sorter_output_folder / "matching")}
+            gather_kwargs["folder"] = sorter_output_folder / "matching"
         spikes = find_spikes_from_templates(
             recording_for_peeler,
             method=matching_method,