diff --git a/CHANGELOG.md b/CHANGELOG.md index de3bfb2..e137e4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,9 @@ ### 🐛Fixed - Error when checking the number of streamlines in the weighted LASSO function - Error in verifying voxel correspondence between the lesion mask passed through the dictionary and the ISO weights map -- Error when checking the number of streamlines in the grouping structure for group LASSO regularization -- Added check on empty groups when setting group LASSO regularization +- Error when checking the number of streamlines in the grouping structure for group LASSO regularization (Fixes #154) +- Added check on empty groups when setting group LASSO regularization (Fixes #153) +- Tests fail using numpy >= 2.0.0 - Typo in test script and reference results --- diff --git a/commit/trk2dictionary/trk2dictionary.pyx b/commit/trk2dictionary/trk2dictionary.pyx index 4b60d23..072968d 100644 --- a/commit/trk2dictionary/trk2dictionary.pyx +++ b/commit/trk2dictionary/trk2dictionary.pyx @@ -410,7 +410,8 @@ cpdef run( filename_tractogram=None, path_out=None, filename_peaks=None, filenam cdef float* ptrToVOXMM if extension == ".tck": M = _get_affine( niiREF ).copy() - M[:3, :3] = M[:3, :3].dot( np.diag([1./Px,1./Py,1./Pz]) ) + # float64 conversion added to comply with the new cast policy of numpy v2 + M[:3, :3] = M[:3, :3].dot( np.diag([np.float64(1)/Px,np.float64(1)/Py,np.float64(1)/Pz]) ) toVOXMM = np.ravel(np.linalg.inv(M)).astype('=3.0.10", - "numpy>=1.24.4,<2.0.0", + "numpy>=1.24.4", "setuptools>=69.2.0" ] build-backend = "setuptools.build_meta" @@ -12,7 +12,7 @@ version = "2.4.2" dependencies = [ "dmri-amico>=2.0.1", "dmri-dicelib>=1.1.0", - "numpy>=1.24.4,<2.0.0", + "numpy>=1.24.4", "scipy>=1.10.1" ] requires-python = ">=3.8"