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

MueLu: remove some Tpetra deprecated #9862

Merged
merged 2 commits into from
Oct 27, 2021

Conversation

brian-kelley
Copy link
Contributor

@trilinos/muelu

Motivation

Removes some dependence on Tpetra deprecated code. Now the MMKernelDriver (perf test) works with -DTpetra_ENABLE_DEPRECATED_CODE=OFF and UVM off. Also removed calls to deprecated getLocalMatrix (replaced by getLocalMatrixDevice) in Region so it at least builds without deprecated, although 3/43 tests still fail (with UVM).

Stakeholder Feedback

Testing

in MMKernelDriver. Remaining TODO: retest this with ViennaCL and MKL
just in case
@brian-kelley brian-kelley self-assigned this Oct 26, 2021
@brian-kelley brian-kelley requested a review from a team as a code owner October 26, 2021 21:40
@brian-kelley brian-kelley changed the title MueLu: remove some Tpetra deprecated and fix MueLu: remove some Tpetra deprecated Oct 26, 2021
@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5860
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3405
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3923
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 11098
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2564
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1555
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3896
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: python-3

  • Build Num: 532
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Using Repos:

Repo: TRILINOS (brian-kelley/Trilinos)
  • Branch: MueLuDeprecated
  • SHA: 4d9a4f0
  • Mode: TEST_REPO

Pull Request Author: brian-kelley

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 5860
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 3405
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 3923
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 11098
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105

  • Build Num: 2564
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off

  • Build Num: 1555
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 3896
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1

Build Information

Test Name: python-3

  • Build Num: 532
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS pkg: MueLu
PULLREQUESTNUM 9862
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH MueLuDeprecated
TRILINOS_SOURCE_REPO https:/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 4d9a4f0
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https:/trilinos/Trilinos
TRILINOS_TARGET_SHA 0c84fa1


CDash Test Results for PR# 9862.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge 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!

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

Copy link
Member

@jhux2 jhux2 left a comment

Choose a reason for hiding this comment

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

The changes to MMKernelDriver.cpp look fine to me. @lucbv @pohm01 Can one of you please look at RegionDriver.cpp?

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
THE LAST COMMIT TO THIS PULL REQUEST HAS BEEN REVIEWED, BUT NOT ACCEPTED OR REQUIRES CHANGES

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

@pohm01
Copy link
Contributor

pohm01 commented Oct 27, 2021

@jhux2 changes to RegionMatrix.cpp look good to me.

Copy link
Member

@jhux2 jhux2 left a comment

Choose a reason for hiding this comment

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

lgtm and @pohm01

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@jhux2 jhux2 merged commit 1d02e11 into trilinos:develop Oct 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants