From 4caf757c58f95c2e20f6b4fb585a07c5dc92c8f1 Mon Sep 17 00:00:00 2001 From: Alessio Buccino Date: Fri, 12 Jan 2024 14:53:12 +0100 Subject: [PATCH] Use run_sorter function in test_containers_singularity_gpu --- .../workflows/test_containers_singularity_gpu.yml | 2 +- .../tests/test_singularity_containers_gpu.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_containers_singularity_gpu.yml b/.github/workflows/test_containers_singularity_gpu.yml index e74fbeb4a5..80e6642bdd 100644 --- a/.github/workflows/test_containers_singularity_gpu.yml +++ b/.github/workflows/test_containers_singularity_gpu.yml @@ -1,4 +1,4 @@ -name: CI-Test in AWS for GPU +name: Test GPU sorter images in singularity on AWS on: workflow_dispatch: diff --git a/src/spikeinterface/sorters/external/tests/test_singularity_containers_gpu.py b/src/spikeinterface/sorters/external/tests/test_singularity_containers_gpu.py index 16159a03da..b164f16c43 100644 --- a/src/spikeinterface/sorters/external/tests/test_singularity_containers_gpu.py +++ b/src/spikeinterface/sorters/external/tests/test_singularity_containers_gpu.py @@ -41,31 +41,32 @@ def run_kwargs(): def test_kilosort2(run_kwargs): clean_singularity_cache() - sorting = ss.run_kilosort2(output_folder="kilosort2", **run_kwargs) + sorting = ss.run_sorter(sorter_name="kilosort2", output_folder="kilosort2", **run_kwargs) print(sorting) def test_kilosort2_5(run_kwargs): clean_singularity_cache() - sorting = ss.run_kilosort2_5(output_folder="kilosort2_5", **run_kwargs) + sorting = ss.run_sorter(sorter_name="kilosort2_5", output_folder="kilosort2_5", **run_kwargs) print(sorting) def test_kilosort3(run_kwargs): clean_singularity_cache() - sorting = ss.run_kilosort3(output_folder="kilosort3", **run_kwargs) + sorting = ss.run_sorter(sorter_name="kilosort3", output_folder="kilosort3", **run_kwargs) print(sorting) -def test_yass(run_kwargs): +def test_pykilosort(run_kwargs): clean_singularity_cache() - sorting = ss.run_yass(output_folder="yass", **run_kwargs) + sorting = ss.run_sorter(sorter_name="pykilosort", output_folder="pykilosort", **run_kwargs) print(sorting) -def test_pykilosort(run_kwargs): +@pytest.mark.skip("YASS is not supported anymore for Python>=3.8") +def test_yass(run_kwargs): clean_singularity_cache() - sorting = ss.run_pykilosort(output_folder="pykilosort", **run_kwargs) + sorting = ss.run_sorter(sorter_name="yass", output_folder="yass", **run_kwargs) print(sorting)