Restore size_t as default offset, in Tribits builds #2313
Merged
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
If building KokkosKernels standalone, leave int as the default offset (this was the case since kokkos#2140). But if building KokkosKernels as a Trilinos/Tribits package, then make size_t the default offset because this is what the Tpetra stack currently uses. Signed-off-by: Brian Kelley <bmkelle@sandia.gov>
brian-kelley
added
the
TrilinosPatchMatch
|
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_CUDA11_CUDA11_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GNU1021
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_Tpls_GNU1021
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CLANG1001_solo
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA90A_ROCM561
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA90A_Tpls_ROCM561
Jenkins Parameters
Using Repos:
Pull Request Author: brian-kelley |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GNU1021
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_Tpls_GNU1021
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_CLANG1001_solo
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA90A_ROCM561
Jenkins Parameters
Build InformationTest Name: KokkosKernels_PullRequest_VEGA90A_Tpls_ROCM561
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ lucbv ]! |
|
Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - This Repo does not support Automerge |
ndellingwood
pushed a commit
to ndellingwood/kokkos-kernels
that referenced
this pull request
Sep 4, 2024
If building KokkosKernels standalone, leave int as the default offset (this was the case since kokkos#2140). But if building KokkosKernels as a Trilinos/Tribits package, then make size_t the default offset because this is what the Tpetra stack currently uses. Signed-off-by: Brian Kelley <bmkelle@sandia.gov>
ndellingwood
added a commit
that referenced
this pull request
Sep 12, 2024
* Restore size_t as default offset, in Tribits builds (#2313) If building KokkosKernels standalone, leave int as the default offset (this was the case since #2140). But if building KokkosKernels as a Trilinos/Tribits package, then make size_t the default offset because this is what the Tpetra stack currently uses. Signed-off-by: Brian Kelley <bmkelle@sandia.gov> * Improve crs/bsr sorting performance (#2293) * CRS sorting improvements - Wrote bulk sort/permutation based sorting for CRS graph, matrix, and BSR matrix (bulk = one large sort of all the entries, using row-major dense index as keys) - This is more performant for imbalanced entries per row - If matrix dimensions are too large to do bulk sort, fall back to sorting within each row with a thread. * Add perf test for sort_crs_matrix * sort_crs: improve parallel labels * Work around kokkos issue 7036 * sort_crs: replace radix sort lambda with functor (Lambda segfaults with nvcc+openmp) --------- Signed-off-by: Brian Kelley <bmkelle@sandia.gov> * SpAdd handle: delete sort_option getter/setter (#2296) SpAdd handle was originally a copy-paste of the spgemm handle way back in #122, and included get_sort_option() and set_sort_option() from spgemm. But these try to use the member bool sort_option, which doesn't exist. Somehow these functions never produced compile errors until someone tried to call them. * Improve GH action to produce release artifacts (#2312) * coo2csr: add parens to function calls (#2318) * Update changelog * Update master_history.txt * .github/workflows: Group jobs under common github-AT2 name (#2320) * Update master_history.txt --------- Signed-off-by: Brian Kelley <bmkelle@sandia.gov> Co-authored-by: brian-kelley <bmkelle@sandia.gov> Co-authored-by: Damien L-G <dalg24@gmail.com> Co-authored-by: Carl Pearson <cwpearson@users.noreply.github.com> Co-authored-by: Evan Harvey <57234914+e10harvey@users.noreply.github.com>
lucbv
pushed a commit
that referenced
this pull request
Sep 13, 2024
* Set version number to 4.4.01 * [4.4.01] Patches to 4.4.01 (#2327) * Restore size_t as default offset, in Tribits builds (#2313) If building KokkosKernels standalone, leave int as the default offset (this was the case since #2140). But if building KokkosKernels as a Trilinos/Tribits package, then make size_t the default offset because this is what the Tpetra stack currently uses. Signed-off-by: Brian Kelley <bmkelle@sandia.gov> * Improve crs/bsr sorting performance (#2293) * CRS sorting improvements - Wrote bulk sort/permutation based sorting for CRS graph, matrix, and BSR matrix (bulk = one large sort of all the entries, using row-major dense index as keys) - This is more performant for imbalanced entries per row - If matrix dimensions are too large to do bulk sort, fall back to sorting within each row with a thread. * Add perf test for sort_crs_matrix * sort_crs: improve parallel labels * Work around kokkos issue 7036 * sort_crs: replace radix sort lambda with functor (Lambda segfaults with nvcc+openmp) --------- Signed-off-by: Brian Kelley <bmkelle@sandia.gov> * SpAdd handle: delete sort_option getter/setter (#2296) SpAdd handle was originally a copy-paste of the spgemm handle way back in #122, and included get_sort_option() and set_sort_option() from spgemm. But these try to use the member bool sort_option, which doesn't exist. Somehow these functions never produced compile errors until someone tried to call them. * Improve GH action to produce release artifacts (#2312) * coo2csr: add parens to function calls (#2318) * Update changelog * Update master_history.txt * .github/workflows: Group jobs under common github-AT2 name (#2320) * Update master_history.txt --------- Signed-off-by: Brian Kelley <bmkelle@sandia.gov> Co-authored-by: brian-kelley <bmkelle@sandia.gov> Co-authored-by: Damien L-G <dalg24@gmail.com> Co-authored-by: Carl Pearson <cwpearson@users.noreply.github.com> Co-authored-by: Evan Harvey <57234914+e10harvey@users.noreply.github.com> * Update master_history.txt for 4.4.01 --------- Signed-off-by: Brian Kelley <bmkelle@sandia.gov> Co-authored-by: brian-kelley <bmkelle@sandia.gov> Co-authored-by: Damien L-G <dalg24@gmail.com> Co-authored-by: Carl Pearson <cwpearson@users.noreply.github.com> Co-authored-by: Evan Harvey <57234914+e10harvey@users.noreply.github.com>
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.
If building KokkosKernels standalone, leave int as the default offset (this was the case since #2140). But if building KokkosKernels as a Trilinos/Tribits package, then make size_t the default offset because this is what the Tpetra stack currently uses.
There will be an identical non-release patch into Trilinos, and this should also be included in the next release.