Skip to content

Commit

Permalink
use original is_set_global_job_kwargs_set function
Browse files Browse the repository at this point in the history
  • Loading branch information
zm711 committed May 17, 2024
1 parent 24b5eb2 commit 2da00a4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
21 changes: 8 additions & 13 deletions src/spikeinterface/core/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/spikeinterface/core/job_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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 "
Expand Down

0 comments on commit 2da00a4

Please sign in to comment.