Skip to content

Commit a037b0a

Browse files
authored
Merge branch 'main' into hdmf-zarr-version
2 parents cfa337e + bed6308 commit a037b0a

20 files changed

Lines changed: 686 additions & 253 deletions

File tree

.github/workflows/full-test-with-codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
- uses: actions/setup-python@v5
2525
with:
26-
python-version: '3.10'
26+
python-version: '3.12'
2727
- name: Get ephy_testing_data current head hash
2828
# the key depends on the last comit repo https://gin.g-node.org/NeuralEnsemble/ephy_testing_data.git
2929
id: vars

doc/get_started/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ available parameters are dictionaries and can be accessed with:
287287
'detect_threshold': 5,
288288
'freq_max': 5000.0,
289289
'freq_min': 400.0,
290-
'max_threads_per_process': 1,
290+
'max_threads_per_worker': 1,
291291
'mp_context': None,
292292
'n_jobs': 20,
293293
'nested_params': None,

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors = [
77
]
88
description = "Python toolkit for analysis, visualization, and comparison of spike sorting output"
99
readme = "README.md"
10-
requires-python = ">=3.9,<3.13" # Only numpy 2.1 supported on python 3.13 for windows. We need to wait for fix on neo
10+
requires-python = ">=3.9,<3.13"
1111
classifiers = [
1212
"Programming Language :: Python :: 3 :: Only",
1313
"License :: OSI Approved :: MIT License",
@@ -20,11 +20,11 @@ classifiers = [
2020

2121

2222
dependencies = [
23-
"numpy>=1.20, <2.0", # 1.20 np.ptp, 1.26 might be necessary for avoiding pickling errors when numpy >2.0
23+
"numpy>=1.20",
2424
"threadpoolctl>=3.0.0",
2525
"tqdm",
2626
"zarr>=2.18,<3",
27-
"neo>=0.13.0",
27+
"neo>=0.14.0",
2828
"probeinterface>=0.2.23",
2929
"packaging",
3030
]

src/spikeinterface/core/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,14 @@
9191
write_python,
9292
normal_pdf,
9393
)
94-
from .job_tools import ensure_n_jobs, ensure_chunk_size, ChunkRecordingExecutor, split_job_kwargs, fix_job_kwargs
94+
from .job_tools import (
95+
get_best_job_kwargs,
96+
ensure_n_jobs,
97+
ensure_chunk_size,
98+
ChunkRecordingExecutor,
99+
split_job_kwargs,
100+
fix_job_kwargs,
101+
)
95102
from .recording_tools import (
96103
write_binary_recording,
97104
write_to_h5_dataset_format,

src/spikeinterface/core/globals.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ def is_set_global_dataset_folder() -> bool:
9797

9898

9999
########################################
100-
_default_job_kwargs = dict(n_jobs=1, chunk_duration="1s", progress_bar=True, mp_context=None, max_threads_per_process=1)
100+
_default_job_kwargs = dict(
101+
pool_engine="thread", n_jobs=1, chunk_duration="1s", progress_bar=True, mp_context=None, max_threads_per_worker=1
102+
)
101103

102104
global global_job_kwargs
103105
global_job_kwargs = _default_job_kwargs.copy()

0 commit comments

Comments
 (0)