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: bumpy numpy requirement to 1.5 / compat fixes #374

Merged
merged 4 commits into from
Jun 20, 2014
Merged

MRG: bumpy numpy requirement to 1.5 / compat fixes #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3cdc27
BF: don't use dtype with ones/zeros_like
matthew-brett Jun 3, 2014
95c3c21
RF: bump minimum numpy version to 1.5
matthew-brett Jun 3, 2014
d838589
RF: up numpy and scipy dependencies as discussed
matthew-brett Jun 18, 2014
436278d
RF: drop scipy requirement to match travis-ci
matthew-brett Jun 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dipy/denoise/denspeed.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def nlmeans_3d(arr, mask=None, sigma=None, patch_radius=1,
raise ValueError('arr needs to be a 3D ndarray')

if mask is None:
mask = np.ones_like(arr, dtype='f8')
mask = np.ones(arr.shape, dtype='f8')
else:
mask = np.ascontiguousarray(mask, dtype='f8')

Expand Down
2 changes: 1 addition & 1 deletion dipy/denoise/noise_estimate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def piesno(data, N=1, alpha=0.01, l=100, itermax=100, eps=1e-5, return_mask=Fals

sig_prev = 0
omega_size = 1
idx = np.zeros_like(sum_m2, dtype=np.bool)
idx = np.zeros(sum_m2.shape, dtype=np.bool)

for n in range(itermax):

Expand Down
4 changes: 2 additions & 2 deletions dipy/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"""

# versions for dependencies
NUMPY_MIN_VERSION='1.3'
SCIPY_MIN_VERSION='0.7.2'
NUMPY_MIN_VERSION='1.6'
SCIPY_MIN_VERSION='0.9'
CYTHON_MIN_VERSION='0.17'
NIBABEL_MIN_VERSION='1.0.0'

Expand Down