Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MRG, FIX: parallel n_jobs check #7566

Merged
merged 3 commits into from
Apr 7, 2020

Conversation

drammock
Copy link
Member

@drammock drammock commented Apr 6, 2020

This fails on master, and passes on this PR:

import numpy as np
import mne
mne.parallel.check_n_jobs(np.int64(6))

strangely, I was definitely passing in a plain int, not a numpy type, so n_jobs must have been recast somewhere in between my call to mne.time_frequency.psd_multitaper and the eventual check. If it's important to dig in and figure out where/why that happened, LMK.

I didn't see a file mne/tests/test_parallel.py... do we not test the parallel capabilities?

@codecov
Copy link

codecov bot commented Apr 6, 2020

Codecov Report

Merging #7566 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #7566   +/-   ##
=======================================
  Coverage   90.13%   90.13%           
=======================================
  Files         452      452           
  Lines       82872    82873    +1     
  Branches    13101    13101           
=======================================
+ Hits        74695    74698    +3     
+ Misses       5350     5348    -2     
  Partials     2827     2827           

@drammock drammock changed the title FIX: parallel n_jobs check MRG, FIX: parallel n_jobs check Apr 7, 2020
@drammock
Copy link
Member Author

drammock commented Apr 7, 2020

@agramfort CIs are green, this one is ready

@agramfort agramfort merged commit 50d6540 into mne-tools:master Apr 7, 2020
@agramfort
Copy link
Member

thx @drammock

agramfort pushed a commit that referenced this pull request Apr 7, 2020
* fix njobs type checker

* use int_like
@agramfort
Copy link
Member

backported

@drammock drammock deleted the fix-parallel-njobs-check branch April 8, 2020 23:48
larsoner added a commit to larsoner/mne-python that referenced this pull request Apr 10, 2020
* upstream/master: (1522 commits)
  FIX: Show bug
  MRG, FIX: Datetime call in gdf 2.x age calculation (mne-tools#7581)
  DOC: Simplify Darwin installation (mne-tools#7584)
  MRG, ENH: Allow picking without preload (mne-tools#7507)
  DOC: Document anonymization better (mne-tools#7587)
  Rework _Brain show (mne-tools#7580)
  DOC: Fixes in tutorial (mne-tools#7579)
  ENH: muscle artifact detection (mne-tools#7407)
  MRG: Remove toolbars in PyVista plotter (mne-tools#7572)
  WIP: Deregister plotter from the figure list in close() (mne-tools#7573)
  MRG: Fix mouse wheel event in _TimeViewer (mne-tools#7563)
  FIX: Fix toggle all (mne-tools#7567)
  MRG, FIX: parallel n_jobs check (mne-tools#7566)
  Rename artifact detection to movement detection (mne-tools#7569)
  ENH: Update spelling check [ci skip] (mne-tools#7565)
  MRG, ENH: Dont require preload for raw resample (mne-tools#7508)
  MRG: Add interpolation for NIRS signals (mne-tools#7428)
  WIP: Add temporal derivative distribution repair algorithm (mne-tools#7556)
  DOC: fix link in docstr [skip ci] (mne-tools#7562)
  ENH: Custom figure title when plotting Dipole locations (mne-tools#7558)
  ...
larsoner added a commit to larsoner/mne-python that referenced this pull request Apr 25, 2023
* upstream/master: (1522 commits)
  FIX: Show bug
  MRG, FIX: Datetime call in gdf 2.x age calculation (mne-tools#7581)
  DOC: Simplify Darwin installation (mne-tools#7584)
  MRG, ENH: Allow picking without preload (mne-tools#7507)
  DOC: Document anonymization better (mne-tools#7587)
  Rework _Brain show (mne-tools#7580)
  DOC: Fixes in tutorial (mne-tools#7579)
  ENH: muscle artifact detection (mne-tools#7407)
  MRG: Remove toolbars in PyVista plotter (mne-tools#7572)
  WIP: Deregister plotter from the figure list in close() (mne-tools#7573)
  MRG: Fix mouse wheel event in _TimeViewer (mne-tools#7563)
  FIX: Fix toggle all (mne-tools#7567)
  MRG, FIX: parallel n_jobs check (mne-tools#7566)
  Rename artifact detection to movement detection (mne-tools#7569)
  ENH: Update spelling check [ci skip] (mne-tools#7565)
  MRG, ENH: Dont require preload for raw resample (mne-tools#7508)
  MRG: Add interpolation for NIRS signals (mne-tools#7428)
  WIP: Add temporal derivative distribution repair algorithm (mne-tools#7556)
  DOC: fix link in docstr [skip ci] (mne-tools#7562)
  ENH: Custom figure title when plotting Dipole locations (mne-tools#7558)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants