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

fix: mapnode to generate result file when crashes in single node mode #3143

Merged
merged 2 commits into from
Jan 6, 2020

Conversation

satra
Copy link
Member

@satra satra commented Jan 5, 2020

Summary

Fixes #3088

List of changes proposed in this PR (pull-request)

Allows MapNodes that have one subnode to generate a results file before erroring out

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

@satra
Copy link
Member Author

satra commented Jan 5, 2020

@effigies - if this works for you as well, we should add a hotfix to 1.3.x

@codecov
Copy link

codecov bot commented Jan 5, 2020

Codecov Report

Merging #3143 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3143      +/-   ##
==========================================
+ Coverage   67.59%   67.59%   +<.01%     
==========================================
  Files         299      299              
  Lines       39480    39487       +7     
  Branches     5220     5220              
==========================================
+ Hits        26685    26690       +5     
- Misses      12082    12085       +3     
+ Partials      713      712       -1
Flag Coverage Δ
#smoketests 53.02% <55.55%> (-0.01%) ⬇️
#unittests 64.86% <100%> (+0.02%) ⬆️
Impacted Files Coverage Δ
nipype/pipeline/engine/nodes.py 83.49% <100%> (+0.18%) ⬆️
nipype/info.py 93.84% <100%> (ø) ⬆️
nipype/pipeline/plugins/tools.py 78.94% <0%> (-1.32%) ⬇️
nipype/pipeline/engine/utils.py 80.5% <0%> (-0.12%) ⬇️

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 ec5e74f...e04131d. Read the comment docs.

@effigies
Copy link
Member

effigies commented Jan 6, 2020

@satra This fixes #3088 for me. Want me to cherry-pick a new PR for maint/1.3.x, or is that easier for you to do?

Edit: Cherry-picked to test that 1.3.x + this fix resolves the issue as well. Opened #3144.

@effigies
Copy link
Member

effigies commented Jan 6, 2020

Also, could you rebase this to maint/1.4.x? master is currently set to 1.5.0-dev.

Cancel that. Looks like we've been pushing to master, so there's no point. This is good to merge.

effigies pushed a commit to effigies/nipype that referenced this pull request Jan 6, 2020
* fix: mapnode to generate result file when crashes in single node mode
* enh: simplify test further
@effigies effigies added this to the 1.4.1 milestone Jan 6, 2020
@effigies effigies merged commit 5cd1892 into nipy:master Jan 6, 2020
@effigies effigies mentioned this pull request Jan 6, 2020
1 task
effigies added a commit that referenced this pull request Jan 6, 2020
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.

Results file failure with 1.3.0rc1 (MapNode)
2 participants