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

BLAS: fix assignable check in gemv and gemm #1914

Merged
merged 1 commit into from
Jul 27, 2023
Merged

BLAS: fix assignable check in gemv and gemm #1914

merged 1 commit into from
Jul 27, 2023

Conversation

lucbv
Copy link
Contributor

@lucbv lucbv commented Jul 25, 2023

This is actually not a required pre-requisite we only need to check that the views are accessible.
@vbrunini

@lucbv
BLAS: fix assignable check in gemv and gemm
e9a53dc 
This is actually not a required pre-requiste
we only need to check that the views are accessible.
@lucbv lucbv added the bug label Jul 25, 2023
@lucbv lucbv requested review from brian-kelley and e10harvey July 25, 2023 17:38
@lucbv lucbv self-assigned this Jul 25, 2023
@lucbv lucbv mentioned this pull request Jul 25, 2023
Closed
@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_GNU1021 to start: Total Wait = 3603

@brian-kelley
Copy link
Contributor

These changes look fine. Was the issue the fact that it's assignable, or the fact that SpaceAccessibility is being used with two memory spaces instead of an exec and mem space?

Passing two memory spaces definitely seems weird and there are few other places that do it, like scal and ger

@lucbv
Copy link
Contributor Author

lucbv commented Jul 25, 2023

@brian-kelley the accessible check is actually sufficient since it implies that you can read and write to views stored in memory_space from execution_space. The assignable check actually looks at whether a pointer from memory_space1 can be assigned to memory_space2 which is not what we do here.
I will clean-up the other places where we use assignable inappropriately.

@lucbv lucbv added the AT: RETEST Have this PR retested. label Jul 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' - Failure: Timed out waiting for job KokkosKernels_PullRequest_GNU1021 to start: Total Wait = 3603

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Jul 26, 2023
@brian-kelley
Copy link
Contributor

@lucbv Ohh, thanks for explaining that. I was thinking 'assignable' meant that the memory was writable (probably because of the way it was used in these KK files).

It looks like the only other places assignable is used incorrectly are scal, ger and syr.

@e10harvey e10harvey added the AT: RETEST Have this PR retested. label Jul 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' - Failure: Timed out waiting for job KokkosKernels_PullRequest_GNU1021 to start: Total Wait = 3603

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Jul 26, 2023
@e10harvey e10harvey added the AT: RETEST Have this PR retested. label Jul 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_CUDA11_CUDA11_LayoutRight

  • Build Num: 764
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 355
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021

  • Build Num: 28
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight

  • Build Num: 27
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GNU1021

  • Build Num: 27
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo

  • Build Num: 33
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001_solo

  • Build Num: 26
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 538
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 533
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 532
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_Tpls_ROCM520

  • Build Num: 54
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (lucbv/kokkos-kernels)
  • Branch: fix_assignable_checl
  • SHA: e9a53dc
  • 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: 764
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10

  • Build Num: 355
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021

  • Build Num: 28
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GNU1021_Light_LayoutRight

  • Build Num: 27
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GNU1021

  • Build Num: 27
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL19_solo

  • Build Num: 33
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_CLANG1001_solo

  • Build Num: 26
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_Tpls_ARMPL2110

  • Build Num: 538
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_A64FX_GCC1020

  • Build Num: 533
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_ROCM520

  • Build Num: 532
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_VEGA908_Tpls_ROCM520

  • Build Num: 54
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_REPO https://github.com/lucbv/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA e9a53dc
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 1b96d94
PR_LABELS bug;AT: RETEST
PULLREQUESTNUM 1914
TEST_REPO_ALIAS KOKKOSKERNELS

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Jul 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 [ e10harvey brian-kelley ]!

@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 aa7942d into kokkos:develop Jul 27, 2023
@lucbv lucbv deleted the fix_assignable_checl branch July 27, 2023 14:48
@lucbv
Copy link
Contributor Author

lucbv commented Jul 27, 2023

