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.

Sign up for GitHub

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

Jump to bottom

Change name of yaml-cpp to yamlcpp (trilinos/Trilinos#12710) #2099

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Change name of yaml-cpp to yamlcpp (trilinos/Trilinos#12710) #2099

merged 2 commits into from
Feb 7, 2024

Conversation

bartlettroscoe
Copy link
Contributor

@ndellingwood

Matches the changes made in Trilinos PR:

NOTE: I created these commits using git format-patch and git am to move the commits from the Trilinos to the kokkos-kernels repo (by apply them on top of the base snapshot commit 9af9fa2 and then rebased on top of 'develop'. (I had to fix a merge conflict in cmake/Dependencies.cmake because of changes on both sides of those branches but they are trivial changes.)

@bartlettroscoe bartlettroscoe mentioned this pull request Feb 7, 2024
Merged
@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 Feb 7, 2024
@kokkos-devops-admin kokkos-devops-admin removed the AT: PRE-TEST INSPECTED Mark this PR as approved for testing. label Feb 7, 2024
@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: 1166
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 753
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021

  • Build Num: 424
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight

  • Build Num: 411
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GNU1021

  • Build Num: 412
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo

  • Build Num: 416
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001_solo

  • Build Num: 388
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 898
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 893
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA90A_ROCM560

  • Build Num: 886
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA90A_Tpls_ROCM560

  • Build Num: 407
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (bartlettroscoe/kokkos-kernels)
  • Branch: tril-12710-yamlcpp
  • SHA: d77f114
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@ndellingwood
Copy link
Contributor

@bartlettroscoe thanks for submitting the PR and apologies for the need to resolve conflicts (luckily it wasn't too messy in this case, bu still problematic). I appreciate your feedback and the info you shared, I wish I had an immediate answer to prevent this but recognize we need to work toward making this less of a headache (maybe as we eventually move toward using kokkos-kernels as a tpl this may become a bit easier? I'm not sure...)

ndellingwood
ndellingwood approved these changes Feb 7, 2024
View reviewed changes
Copy link
Contributor

@ndellingwood ndellingwood left a comment

Choose a reason for hiding this comment

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

Thanks!

@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: 1166
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 753
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021

  • Build Num: 424
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight

  • Build Num: 411
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GNU1021

  • Build Num: 412
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo

  • Build Num: 416
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001_solo

  • Build Num: 388
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 898
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 893
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA90A_ROCM560

  • Build Num: 886
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA90A_Tpls_ROCM560

  • Build Num: 407
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA d77f114
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4315f9a
PR_LABELS
PULLREQUESTNUM 2099
TEST_REPO_ALIAS KOKKOSKERNELS

@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

@bartlettroscoe
Copy link
Contributor Author

@bartlettroscoe thanks for submitting the PR and apologies for the need to resolve conflicts (luckily it wasn't too messy in this case, bu still problematic). I appreciate your feedback and the info you shared, I wish I had an immediate answer to prevent this but recognize we need to work toward making this less of a headache

@ndellingwood, occasional conflicts are to be expected when making changes on separate branches that live apart for many months. This is just par for the course. (And the nature of the file cmake/Dependencies.cmake will result in conflicts if there are any changes to the dependencies on the different branches.) The conflicts were minor and trivial to resolve.

(maybe as we eventually move toward using kokkos-kernels as a tpl this may become a bit easier? I'm not sure...)

I don't think that would help much because Trilinos would need its own copy of the KokkosKernels repo to be able to make spot changes for Trilinos. The only thing that would improve this is if Kokkos and KokkosKerenls put out more frequent releases.

@lucbv
Copy link
Contributor

lucbv commented Feb 7, 2024

I guess the only way to avoid this type of issue would be to mark that we have no dependencies on TriBITs managed TPLs and do the whole TPL management internally in Kokkos Kernels. That way there would not be any interactions and conflicts anymore. This might be something to think about in the future if we move to a more TPL model for KK

@bartlettroscoe
Copy link
Contributor Author

I guess the only way to avoid this type of issue would be to mark that we have no dependencies on TriBITs managed TPLs and do the whole TPL management internally in Kokkos Kernels. That way there would not be any interactions and conflicts anymore. This might be something to think about in the future if we move to a more TPL model for KK

A trivial conflict in a file is not a reason to do that. If KokkosKerenls finds its own dependencies it can find different/incompatible ones from the other packages.

@lucbv
Copy link
Contributor

lucbv commented Feb 7, 2024

We already need to do our own TPL management anyway since we can build outside of Trilinos. The only issue for us would be to make sure that our TPLs are not seen by the rest of Trilinos.

@bartlettroscoe
Copy link
Contributor Author

bartlettroscoe commented Feb 7, 2024 •
edited
Loading

We already need to do our own TPL management anyway since we can build outside of Trilinos. The only issue for us would be to make sure that our TPLs are not seen by the rest of Trilinos.

If there are TPLs used only directly by KokkosKernels and are not used directly by any other packages, then that is fine. But if there are TPLs that are also directly used by other packages, then you open the problem of multiple calls to find_package() finding different/incompatible TPLs (depending on other arguments passed to find_package()).

@ndellingwood ndellingwood merged commit d57e4ee into kokkos:develop Feb 7, 2024
10 checks passed
@ndellingwood ndellingwood added the TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos label Feb 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ndellingwood ndellingwood ndellingwood approved these changes

Assignees
No one assigned
Labels
TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bartlettroscoe @kokkos-devops-admin @ndellingwood @lucbv @cwschilly