-
Notifications
You must be signed in to change notification settings - Fork 99
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #1631 #1633
Fix #1631 #1633
Conversation
Revert one line from kokkos#1620 which changed CrsMatrix::values_type (a 1D view) to be default_layout instead of LayoutRight. This seemed totally reasonable (the graph's rowptrs/entries already used default_layout), but the change makes spmv give wrong answers with Sacado PCE or MPVector as the scalar type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @brian-kelley !
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CLANG13CUDA10
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_A64FX_GCC1020
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA908_ROCM520
Jenkins Parameters
Using Repos:
Pull Request Author: brian-kelley |
If only KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930 fails due to timeout (node availability), I recommend merging this. I have restarted just KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930 - see job 200. |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CLANG13CUDA10
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_A64FX_GCC1020
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA908_ROCM520
Jenkins Parameters
Console Output (last 100 lines) : KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930 # 198 (click to expand)
Console Output (last 100 lines) : KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight # 205 (click to expand)
Console Output (last 100 lines) : KokkosKernels_PullRequest_CLANG13CUDA10 # 142 (click to expand)
Console Output (last 100 lines) : KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110 # 36 (click to expand)
Console Output (last 100 lines) : KokkosKernels_PullRequest_A64FX_GCC1020 # 36 (click to expand)
Console Output (last 100 lines) : KokkosKernels_PullRequest_VEGA908_ROCM520 # 41 (click to expand)
|
KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930 # 200 passed. |
Okay, I will merge this then |
Revert one line from #1620 which changed CrsMatrix::values_type (a 1D view) to be default_layout instead of LayoutRight. This seemed totally reasonable (the graph's rowptrs/entries already used default_layout, so this improved consistency), but the change makes spmv give wrong answers with Sacado PCE or MPVector as the scalar type. I think it's just an issue that this broke template type matching, so the Stokhos specialization for spmv was no longer getting called.
A better fix would be to not revert the change, and replace LayoutRight with
default_layout
in Stokhos, for example in Stokhos_CrsMatrix.hpp:The problem is,
default_layout
was really only meant to be used by KokkosKernels internally, to help the unification layers pick the "internal" unmanaged view types. It's in the global namespace, so I don't want to introduce it to Trilinos. I will plan on moving the default typedefs to theKokkosKernels::
namespace though so they can be used externally.