diff --git a/src/spikeinterface/core/globals.py b/src/spikeinterface/core/globals.py index 8386c358d3..23d60a5ac5 100644 --- a/src/spikeinterface/core/globals.py +++ b/src/spikeinterface/core/globals.py @@ -42,9 +42,9 @@ def set_global_tmp_folder(folder): temp_folder_set = True -def is_set_global_tmp_folder(): +def is_set_global_tmp_folder() -> bool: """ - Check is the global path temporary folder have been manually set. + Check if the global path temporary folder have been manually set. """ global temp_folder_set return temp_folder_set @@ -88,9 +88,9 @@ def set_global_dataset_folder(folder): dataset_folder_set = True -def is_set_global_dataset_folder(): +def is_set_global_dataset_folder() -> bool: """ - Check is the global path dataset folder have been manually set. + Check if the global path dataset folder has been manually set. """ global dataset_folder_set return dataset_folder_set @@ -130,14 +130,6 @@ def set_global_job_kwargs(**job_kwargs): global_job_kwargs_set = True -def is_global_job_kwargs_set() -> bool: - """ - Check is the global job kwargs have been manually set. - """ - global global_job_kwargs_set - return global_job_kwargs_set - - def reset_global_job_kwargs(): """ Reset the global job kwargs. @@ -146,7 +138,10 @@ def reset_global_job_kwargs(): global_job_kwargs = dict(n_jobs=1, chunk_duration="1s", progress_bar=True) -def is_set_global_job_kwargs_set(): +def is_set_global_job_kwargs_set() -> bool: + """ + Check if the global job kwargs have been manually set. + """ global global_job_kwargs_set return global_job_kwargs_set diff --git a/src/spikeinterface/core/job_tools.py b/src/spikeinterface/core/job_tools.py index f7d9f216ff..201b11db2b 100644 --- a/src/spikeinterface/core/job_tools.py +++ b/src/spikeinterface/core/job_tools.py @@ -60,7 +60,7 @@ def fix_job_kwargs(runtime_job_kwargs): - from .globals import get_global_job_kwargs, is_global_job_kwargs_set + from .globals import get_global_job_kwargs, is_set_global_job_kwargs_set job_kwargs = get_global_job_kwargs() @@ -99,7 +99,7 @@ def fix_job_kwargs(runtime_job_kwargs): job_kwargs["n_jobs"] = max(n_jobs, 1) - if "n_jobs" not in runtime_job_kwargs and job_kwargs["n_jobs"] == 1 and not is_global_job_kwargs_set(): + if "n_jobs" not in runtime_job_kwargs and job_kwargs["n_jobs"] == 1 and not is_set_global_job_kwargs_set(): warnings.warn( "`n_jobs` is not set so parallel processing is disabled! " "To speed up computations, it is recommended to set n_jobs either "