Skip to content

Commit 3e15601

Browse files
committed
fix conflixts
1 parent 4f395c6 commit 3e15601

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/spikeinterface/core/job_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def __init__(
421421
else:
422422
mp_context = "spawn"
423423

424-
preferred_mp_context = recording.get_preferred_mp_context()
424+
preferred_mp_context = chunkable.get_preferred_mp_context()
425425
if preferred_mp_context is not None and preferred_mp_context != mp_context:
426426
warnings.warn(
427427
f"Your processing chain using pool_engine='process' and mp_context='{mp_context}' is not possible."
@@ -551,7 +551,7 @@ def run(self, slices=None):
551551
results = tqdm(
552552
results,
553553
desc=f"{self.job_name} (workers: {n_jobs} processes {self.mp_context})",
554-
total=len(recording_slices),
554+
total=len(slices),
555555
)
556556

557557
for res in results:

src/spikeinterface/core/node_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ def run_node_pipeline(
625625
# See need_first_call_before_pipeline : this trigger numba compilation before the run
626626
node0._first_call_before_pipeline()
627627

628-
init_args = (recording, nodes, skip_after_n_peaks_per_worker)
628+
init_args = (chunkable, nodes, skip_after_n_peaks_per_worker)
629629

630630
processor = ChunkExecutor(
631631
chunkable,

0 commit comments

Comments
 (0)