Skip to content
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

[4.4.01] Patches to 4.4.01 #2327

Merged

Conversation

ndellingwood
Copy link
Contributor

No description provided.

brian-kelley and others added 7 commits September 4, 2024 10:52
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 <[email protected]>
* 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 <[email protected]>
SpAdd handle was originally a copy-paste of the spgemm
handle way back in kokkos#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.
@ndellingwood ndellingwood requested a review from lucbv September 4, 2024 22:53
@ndellingwood ndellingwood added the AT2-SPECIAL-APPROVAL Mark .github changes as approved. label Sep 4, 2024
@ndellingwood
Copy link
Contributor Author

Summary of changes from the changelog:

Build System:

  • Restore size_t as default offset, in Tribits builds #2313

Enhancements:

  • Improve crs/bsr sorting performance #2293

Bug Fixes:

  • SpAdd handle: delete sort_option getter/setter #2296
  • Improve GH action to produce release artifacts #2312
  • coo2csr: add parens to function calls #2318

@ndellingwood
Copy link
Contributor Author

Noting that AT2 jobs will not run due to block on external user contributions, this does not indicate test failure

 [2024-09-04T22:58:07Z ERROR github_api_requester] Failure Status for user dalg24: 404 Not Found

@lucbv was this changed in any of the recent AT2 updates, and if so should I pull those in with this PR?

@lucbv
Copy link
Contributor

lucbv commented Sep 4, 2024

Yes, this was changed in PR #2320 and we can pull it in since it only affects github actions so it is transparent to users : )

@ndellingwood
Copy link
Contributor Author

@lucbv cherry-picked over with SHA a360d00 , but the AT2 jobs still failed with the same issue. Is there a specific label to use?

@lucbv
Copy link
Contributor

lucbv commented Sep 5, 2024

Supposedly having me approve and re-run the jobs should have allowed the tests to run @e10harvey do you know why it would fail to run in this case?

@ndellingwood
Copy link
Contributor Author

@lucbv setting the nightly Trilinos integration builds to test with this PR ran fine, including Hip, Cuda, Sycl (Tpetra tests only), OpenMP backends. Should be safe for merge

@lucbv lucbv added AT2-SPECIAL-APPROVAL Mark .github changes as approved. and removed AT2-SPECIAL-APPROVAL Mark .github changes as approved. labels Sep 11, 2024
@ndellingwood ndellingwood merged commit 336ee5f into kokkos:release-candidate-4.4.01 Sep 12, 2024
9 checks passed
@ndellingwood ndellingwood deleted the patches-to-4.4.01 branch September 12, 2024 17:24
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: brian-kelley <[email protected]>
Co-authored-by: Damien L-G <[email protected]>
Co-authored-by: Carl Pearson <[email protected]>
Co-authored-by: Evan Harvey <[email protected]>

* Update master_history.txt for 4.4.01

---------

Signed-off-by: Brian Kelley <[email protected]>
Co-authored-by: brian-kelley <[email protected]>
Co-authored-by: Damien L-G <[email protected]>
Co-authored-by: Carl Pearson <[email protected]>
Co-authored-by: Evan Harvey <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AT2-SPECIAL-APPROVAL Mark .github changes as approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants