Skip to content

Commit 282f717

Browse files
committed
Update tests
1 parent 924c60d commit 282f717

1 file changed

Lines changed: 28 additions & 6 deletions

File tree

tests/test_kilosorts.py

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def test_kilosort2_skip_preproc(run_kwargs):
118118
run_kwargs["recording"] = spre.scale(run_kwargs["recording"], gain=gain, dtype="int16")
119119

120120
sorting = ss.run_sorter(
121-
"kilosort2", output_folder="kilosort2", skip_kilosort_preprocessing=True, scaleproc=gain, **run_kwargs
121+
"kilosort2", output_folder="kilosort2_skip", skip_kilosort_preprocessing=True, scaleproc=gain, **run_kwargs
122122
)
123123
print(sorting)
124124

@@ -132,15 +132,30 @@ def test_kilosort2_5_skip_preproc(run_kwargs):
132132
run_kwargs["recording"] = spre.zscore(run_kwargs["recording"])
133133
run_kwargs["recording"] = spre.scale(run_kwargs["recording"], gain=gain, dtype="int16")
134134
sorting = ss.run_sorter(
135-
"kilosort2_5", output_folder="kilosort2_5", skip_kilosort_preprocessing=True, scaleproc=gain, **run_kwargs
135+
"kilosort2_5", output_folder="kilosort2_5_skip", skip_kilosort_preprocessing=True, scaleproc=gain, **run_kwargs
136136
)
137137
print(sorting)
138138

139139

140+
def test_kilosort2_5_old_image(run_kwargs):
141+
import os
142+
143+
os.environ["SPIKEINTERFACE_DEV_PATH"] = SI_DEV_PATH
144+
145+
# docker image
146+
if DOCKER_SINGULARITY == "docker":
147+
run_kwargs["docker_image"] = "spikeinterface/kilosort2_5-compiled-base:0.1.0"
148+
else:
149+
run_kwargs["singularity_image"] = "spikeinterface/kilosort2_5-compiled-base:0.1.0"
150+
sorting = ss.run_sorter("kilosort2_5", output_folder="kilosort2_5_old", **run_kwargs)
151+
print(sorting)
152+
153+
140154
def test_kilosort2_5_skip_preproc_old_image(run_kwargs):
141155
import os
142156

143157
os.environ["SPIKEINTERFACE_DEV_PATH"] = SI_DEV_PATH
158+
print("Skipping preprocessing")
144159
gain = 200
145160
run_kwargs["recording"] = spre.zscore(run_kwargs["recording"])
146161
run_kwargs["recording"] = spre.scale(run_kwargs["recording"], gain=gain, dtype="int16")
@@ -150,9 +165,12 @@ def test_kilosort2_5_skip_preproc_old_image(run_kwargs):
150165
run_kwargs["docker_image"] = "spikeinterface/kilosort2_5-compiled-base:0.1.0"
151166
else:
152167
run_kwargs["singularity_image"] = "spikeinterface/kilosort2_5-compiled-base:0.1.0"
153-
print(run_kwargs)
154168
sorting = ss.run_sorter(
155-
"kilosort2_5", output_folder="kilosort2_5", skip_kilosort_preprocessing=True, scaleproc=gain, **run_kwargs
169+
"kilosort2_5",
170+
output_folder="kilosort2_5_old_skip",
171+
skip_kilosort_preprocessing=True,
172+
scaleproc=gain,
173+
**run_kwargs
156174
)
157175
print(sorting)
158176

@@ -165,7 +183,7 @@ def test_kilosort3_skip_preproc(run_kwargs):
165183
run_kwargs["recording"] = spre.zscore(run_kwargs["recording"])
166184
run_kwargs["recording"] = spre.scale(run_kwargs["recording"], gain=200, dtype="int16")
167185
sorting = ss.run_sorter(
168-
"kilosort3", output_folder="kilosort3", skip_kilosort_preprocessing=True, scaleproc=200, **run_kwargs
186+
"kilosort3", output_folder="kilosort3_skip", skip_kilosort_preprocessing=True, scaleproc=200, **run_kwargs
169187
)
170188
print(sorting)
171189

@@ -185,7 +203,11 @@ def test_kilosort3_skip_preproc(run_kwargs):
185203
test_kilosort2_5(kwargs)
186204
test_kilosort2_5_skip_preproc(kwargs)
187205
print("\nKilosort2.5 old image")
188-
test_kilosort2_5_skip_preproc_old_image(kwargs)
206+
# test_kilosort2_5_old_image(kwargs)
207+
208+
# This is the only failing test
209+
# print("\nKilosort2.5 old image - skip")
210+
# test_kilosort2_5_skip_preproc_old_image(kwargs)
189211

190212
print("\n\nKilosort3")
191213
test_kilosort3(kwargs)

0 commit comments

Comments
 (0)