[MAIN] add support for numpy > 2.0 #656
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ge to signed int to avoid this
| @@ -1450,7 +1450,7 @@ def _get_pvalue_spec(max_occs, min_spikes, max_spikes, min_occ, n_surr, winlen, | |||
| counts, occs = np.histogram( | |||
| max_occs_size_dur, | |||
| bins=np.arange(min_occ, | |||
| np.max(max_occs_size_dur) + 2)) | |||
| np.max(max_occs_size_dur).astype(np.int16) + 2)) | |||
There was a problem hiding this comment.
max_occs_size_dur is uint which will cause an overflow in arange.
| @@ -438,6 +438,7 @@ def test_parameters_3d(self): | |||
| el for el in self.elements_msip if len(el) >= self.min_neu and len( | |||
| el) >= self.min_spikes]) | |||
|
|
|||
| def test_parameters_3d_min_occ(self): | |||
| # test min_occ parameter | |||
There was a problem hiding this comment.
split test in two tests to be more precise when debugging.
|
|
||
| self.assertGreater(auc, 0.95) | ||
| self.assertGreater(auc, 0.95) | ||
|
|
There was a problem hiding this comment.
Use sub tests to ensure garbage collection is carried out in between. Otherwise excessive amounts of memory are used.
| @@ -1,5 +1,5 @@ | |||
| neo>=0.10.0 | |||
| numpy>=1.19.5, <2 | |||
| numpy>=1.19.5 | |||
There was a problem hiding this comment.
numpy>2.0 ?
| @@ -344,7 +344,7 @@ def get_f_matrix(self): | |||
| self.coord_electrode[i])**2 + (self.diam[j] / 2)**2)- | |||
| abs(self.coord_electrode[j] + self.coord_electrode[i]))) | |||
|
|
|||
| f_matrix /= (2 * self.sigma) | |||
| f_matrix = f_matrix / (2 * self.sigma) | |||
| return f_matrix | |||
There was a problem hiding this comment.
See also : python-quantities/python-quantities#254
| np.testing.assert_allclose(arr_coh, anasig_coh, atol=1e-6) | ||
| np.testing.assert_array_equal(arr_phi, anasig_phi) | ||
| np.testing.assert_allclose(arr_coh, anasig_coh.magnitude, atol=1e-6) | ||
| np.testing.assert_array_almost_equal(arr_phi, anasig_phi.magnitude) |
There was a problem hiding this comment.
investigate origin of difference
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request ensures compatibility with NumPy >2.0.
This adresses #652