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

BF - use different sort method to avoid mergsort for older numpy. #507

Merged
merged 1 commit into from Dec 16, 2014

Conversation

Projects
None yet
2 participants
@MrBago
Contributor

MrBago commented Dec 16, 2014

My attempt to fix #505 .

@arokem

This comment has been minimized.

Member

arokem commented Dec 16, 2014

Seems to me that this will also be faster

@arokem

This comment has been minimized.

Member

arokem commented Dec 16, 2014

OK - I just checked this in a conda env: I can confirm that I get an error with np 1.6.2, and that this fixes that error. Looks like win/win to me, so if Travis doesn't complain, I will go ahead and merge this.

arokem added a commit that referenced this pull request Dec 16, 2014

Merge pull request #507 from MrBago/bf_numpy_mergesort
BF - use different sort method to avoid mergsort for older numpy.

@arokem arokem merged commit 974fa1a into nipy:master Dec 16, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment