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

MueLu, Xpetra: Kokkos refactor, RefMaxwell, IO #2957

Merged
merged 5 commits into from
Jun 21, 2018
Merged

MueLu, Xpetra: Kokkos refactor, RefMaxwell, IO #2957

merged 5 commits into from
Jun 21, 2018

Conversation

cgcgcg
Copy link
Contributor

@cgcgcg cgcgcg commented Jun 16, 2018

@trilinos/muelu
@trilinos/xpetra

Description

  • Add SetKokkosRefactor to FactoryManager: Determines whether or not Kokkos factories are built by default.
  • Read "use kokkos refactor" from factory format xml.
  • Fix non-kokkosified tests that error out when run with MUELU_KOKKOS_REFACTOR_USE_BY_DEFAULT.
  • Add function to Xpetra_IO that writes out local parts of a CRS matrix.
  • RefMaxwell timers and debug information.

Addresses #2926

cgcgcg added 5 commits June 16, 2018 13:41
@cgcgcg
MueLu: kokkos refactor stuff
e645acd 
* Add SetKokkosRefactor to FactoryManager.
* Read "use kokkos refactor" from factory xml.
* Fix non-kokkosified tests that error out when run with MUELU_KOKKOS_REFACTOR_USE_BY_DEFAULT
@cgcgcg
Tpetra MatrixMatrix OpenMP: Comment out unused variable
e838366
@cgcgcg
Xpetra IO: Add function to save local parts of a CRS matrix
d52c333
@cgcgcg
MueLu RefMaxwell: More timers
e89a132
@cgcgcg
MueLu RefMaxwell: Dump BC info for Kokkos
e6f4bd9
@cgcgcg cgcgcg self-assigned this Jun 16, 2018
@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_4.9.3

  • Build Num: 865
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 582
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 130
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5

Using Repos:

Repo: TRILINOS (cgcgcg/Trilinos)
  • Branch: kokkosRefactor-PR
  • SHA: e6f4bd9
  • Mode: TEST_REPO

Pull Request Author: cgcgcg

@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_4.9.3

  • Build Num: 865
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 582
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 130
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 2957
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkosRefactor-PR
TRILINOS_SOURCE_REPO https://github.com/cgcgcg/Trilinos
TRILINOS_SOURCE_SHA e6f4bd9
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA ffdc8c5


CDash Test Results for PR# 2957.

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

@cgcgcg cgcgcg requested review from aprokop and jhux2 June 17, 2018 02:52
@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
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

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

@cgcgcg cgcgcg added the AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) label Jun 17, 2018
@cgcgcg cgcgcg mentioned this pull request Jun 18, 2018
Closed
jhux2
jhux2 requested changes Jun 19, 2018
View reviewed changes
packages/muelu/src/MueCentral/MueLu_FactoryManager_def.hpp
@@ -143,7 +136,7 @@ namespace MueLu {
// GetFactory("Ptent"): we need to use the same factory instance for both "P" and "Nullspace"
RCP<Factory> factory;
#ifdef HAVE_MUELU_KOKKOS_REFACTOR
if (useKokkos)
if (useKokkos_)
factory = rcp(new SaPFactory_kokkos());
Copy link
Member

Choose a reason for hiding this comment

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

Why can't this use the macro MUELU_KOKKOS_FACTORY as is done for TentativePFactory above?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The macro returns a const FactoryBase which does not have the method SetFactory that the derived Factory class has. We could use the macro and cast back to Factory. Would you prefer that?

Copy link
Member

Choose a reason for hiding this comment

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

That makes sense. I don't see a need to change from what you're doing now.

packages/muelu/src/MueCentral/MueLu_FactoryManager_def.hpp
@@ -155,7 +148,7 @@ namespace MueLu {
// GetFactory("Ptent"): we need to use the same factory instance for both "P" and "Nullspace"
RCP<Factory> factory;
#ifdef HAVE_MUELU_KOKKOS_REFACTOR
if (useKokkos)
if (useKokkos_)
factory = rcp(new NullspaceFactory_kokkos());
Copy link
Member

Choose a reason for hiding this comment

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

Why can't this use the macro MUELU_KOKKOS_FACTORY as is done for TentativePFactory above?

jhux2
jhux2 approved these changes Jun 21, 2018
View reviewed changes
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

@cgcgcg cgcgcg removed the AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) label Jun 21, 2018
@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' - Pull Request MUST BE MERGED MANUALLY BY Project Team - Master Automerge is disabled (in .cfg file)

@cgcgcg cgcgcg merged commit 27d37fa into trilinos:develop Jun 21, 2018
@jhux2 jhux2 mentioned this pull request Jul 2, 2018
Closed
@cgcgcg cgcgcg deleted the kokkosRefactor-PR branch October 22, 2020 19:21
@trilinos-autotester trilinos-autotester mentioned this pull request Dec 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhux2 jhux2 jhux2 approved these changes

@aprokop aprokop Awaiting requested review from aprokop

Assignees

@cgcgcg cgcgcg

Labels
pkg: MueLu pkg: Xpetra
Projects
MueLu
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cgcgcg @trilinos-autotester @jhux2