ENH: stats.chisquare/power_divergence: add array API support #20753
Conversation
This file contains hidden or 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
mdhaber
commented
May 20, 2024
| case.f_obs, case.f_exp, case.ddof, case.axis, | ||
| 2/3, case.cr) | ||
|
|
||
| def test_basic_masked(self): |
There was a problem hiding this comment.
This didn't actually pass masked arrays into the function because check_power_divergence converted mobs back into a regular array, so I just deleted it.
mdhaber
commented
May 20, 2024
Comment on lines
+7931
to
+7941
| def _m_sum(a, *, axis, preserve_mask, xp): | ||
| if np.ma.isMaskedArray(a): | ||
| sum = a.sum(axis) | ||
| return sum if preserve_mask else np.asarray(sum) | ||
| return xp.sum(a, axis=axis) | ||
|
|
||
|
|
||
| def _m_mean(a, *, axis, keepdims, xp): | ||
| if np.ma.isMaskedArray(a): | ||
| return np.asarray(a.mean(axis=axis, keepdims=keepdims)) | ||
| return xp.mean(a, axis=axis, keepdims=keepdims) |
There was a problem hiding this comment.
These and the _m_ functions above will be removed in two versions, when masked array support is removed.
mdhaber
commented
May 20, 2024
|
|
||
| ddof = np.asarray(ddof) | ||
| expected_p = stats.distributions.chi2.sf(expected_stat, | ||
| num_obs - 1 - ddof) | ||
| assert_allclose(p, expected_p) | ||
|
|
||
| def test_basic(self): |
mdhaber
commented
May 20, 2024
| xp_assert_close(stat, xp.asarray([5.71428571, 2.66666667])) | ||
| xp_assert_close(pval, xp.asarray([0.01682741, 0.10247043])) | ||
|
|
||
| def test_power_divergence_against_cressie_read_data(self, xp): |
There was a problem hiding this comment.
Moved up from below.
tupui
approved these changes
May 22, 2024
|
Thanks @tupui! |
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.
Reference issue
Toward gh-20544
What does this implement/fix?
Adds array API support to
stats.chisquareandstats.power_divergence. Preserves but deprecates support for masked arrays per generalization of the conversation aboutgstd.Additional information
Consider reviewing diff with "Hide whitespace" checked. I moved some test functions into classes.