xp assertions: explicity expect NumPy scalars #2
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
[skip cirrus] [skip circle]
lucascolley
commented
Jul 29, 2024
Comment on lines
-448
to
+451
| xp_assert_close(res1, ref1, rtol=2e-16, check_0d=False) | ||
| xp_assert_equal(res2, ref2, check_0d=False) | ||
| xp_assert_close(res1, ref1, rtol=2e-16) | ||
| xp_assert_equal(res2, ref2) | ||
| if not is_array_api_strict(xp): | ||
| xp_assert_equal(res3, ref3, check_0d=False) | ||
| xp_assert_equal(res3, ref3) |
There was a problem hiding this comment.
I'm not sure why these had check_0d=False? Tests pass for me locally without them.
| xp_assert_equal(xp.array(0.), xp.array(0.)) | ||
| xp_assert_equal(xp.asarray(0.), xp.asarray(0.)) |
There was a problem hiding this comment.
Of course this is just cosmetic as this only runs with NumPy, but may as well use the functions that are in the standard.
Comment on lines
+147
to
+148
| # as an alternative to `check_0d=False`, explicitly expect scalar | ||
| xp_assert_equal(xp.float64(0), xp.asarray(0.)[()]) |
There was a problem hiding this comment.
this is the new check I have added
Comment on lines
+92
to
+93
| ref = ref[()] if ref.ndim == 0 else ref | ||
| xp_assert_close(res, ref, atol=10*eps) |
There was a problem hiding this comment.
sometimes this is nonzero-dimensional, so array-api-strict isn't happy with the 0d indexing. That's fine, guard on ndim.
This was referenced Jul 29, 2024
|
Rejected |
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.
I'm pretty sure this is preferable since it allows us to keep the 0d check enabled. x-ref scipy#21026