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.

Sign up for GitHub

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

Jump to bottom

[MRG] fix openmp crash #2140

Merged
merged 1 commit into from
Sep 23, 2019
Merged

[MRG] fix openmp crash #2140

merged 1 commit into from
Sep 23, 2019

Conversation

jeromedockes
Copy link
Member

fixes #2139

@bthirion
Copy link
Member

LGTM.

@codecov
Copy link

codecov bot commented Sep 23, 2019 •
edited
Loading

Codecov Report

Merging #2140 into master will increase coverage by 19.61%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #2140       +/-   ##
==========================================
+ Coverage   72.69%   92.3%   +19.61%     
==========================================
  Files         142     142               
  Lines       18506   18508        +2     
  Branches     2255    2255               
==========================================
+ Hits        13453   17084     +3631     
+ Misses       4665     920     -3745     
- Partials      388     504      +116
Impacted Files Coverage Δ
nilearn/__init__.py 71.42% <100%> (+10.82%) ⬆️
nilearn/tests/test_signal.py 97.3% <0%> (+0.76%) ⬆️
nilearn/datasets/struct.py 86.23% <0%> (+1.44%) ⬆️
nilearn/_utils/cache_mixin.py 83.65% <0%> (+2.88%) ⬆️
nilearn/_utils/niimg.py 94.2% <0%> (+2.89%) ⬆️
nilearn/_utils/compat.py 46.66% <0%> (+3.33%) ⬆️
nilearn/_utils/helpers.py 100% <0%> (+4.16%) ⬆️
nilearn/image/resampling.py 93.75% <0%> (+6.25%) ⬆️
nilearn/_utils/logger.py 100% <0%> (+6.45%) ⬆️
... and 28 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a2c3340...30b63f3. Read the comment docs.

@emdupre emdupre mentioned this pull request Sep 23, 2019
Merged
@GaelVaroquaux
Copy link
Member

LGTM. Thanks. Merging.

Another reason why we need to release :).

@GaelVaroquaux GaelVaroquaux merged commit 0d53f6d into nilearn:master Sep 23, 2019
@jeromedockes jeromedockes changed the title fix openmp crash [MRG] fix openmp crash Sep 24, 2019
kchawla-pi added a commit to AlexandreAbraham/nilearn that referenced this pull request Sep 30, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into fix_…
eda8bd1 
…clean

* 'master' of https://github.com/nilearn/nilearn: (2100 commits)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  added whats_new
  Added test for labels=None
  More explicit doc string
  Test for right length of labels
  Added tests for empty list case and labels as ndarray
  ensure labels is a list, not an ndarray
  Change such that empty lists are recognized as False
  Undid some documentation changes as their reason is not understood
  Replaced conda latest version with 4.6.* pending replacement
  Removed omit sections (nothing to omit, it would seem)
  Corrected docstring for bg_img in plot_stat_map
  Removed omit=*test* to fix error during coverage reporting
  ...

# Conflicts:
#	nilearn/tests/test_signal.py
kchawla-pi added a commit to kchawla-pi/nilearn that referenced this pull request Oct 8, 2019
@kchawla-pi
Merge branch 'master' of github.com:nilearn/nilearn into rm-dep-warn-…
d627227 
…encoding

* 'master' of github.com:nilearn/nilearn: (228 commits)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  added whats_new
  Added test for labels=None
  More explicit doc string
  Test for right length of labels
  Added tests for empty list case and labels as ndarray
  ensure labels is a list, not an ndarray
  ...
kchawla-pi added a commit to KamalakerDadi/nilearn that referenced this pull request Oct 9, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into glas…
98345d6 
…s_brain_orientation

* 'master' of https://github.com/nilearn/nilearn: (116 commits)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  added whats_new
  ...

# Conflicts:
#	doc/whats_new.rst
kchawla-pi added a commit to glemaitre/nilearn that referenced this pull request Oct 9, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into is/p…
ee46da0 
…lot_connectome_strength

* 'master' of https://github.com/nilearn/nilearn: (272 commits)
  [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  ...

# Conflicts:
#	examples/03_connectivity/plot_sphere_based_connectome.py
kchawla-pi added a commit to KamalakerDadi/nilearn that referenced this pull request Oct 9, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into conf…
16d718b 
…ounds_for_connectome

* 'master' of https://github.com/nilearn/nilearn: (227 commits)
  [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  ...
kchawla-pi added a commit to KamalakerDadi/nilearn that referenced this pull request Oct 9, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into plot…
f183965 
…_roi_contours

* 'master' of https://github.com/nilearn/nilearn: (227 commits)
  [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  ...
kchawla-pi added a commit to illdopejake/nilearn that referenced this pull request Oct 12, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into spri…
1bcfdba 
…nt_modify_fetch_dev

* 'master' of https://github.com/nilearn/nilearn: (228 commits)
  [MRG] Nans in view connectome (nilearn#2166)
  [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  ...

# Conflicts:
#	nilearn/datasets/func.py
kchawla-pi added a commit to KamalakerDadi/nilearn that referenced this pull request Oct 14, 2019
@kchawla-pi
Merge branch 'master' of https://github.com/nilearn/nilearn into ev_d…
259783f 
…ecomposition

* 'master' of https://github.com/nilearn/nilearn: (348 commits)
  [MRG] FIX: orientation problem with plot_glass_brain (nilearn#1888)
  Import HTMLDocument in its original module to preserve backwards compatibility (nilearn#2162)
  Fixing malfunctioning allowed-failure section in Travis (nilearn#2160)
  Update Brainomics fetcher (nilearn#2097)
  Remove inplace modification in signal.clean (nilearn#2125)
  Iter age group prediction example (nilearn#2063)
  Expose bg_img, vmin and vmax in plot_img signature (nilearn#2157)
  Replac conda with pip in TravisCI setup (nilearn#2141)
  Core devs doc and add @emdupre (nilearn#2151)
  Add check for vmin, vmax in plot_surf_roi (nilearn#2052)
  [ENH] Initial visual reports (nilearn#2019)
  Renamed test to deduplicate name (nilearn#2144)
  Fixes nilearn#2029 Handle gzip files without extensions (nilearn#2126)
  Update Schaefer parcelation to v0.14.3 (nilearn#2138)
  MAINT: Future-compatible cmap reversal (nilearn#2131)
  fix openmp crash (nilearn#2140)
  change nose to pytest on appveyor (nilearn#2130)
  adding fix to whatsnew
  fix wrong urls in nki dataset
  Made Flake8 happy
  ...

# Conflicts:
#	doc/connectivity/resting_state_networks.rst
#	doc/whats_new.rst
#	examples/03_connectivity/plot_canica_analysis.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

test_mask_reducer failing on circle CI
3 participants
@jeromedockes @bthirion @GaelVaroquaux