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

1030 new bsrmatrix #1077

Merged
merged 15 commits into from
Aug 10, 2021
Merged

1030 new bsrmatrix #1077

merged 15 commits into from
Aug 10, 2021

Conversation

uhetmaniuk
Copy link
Contributor

Rebased version of #1031

Closes #1030

@uhetmaniuk uhetmaniuk self-assigned this Aug 6, 2021
@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
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

@uhetmaniuk uhetmaniuk requested review from lucbv and srajama1 August 6, 2021 03:53
@uhetmaniuk uhetmaniuk added the AT: RETEST Have this PR retested. label Aug 6, 2021
@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' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@kokkos-devops-admin
Copy link

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

Copy link
Contributor

@lucbv lucbv left a comment

Choose a reason for hiding this comment

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

Alright, let's get this new one through the auto-tester and see how it fares.

@kokkos-devops-admin
Copy link

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

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

  • Build Num: 403
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 396
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 43
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 387
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10

  • Build Num: 368
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 373
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_LayoutRight

  • Build Num: 179
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9

  • Build Num: 363
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720_GCC740

  • Build Num: 361
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Using Repos:

Repo: KOKKOSKERNELS (uhetmaniuk/kokkos-kernels)
  • Branch: 1030-new-bsrmatrix
  • SHA: 2cf01eb
  • Mode: TEST_REPO

Pull Request Author: uhetmaniuk

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

  • Build Num: 403
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720

  • Build Num: 396
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_GCC720_Light_LayoutRight

  • Build Num: 43
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720

  • Build Num: 387
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10

  • Build Num: 368
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_INTEL18

  • Build Num: 373
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA10_LayoutRight

  • Build Num: 179
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_CUDA9

  • Build Num: 363
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

Build Information

Test Name: KokkosKernels_PullRequest_Tpls_GCC720_GCC740

  • Build Num: 361
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
KOKKOSKERNELS_SOURCE_BRANCH 1030-new-bsrmatrix
KOKKOSKERNELS_SOURCE_REPO https://github.com/uhetmaniuk/kokkos-kernels
KOKKOSKERNELS_SOURCE_SHA 2cf01eb
KOKKOSKERNELS_TARGET_BRANCH develop
KOKKOSKERNELS_TARGET_REPO https://github.com/kokkos/kokkos-kernels
KOKKOSKERNELS_TARGET_SHA 008eb6c
PR_LABELS AT: RETEST
PULLREQUESTNUM 1077
TEST_REPO_ALIAS KOKKOSKERNELS

@kokkos-devops-admin kokkos-devops-admin removed the AT: RETEST Have this PR retested. label Aug 6, 2021
@kokkos-devops-admin
Copy link

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

@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

4 similar comments
@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

@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

@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

@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

Copy link
Contributor

@srajama1 srajama1 left a comment

Choose a reason for hiding this comment

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

See one comment below. @lucbv is creating separate issue for correct handling of impl . I will approved this PR. Let us fix that separately.

#ifndef KOKKOS_SPARSE_BSRMATRIX_HPP_
#define KOKKOS_SPARSE_BSRMATRIX_HPP_

#include "impl/KokkosSparse_BsrMatrix_impl.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

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

Note that this doesn't do what we actually want (not compile the impl file may times). I discussed this with @lucbv and it appears we do not do this right for CrsMatrix as well. We do this right for Spgemm. This impl style requires a overhaul.

Copy link
Contributor

Choose a reason for hiding this comment

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

FYI the issues is #1079

@lucbv lucbv merged commit 5905f84 into kokkos:develop Aug 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BlockCrsMatrix: storage is not consistent with Tpetra, MKL, and cusparse TPL
4 participants