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

csc2csr: update Kokkos_Numeric.hpp header inclusion #1449

Merged
merged 1 commit into from
Jun 24, 2022

Conversation

ndellingwood
Copy link
Contributor

Update std_algorithms header include to match renaming/reorg of
numeric headers in kokkos/kokkos#5113

Update std_algorithms header include to match renaming/reorg of
numeric headers in kokkos/kokkos#5113
@ndellingwood ndellingwood requested a review from e10harvey June 24, 2022 00:53
@ndellingwood
Copy link
Contributor Author

This is an attempt to address compilation errors starting to show up in some of the nightlies:

kokkos-kernels/src/sparse/KokkosSparse_csc2csr.hpp:47:10: fatal error: std_algorithms/Kokkos_Numeric.hpp: No such file or directory
 #include <std_algorithms/Kokkos_Numeric.hpp>

following reorg/renaming of the std_algorithms headers in kokkos

@e10harvey I may have been too heavy-handed with the includes to replace Kokkos_Numeric.hpp, I followed what appeared to replace Kokkos_Numeric.hpp in the algorithms/src/Kokkos_StdAlgorithms.hpp file diff from kokkos/kokkos#5113. Let me know if some of the includes are unnecessary and should be dropped

@ndellingwood
Copy link
Contributor Author

@lucbv @e10harvey Should we add a label to indicate when a PR is an update to accommodate compatibility change needs? May be helpful for backtrack searches

@kokkos-devops-admin
Copy link

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@ndellingwood
Copy link
Contributor Author

Opened issue #1450 for tracking

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9_GCC720_Light_Tpls_GCC720_GCC740

  • Build Num: 272
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_Tpls_CUDA10_LayoutRight

  • Build Num: 265
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 1081
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 725
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 1069
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 1056
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 461
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (ndellingwood/kokkos-kernels)
  • Branch: fix-stdalg-rename
  • SHA: 630fb84
  • Mode: TEST_REPO

Pull Request Author: ndellingwood

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9_GCC720_Light_Tpls_GCC720_GCC740

  • Build Num: 272
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_Tpls_CUDA10_LayoutRight

  • Build Num: 265
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 1081
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 725
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 1069
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 1056
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 461
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH fix-stdalg-rename
KOKKOSKERNELS_SOURCE_REPO https://github.com/ndellingwood/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 630fb84
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 52b6d7f
PR_LABELS
PULLREQUESTNUM 1449
TEST_REPO_ALIAS KOKKOSKERNELS

@kokkos-devops-admin
Copy link

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@kokkos-devops-admin
Copy link

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

Copy link
Contributor

@e10harvey e10harvey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @ndellingwood. I will clean up these includes as part of #1446.

I think the CompatabilityUpdate label is a great addition.

@kokkos-devops-admin
Copy link

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ e10harvey ]!

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - This Repo does not support Automerge

@ndellingwood ndellingwood merged commit af7bf3c into kokkos:develop Jun 24, 2022
@ndellingwood ndellingwood deleted the fix-stdalg-rename branch January 13, 2023 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants