MRG, FIX: parallel n_jobs check (#7566)

* fix njobs type checker * update what's new * use int_like
mne-tools · Apr 7, 2020 · 50d6540 · 50d6540
1 parent cf1f8c6
commit 50d6540
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doc/changes/latest.inc b/doc/changes/latest.inc
@@ -36,6 +36,8 @@ Bug
 
 - Fix bug with :func:`mne.make_forward_dipole` where :func:`mne.write_forward_solution` could not be used by `Eric Larson`_
 
+- Fix bug that prevents ``n_jobs`` from being a NumPy integer type, by `Daniel McCloy`_.
+
 API
 ~~~
 

diff --git a/mne/parallel.py b/mne/parallel.py
@@ -9,6 +9,7 @@
 
 from . import get_config
 from .utils import logger, verbose, warn, ProgressBar
+from .utils.check import int_like
 from .fixes import _get_args
 
 if 'MNE_FORCE_SERIAL' in os.environ:
@@ -153,7 +154,7 @@ def check_n_jobs(n_jobs, allow_cuda=False):
         The checked number of jobs. Always positive (or 'cuda' if
         applicable).
     """
-    if not isinstance(n_jobs, int):
+    if not isinstance(n_jobs, int_like):
         if not allow_cuda:
             raise ValueError('n_jobs must be an integer')
         elif not isinstance(n_jobs, str) or n_jobs != 'cuda':
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,8 @@ Bug @@
     - Fix bug with :func:`mne.make_forward_dipole` where :func:`mne.write_forward_solution` could not be used by `Eric Larson`_
+    - Fix bug that prevents ``n_jobs`` from being a NumPy integer type, by `Daniel McCloy`_.
     API
     ~~~
@@ Expand Down @@