EXPECT*KK macro rework - #3258
Merged
ndellingwood merged 12 commits intoAug 24, 2026
Merged
Conversation
jgfouca
requested review from
brian-kelley,
lucbv and
ndellingwood
and
a balanced review from Copilot
August 19, 2026 19:41
There was a problem hiding this comment.
Pull request overview
Refactors near-comparison test macros to support scalars, SIMD vectors, and rank-1 Kokkos Views.
Changes:
- Moves comparison logic into templated helpers.
- Removes
KK_EXPECT_NEARand updates callers. - Corrects remaining
TestUtilsnamespace references.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
test_common/KokkosKernels_TestUtils.hpp |
Adds generalized comparison helpers and simplifies macros. |
blas/unit_test/Test_Blas1_scal.hpp |
Corrects random-bound utility namespace. |
batched/dense/unit_test/Test_Batched_Swap.hpp |
Migrates assertions to EXPECT_NEAR_KK. |
batched/dense/unit_test/Test_Batched_Nrm.hpp |
Migrates assertions to EXPECT_NEAR_KK. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+65
to
+68
| return testing::AssertionFailure() << "Expected: " << expr1 << " is near " << expr2 << " (within " << expr_tol | ||
| << ")\n" | ||
| << " Actual: " << abs_diff << "\n" | ||
| << "Expected: " << abs_tol << "\n"; |
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
jgfouca
force-pushed
the
jgfouca/kk_expect_macro_rework
branch
from
August 19, 2026 20:04
3f53afa to
43a5e01
Compare
Contributor
Author
|
@ndellingwood , done. |
Signed-off-by: James Foucar <jgfouca@sandia.gov>
yasahi-hpc
requested changes
Aug 20, 2026
yasahi-hpc
left a comment
yasahi-hpc
left a comment
Contributor
There was a problem hiding this comment.
It is quite nice to refactor test utils.
Since it will print too many error messages if it fails, I think we will eventually need a matcher approach for View to View element-wise comparison like this
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Contributor
Author
|
Thanks, @yasahi-hpc. Those were good suggestions. I think my recent pushes addressed all your comments. |
Signed-off-by: James Foucar <jgfouca@sandia.gov>
yasahi-hpc
requested changes
Aug 21, 2026
yasahi-hpc
left a comment
yasahi-hpc
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the quick response @jgfouca
Mostly looks good to me.
Not strict blockers except for the fix in the assertion message.
Others are replacements of SFINAE with requires.
Use requires instead of enable_if and improve assert messages. Signed-off-by: James Foucar <jgfouca@sandia.gov>
jgfouca
force-pushed
the
jgfouca/kk_expect_macro_rework
branch
from
August 21, 2026 19:06
6aec5b9 to
0b5b104
Compare
Signed-off-by: James Foucar <jgfouca@sandia.gov>
Contributor
Author
|
@yasahi-hpc , done |
Contributor
Author
|
@brian-kelley , @lucbv , @ndellingwood , I think this is ready to merge. It's on the higher priority side since it fixes a build error. |
brian-kelley
approved these changes
Aug 24, 2026
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
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.
Change list:
Fixes remaining issues involved with #3232 , namely:
:247:5: error: cannot convert 'val_type' (aka 'Vector<SIMD<float>, 4>') to 'double' without a conversion operator