@brian-kelley thanks I will issue an other PR for the remaining kernels.
When I have a minute I will also look into updating Kokkos Core's documentation about SpaceAccessibility so we all have a clear understanding of what it means. When I used it originally I had the understanding of accessible means can be read and assignable means can be written to.

masterleinad added a commit to masterleinad/Trilinos that referenced this pull request Aug 9, 2023
@masterleinad
Cherry-pick kokkos/kokkos-kernels#1914
49c07e1
@masterleinad masterleinad mentioned this pull request Aug 9, 2023
Merged
@ndellingwood ndellingwood added the TrilinosPatchMatch Apply this label for PR's mirroring changes submitted directly to Trilinos label Aug 15, 2023
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Aug 16, 2023
@prwolfe
Merge 'trilinos/Trilinos:develop' (f51a277) into 'tcad-charon/Trilino…
d9c7a4b 
…s:develop' (1dd3da3).

* trilinos-develop:
  Fix logic error when parsing --kokkos-develop flag
  Correct spec inheritance for CXX20 build
  Panzer q2 mesh support (trilinos#11364)
  Skip PR merge when using --kokkos-develop flag.
  Add flag to set Kokkos and KokkosKernels to develop
  Tpetra_Kokkos_Compat_KokkosSYCLWrapperNode->Tpetra_KokkosCompat_KokkosSYCLWrapperNode typo
  Cherry-pick kokkos/kokkos-kernels#1914
  Update GDSW_Proxy_def.hpp
  Tpetra: Oops
  Tpetra: Adding docs
  Tpetra: Adding unit labels
  Tpetra: Adding GDSW memory diagnostic XML support
  Kokkos: Disable default oneDPL support
  Tpetra: Adding GDSWStyle perf tests
  Tpetra: GDSW Fixes
  Tpetra: GDSW test mods
  Tpetra: Modifying test
  Tpetra: Modifying test
  Tpetra: More mods to the test
  Tpetra: Initial commit for GDSW Proxy
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Aug 16, 2023
@glhenni
Merge 'trilinos/Trilinos:develop' (d454829) into 'tcad-charon/Trilino…
e7e4c83 
…s:develop' (1dd3da3).

* trilinos-develop: (22 commits)
  Fix logic error when parsing --kokkos-develop flag
  Correct spec inheritance for CXX20 build
  Tpetra: Use Kokkos::Experimental::SYCLDeviceUSMSpace for KokkosSYCLWrapperNode
  Panzer q2 mesh support (trilinos#11364)
  Skip PR merge when using --kokkos-develop flag.
  Add flag to set Kokkos and KokkosKernels to develop
  Tpetra_Kokkos_Compat_KokkosSYCLWrapperNode->Tpetra_KokkosCompat_KokkosSYCLWrapperNode typo
  Cherry-pick kokkos/kokkos-kernels#1914
  Update GDSW_Proxy_def.hpp
  Tpetra: Oops
  Tpetra: Adding docs
  Tpetra: Adding unit labels
  Tpetra: Adding GDSW memory diagnostic XML support
  Kokkos: Disable default oneDPL support
  Tpetra: Adding GDSWStyle perf tests
  Tpetra: GDSW Fixes
  Tpetra: GDSW test mods
  Tpetra: Modifying test
  Tpetra: Modifying test
  Tpetra: More mods to the test
  ...
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Aug 16, 2023
@glhenni
Merge 'trilinos/Trilinos:develop' (d454829) into 'tcad-charon/Trilino…
fceb00f 
…s:develop' (1dd3da3).

* trilinos-develop: (22 commits)
  Fix logic error when parsing --kokkos-develop flag
  Correct spec inheritance for CXX20 build
  Tpetra: Use Kokkos::Experimental::SYCLDeviceUSMSpace for KokkosSYCLWrapperNode
  Panzer q2 mesh support (trilinos#11364)
  Skip PR merge when using --kokkos-develop flag.
  Add flag to set Kokkos and KokkosKernels to develop
  Tpetra_Kokkos_Compat_KokkosSYCLWrapperNode->Tpetra_KokkosCompat_KokkosSYCLWrapperNode typo
  Cherry-pick kokkos/kokkos-kernels#1914
  Update GDSW_Proxy_def.hpp
  Tpetra: Oops
  Tpetra: Adding docs
  Tpetra: Adding unit labels
  Tpetra: Adding GDSW memory diagnostic XML support
  Kokkos: Disable default oneDPL support
  Tpetra: Adding GDSWStyle perf tests
  Tpetra: GDSW Fixes
  Tpetra: GDSW test mods
  Tpetra: Modifying test
  Tpetra: Modifying test
  Tpetra: More mods to the test
  ...
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Aug 16, 2023
@glhenni
Merge 'trilinos/Trilinos:develop' (d454829) into 'tcad-charon/Trilino…
1da0f3a 
…s:develop' (1dd3da3).

* trilinos-develop: (22 commits)
  Fix logic error when parsing --kokkos-develop flag
  Correct spec inheritance for CXX20 build
  Tpetra: Use Kokkos::Experimental::SYCLDeviceUSMSpace for KokkosSYCLWrapperNode
  Panzer q2 mesh support (trilinos#11364)
  Skip PR merge when using --kokkos-develop flag.
  Add flag to set Kokkos and KokkosKernels to develop
  Tpetra_Kokkos_Compat_KokkosSYCLWrapperNode->Tpetra_KokkosCompat_KokkosSYCLWrapperNode typo
  Cherry-pick kokkos/kokkos-kernels#1914
  Update GDSW_Proxy_def.hpp
  Tpetra: Oops
  Tpetra: Adding docs
  Tpetra: Adding unit labels
  Tpetra: Adding GDSW memory diagnostic XML support
  Kokkos: Disable default oneDPL support
  Tpetra: Adding GDSWStyle perf tests
  Tpetra: GDSW Fixes
  Tpetra: GDSW test mods
  Tpetra: Modifying test
  Tpetra: Modifying test
  Tpetra: More mods to the test
  ...
jmgate pushed a commit to tcad-charon/Trilinos that referenced this pull request Aug 16, 2023
@glhenni
Merge 'trilinos/Trilinos:develop' (d454829) into 'tcad-charon/Trilino…
8821f8f 
…s:develop' (1dd3da3).

* trilinos-develop: (22 commits)
  Fix logic error when parsing --kokkos-develop flag
  Correct spec inheritance for CXX20 build
  Tpetra: Use Kokkos::Experimental::SYCLDeviceUSMSpace for KokkosSYCLWrapperNode
  Panzer q2 mesh support (trilinos#11364)
  Skip PR merge when using --kokkos-develop flag.
  Add flag to set Kokkos and KokkosKernels to develop
  Tpetra_Kokkos_Compat_KokkosSYCLWrapperNode->Tpetra_KokkosCompat_KokkosSYCLWrapperNode typo
  Cherry-pick kokkos/kokkos-kernels#1914
  Update GDSW_Proxy_def.hpp
  Tpetra: Oops
  Tpetra: Adding docs
  Tpetra: Adding unit labels
  Tpetra: Adding GDSW memory diagnostic XML support
  Kokkos: Disable default oneDPL support
  Tpetra: Adding GDSWStyle perf tests
  Tpetra: GDSW Fixes
  Tpetra: GDSW test mods
  Tpetra: Modifying test
  Tpetra: Modifying test
  Tpetra: More mods to the test
  ...
cwpearson pushed a commit to cwpearson/Trilinos that referenced this pull request Sep 19, 2023
@masterleinad @cwpearson
Cherry-pick kokkos/kokkos-kernels#1914
71df8ed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@e10harvey e10harvey e10harvey approved these changes

@brian-kelley brian-kelley brian-kelley approved these changes

Assignees

@lucbv lucbv

Labels
bug 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
@lucbv @kokkos-devops-admin @brian-kelley @e10harvey @ndellingwood