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: Use KOKKOSKERNELS_INCLUDE_DIRECTORIES() (TriBITSPub/TriBITS#429) #1635

Merged

Conversation

bartlettroscoe
Copy link
Contributor

This replaces the usage of raw include_directories() with the wrapper KOKKOSKERNELS_INCLUDE_DIRECTORIES().

The deprecated TriBITS macro include_directories() now issues a CMake Deprecation warning. The fix is to use tribits_include_directories() in a TriBITS build instead.

This is the same patch made in Trilinos PR trilinos/Trilinos#11380.

…iBITS#429)

This replaces the usage of raw include_directories() with the wrapper
KOKKOSKERNELS_INCLUDE_DIRECTORIES().

The deprecated TriBITS macro include_directories() now issues a CMake
Deprecation warning.  The fix is to use tribits_include_directories() in a
TriBITS build instead.

This is the same patch made in Trilinos PR trilinos/Trilinos#11380.
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.

lgtm, thanks @bartlettroscoe !

@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 TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos AT: PRE-TEST INSPECTED Mark this PR as approved for testing. AT: RETEST Have this PR retested. labels Jan 25, 2023
@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

@kokkos-devops-admin kokkos-devops-admin removed the AT: PRE-TEST INSPECTED Mark this PR as approved for testing. label Jan 26, 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' - Failure: Timed out waiting for job KokkosKernels_PullRequest_VEGA908_ROCM520 to start: Total Wait = 3603

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Jan 26, 2023
@e10harvey e10harvey added the AT: RETEST Have this PR retested. label Jan 26, 2023
@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

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

  • Build Num: 228
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight

  • Build Num: 235
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG13CUDA10

  • Build Num: 169
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 64
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 62
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 62
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (bartlettroscoe/kokkos-kernels)
  • Branch: tribits-429-include-dirs
  • SHA: b49d7c2
  • 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_GCC930_Light_Tpls_GCC930

  • Build Num: 228
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight

  • Build Num: 235
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG13CUDA10

  • Build Num: 169
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 64
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 62
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 62
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH tribits-429-include-dirs
KOKKOSKERNELS_SOURCE_REPO https://github.com/bartlettroscoe/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA b49d7c2
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 4c06b6c
PR_LABELS AT: RETEST;BlocksPromotion;patch-release-cherry-pick;TrilinosPatchMatch
PULLREQUESTNUM 1635
TEST_REPO_ALIAS KOKKOSKERNELS

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Jan 27, 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

@ndellingwood ndellingwood merged commit 7ea79ba into kokkos:develop Jan 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BlocksPromotion patch-release-cherry-pick 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.

4 participants