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

KokkosKernels: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #1817

Conversation

bartlettroscoe
Copy link
Contributor

These are the same commits for KokkosKernels as part of Trilinos PR:

Therefore, this PR must be merged before Kokkos is snapshotted into Trilinos again after the merge of trilinos/Trilinos#11808 to Trilinos 'develop'.

…545)

This is the result of running the script:

  cd Trilinos/
  ../commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh

which calls remove_kokkos_subpackages_r.sh to absorb the refactoring of Kokkos
to remove the usage of TriBITS subpackages.

Manual changes may need to be made after this to remove duplciation in various
logic (see comments in the scripts).
Somehow, the script remove_kokkos_subpackages_r.sh did not remove this
redundancy.  (This is likely because Kokkos was at the end of the line with no
space and no ')' char .)  But this looks to be the only case in Trilinos it
appears where redundant 'Kokkos Kokkos' was not removed by that script.
@kokkos-devops-admin
Copy link

Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO INSPECTION HAS BEEN PERFORMED ON THIS PULL REQUEST! - This PR must be inspected by setting label 'AT: PRE-TEST INSPECTED'.

@ndellingwood ndellingwood added the AT: PRE-TEST INSPECTED Mark this PR as approved for testing. label May 5, 2023
@ndellingwood
Copy link
Contributor

@bartlettroscoe we've been having issues with Jenkins jobs losing ssh connection on Weaver (admins are investigating), just an FYI to expect those jobs to fail until the issue is resolved.
Will this PR rely on kokkos/kokkos#6104 in order to pass?

@kokkos-devops-admin kokkos-devops-admin removed the AT: PRE-TEST INSPECTED Mark this PR as approved for testing. label May 5, 2023
@kokkos-devops-admin
Copy link

Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED by label AT: PRE-TEST INSPECTED! Autotester is Removing Label; This inspection will remain valid until a new commit to source branch is performed.

@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_CUDA11_CUDA11_LayoutRight

  • Build Num: 598
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 187
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020

  • Build Num: 213
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020_Light_LayoutRight

  • Build Num: 483
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC1020

  • Build Num: 444
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19

  • Build Num: 533
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 586
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 387
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 382
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 384
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (bartlettroscoe/kokkos-kernels)
  • Branch: tril-11545-kokkos-no-subpks-develop
  • SHA: 0ba9eaa
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@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_CUDA11_CUDA11_LayoutRight

  • Build Num: 598
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 187
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020

  • Build Num: 213
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020_Light_LayoutRight

  • Build Num: 483
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC1020

  • Build Num: 444
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19

  • Build Num: 533
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 586
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 387
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 382
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 384
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tril-11545-kokkos-no-subpks-develop
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 0ba9eaa
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 311157f
PR_LABELS
PULLREQUESTNUM 1817
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
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

@kokkos-devops-admin
Copy link

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

@bartlettroscoe
Copy link
Contributor Author

Will this PR rely on kokkos/kokkos#6104 in order to pass?

No. The changes in this PR only impact the TriBITS build of Kokkos and KokkosKerenls.

@ndellingwood ndellingwood added CompatibilityUpdate TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos labels May 5, 2023
@ndellingwood
Copy link
Contributor

@lucbv I'm going to merge this, the corresponding kokkos/kokkos#6104 changes have merged so we will need this for compatibility for nightly Trilinos testing of kokkos and kokkos-kernels develop branches

@ndellingwood ndellingwood merged commit 98c6509 into kokkos:develop May 5, 2023
@kokkos-devops-admin
Copy link

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

@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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CompatibilityUpdate TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants