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

Clean up: Remove streamlines memory patch #1884

Merged
merged 2 commits into from Jul 8, 2019

Conversation

@skoudoro
Copy link
Member

commented Jul 5, 2019

Since our Nibabel minimum version is 2.4, we do not need this patch anymore. This patch was fixing a memory issue on streamlines API and has been fixed on Nibabel 2.3

@codecov-io

This comment has been minimized.

Copy link

commented Jul 5, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (master@4342302). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1884   +/-   ##
=========================================
  Coverage          ?   85.31%           
=========================================
  Files             ?      118           
  Lines             ?    14222           
  Branches          ?     2235           
=========================================
  Hits              ?    12134           
  Misses            ?     1577           
  Partials          ?      511
Impacted Files Coverage Δ
dipy/tracking/streamline.py 92.95% <100%> (ø)
import dipy.tracking.utils as ut
from dipy.tracking.utils import streamline_near_roi

This comment has been minimized.

Copy link
@gabknight

gabknight Jul 5, 2019

Contributor

What is the preferred convention here?

  • import as ut, or
  • import : move_streamlines, streamline_near_roi, reduce_rois

This comment has been minimized.

Copy link
@skoudoro

skoudoro Jul 8, 2019

Author Member

No strong opinion here, but I will change it to import : move_streamlines, streamline_near_roi, reduce_rois

This comment has been minimized.

Copy link
@arokem

arokem Jul 8, 2019

Member

I think that either is fine. Some (me included) prefer the import utils as ut and then calling everything with a ut.this and ut.that, because it's more explicit. It tells you each time exactly where that function comes from.

@gabknight

This comment has been minimized.

Copy link
Contributor

commented Jul 5, 2019

LGTM. thx @skoudoro

@arokem
Copy link
Member

left a comment

Now that we're only ever using the nibabel implementation, would it make sense to call this ArraySequence everywhere, instead of Streamlines? I find it a bit confusing that these two names refer to exactly the same thing.

import dipy.tracking.utils as ut
from dipy.tracking.utils import streamline_near_roi

This comment has been minimized.

Copy link
@arokem

arokem Jul 8, 2019

Member

I think that either is fine. Some (me included) prefer the import utils as ut and then calling everything with a ut.this and ut.that, because it's more explicit. It tells you each time exactly where that function comes from.

@skoudoro

This comment has been minimized.

Copy link
Member Author

commented Jul 8, 2019

Personally, I find Streamlines more explicit than ArraySequence so I think it will be better to let it as it is.

I think that either is fine.

If it is ok for both of you, I will not make any change. So, this PR is ready to be merged!

@arokem

This comment has been minimized.

Copy link
Member

commented Jul 8, 2019

Yeah. Fine by me. Let's go!

@arokem arokem merged commit 3e1bd62 into nipy:master Jul 8, 2019

5 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
codecov/patch No report found to compare against
Details
codecov/project No report found to compare against
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@skoudoro skoudoro deleted the skoudoro:remove-streamlines-patch branch Jul 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.