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

Roc tpls upgrade #1763

Merged
merged 7 commits into from
Apr 1, 2023
Merged

Roc tpls upgrade #1763

merged 7 commits into from
Apr 1, 2023

Conversation

lucbv
Copy link
Contributor

@lucbv lucbv commented Mar 30, 2023

This PR supersedes PR #1650 it adds the change to Dependencies.cmake that matches the change in Trilinos

@lucbv lucbv requested a review from ndellingwood March 30, 2023 20:41
@lucbv
Copy link
Contributor Author

lucbv commented Mar 30, 2023

@fnrizzi @mperrinel just adding the dependency file update to match what is done int Trilinos PR #11746

@lucbv lucbv self-assigned this Mar 30, 2023
@lucbv lucbv added the Cleanup Code maintenance that isn't a bugfix or new feature label Mar 30, 2023
@kokkos-devops-admin
Copy link

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

@kokkos-devops-admin
Copy link

Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job KokkosKernels_PullRequest_CUDA11_CUDA11_LayoutRight to start: Total Wait = 3603

  • Other jobs have been previously started - We must stop them...

@ndellingwood
Copy link
Contributor

@lucbv the cuda CI build timed out before the job got out of the queue, but since these changes have no impact on cuda builds should this PR just be merged rather than retested?

@lucbv
Copy link
Contributor Author

lucbv commented Mar 31, 2023

@ndellingwood do you know if we can find the log for the build on caraway that was running for this PR?
The cancellation message above makes it hard to know what happened on caraway which is what we would care about here.

@ndellingwood
Copy link
Contributor

@lucbv oh good point, I misinterpreted the output (I thought only the cuda build timed out). I scanned over the last several Caraway PullRequest jobs on Jenkins but did not see any jobs that tested this PR, so it will need a retest.
Did you test this manually with rocblas and rocsparse tpls?

@ndellingwood ndellingwood added the AT: RETEST Have this PR retested. label Mar 31, 2023
@lucbv
Copy link
Contributor Author

lucbv commented Mar 31, 2023

@ndellingwood just did a manual build on caraway and it looks good, I actually added a small change to avoid a warning on unused variable in a unit-test while I'm at it...

One unrelated thing I would like is to have a standard variable set inside find module of each of our TPL that stores the location where the library was found and that we print at configure time with the list of libraries enabled.

For rocblas we could do this in FindTPLROCBLAS.cmake:

GET_PROPERTY(TPL_ROCBLAS_LOCATION TARGET roc::rocblas PROPERTY LOCATION)

and this in the top CMakeLists.txt:

MESSAGE("   ${TPL_PADDED} ${TPL_${TPL}_LOCATION}")

@lucbv lucbv requested review from fnrizzi and ndellingwood March 31, 2023 18:46
@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 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@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: 453
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 61
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020

  • Build Num: 91
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020_Light_LayoutRight

  • Build Num: 361
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC1020

  • Build Num: 322
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19

  • Build Num: 411
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 464
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 265
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 260
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 263
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (lucbv/kokkos-kernels)
  • Branch: roc_tpls_upgrade
  • SHA: a9189f5
  • Mode: TEST_REPO

Pull Request Author: lucbv

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

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 61
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020

  • Build Num: 91
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC1020_Light_LayoutRight

  • Build Num: 361
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC1020

  • Build Num: 322
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19

  • Build Num: 411
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001

  • Build Num: 464
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 265
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 260
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 263
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH roc_tpls_upgrade
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA a9189f5
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA b079a4e
PR_LABELS Cleanup;AT: RETEST
PULLREQUESTNUM 1763
TEST_REPO_ALIAS KOKKOSKERNELS

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

@lucbv lucbv merged commit e35ed21 into kokkos:develop Apr 1, 2023
@ndellingwood
Copy link
Contributor

Adding label CompatibilityUpdate for tracking purposes
Compatibility of Trilinos with these changes requires trilinos/Trilinos@d25bfcc from PR trilinos/Trilinos#11750, otherwise these configure errors will occur:

18:45:43 CMake Error at cmake/tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake:723 (message):
18:45:43   Error, the package 'ROCBLAS' is listed as a dependency of the package
18:45:43   'KokkosKernels' but the package 'ROCBLAS' is either not defined or is
18:45:43   listed later in the package order.  This may also be an attempt to create a
18:45:43   circular dependency between the packages 'ROCBLAS' and 'KokkosKernels'
18:45:43   (which is not allowed).  Check the spelling of 'ROCBLAS' or see how it is
18:45:43   listed in a call to tribits_repository_define_packages() in relation to
18:45:43   'KokkosKernels'.  To ignore/disable the undefined package 'ROCBLAS', set
18:45:43   the cache variable Trilinos_ASSERT_DEFINED_DEPENDENCIES=IGNORE.

@ndellingwood ndellingwood added patch-release-cherry-pick TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos labels Apr 3, 2023
@ndellingwood
Copy link
Contributor

This will be cherry-picked to release-candidate-4.0.01 for Trilinos compatibility

ndellingwood pushed a commit that referenced this pull request Apr 3, 2023
Roc tpls upgrade

(cherry picked from commit e35ed21)
@ndellingwood
Copy link
Contributor

Cherry-picked to release-candidate-4.0.01 sha f406083

ndellingwood pushed a commit that referenced this pull request Apr 20, 2023
Roc tpls upgrade

(cherry picked from commit e35ed21)
@lucbv lucbv deleted the roc_tpls_upgrade branch May 22, 2023 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cleanup Code maintenance that isn't a bugfix or new feature CompatibilityUpdate 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.

5 participants