Issue 4283: refactor muelu to not use dynamic profile when declaring crsgraph #4411
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GeoffDanielson
changed the title
|
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: GeoffDanielson |
jhux2
reviewed
Feb 15, 2019
| @@ -828,7 +828,7 @@ namespace MueLu { | |||
| GetOStream(Statistics1) << "CoalesceDropFactory: nodeMap " << nodeMap->getNodeNumElements() << "/" << nodeMap->getGlobalNumElements() << " elements" << std::endl; | |||
|
|
|||
| // 3) create graph of amalgamated matrix | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::DynamicProfile); | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::StaticProfile); | |||
There was a problem hiding this comment.
@GeoffDanielson Ugh. I suspect 10 is arbitrary, and that this code relies on having the matrix expand its row storage as needed. Did you run the MueLu unit tests to see if this branch is ever hit?
There was a problem hiding this comment.
I did run the muelu unit tests and the limit doesn't get hit. I suspect you're right, but I'm not sure whether it'd be more correct to fix it with the proper upper limit or just leave as is.
There was a problem hiding this comment.
If the matrix is an Xpetra::BlockedCrsMatrix, then the method getNodeMaxNumRowEntries is available. I am fine with this change.
|
@tjfulle Is that CrsGraph and CrsMatrix storage expansion thing on Export all done? (Too many things to keep track of ;-P ) |
|
@mhoemmen - for graph, yes. Export/import in to matrix uses the underlying local matrix suminto and/or replace. I haven’t touched that. Sorted and merged inserts are next on my list and that may help for this issue if failure is due to repeats being inserted. |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2542 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 2339 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 832 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 472 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 256 (click to expand) |
jhux2
reviewed
Feb 15, 2019
| @@ -249,7 +249,7 @@ namespace MueLu { | |||
| myGraph = CrsGraphFactory::Build(rowMap, | |||
| colMap, | |||
| nnzOnRow, | |||
| Xpetra::DynamicProfile); | |||
| Xpetra::StaticProfile); | |||
There was a problem hiding this comment.
@lucbv should really comment on this.
There was a problem hiding this comment.
My feeling is: this should be fine, the graph constructor actually allocates the exact amount of memory it needs since nnzOnRow is specified.
Of course I would still want this example to be tested to double check correctness.
jhux2
reviewed
Feb 15, 2019
| @@ -134,7 +134,7 @@ namespace MueLu { | |||
|
|
|||
|
|
|||
| // 3) create graph of amalgamated matrix | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::DynamicProfile); | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::StaticProfile); | |||
There was a problem hiding this comment.
Ok, for the same reason as for MueLu::CoalesceDropFactory_def.hpp.
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: GeoffDanielson |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2546 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 2343 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 836 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 483 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 260 (click to expand) |
jhux2
added
the
AT: WIP
This is part of Tpetra's switch to static profile.
jhux2
added
AT: RETEST
This is part of Tpetra's switch to static profile.
mhoemmen
reviewed
Mar 15, 2019
| @@ -828,7 +828,7 @@ namespace MueLu { | |||
| GetOStream(Statistics1) << "CoalesceDropFactory: nodeMap " << nodeMap->getNodeNumElements() << "/" << nodeMap->getGlobalNumElements() << " elements" << std::endl; | |||
|
|
|||
| // 3) create graph of amalgamated matrix | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::DynamicProfile); | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, A->getNodeMaxNumRowEntries()*blockdim, Xpetra::StaticProfile); | |||
There was a problem hiding this comment.
This code might run fine, but it could blow out memory if one row happens to have many more entries than other rows. Once we make this change, we may also want to duplicate the loop below, once to get a number of entries in each row (it looks like the loop is amenable to that), and once again to fill the CrsGraph.
There was a problem hiding this comment.
@mhoemmen That's a good suggestion, I'll push an update.
| @@ -134,7 +134,7 @@ namespace MueLu { | |||
|
|
|||
|
|
|||
| // 3) create graph of amalgamated matrix | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, 10, Xpetra::DynamicProfile); | |||
| RCP<CrsGraph> crsGraph = CrsGraphFactory::Build(nodeMap, A->getNodeMaxNumRowEntries()*blockdim, Xpetra::StaticProfile); | |||
There was a problem hiding this comment.
See note above. Can MueLu actually call Isorropia with a Tpetra matrix?
There was a problem hiding this comment.
No, MueLu will throw. See
Trilinos/packages/muelu/src/Rebalancing/MueLu_IsorropiaInterface_def.hpp
Lines 216 to 223 in 5c9a2ec
There was a problem hiding this comment.
@jhux2 Thanks for the clarification! It's probably better for even the Epetra-based code to use StaticProfile, as long as it has good bounds for each row.
|
Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing. |
|
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: GeoffDanielson |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2819 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 2623 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 1104 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 791 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 527 (click to expand) |
trilinos-autotester
removed
the
AT: RETEST
|
Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job Trilinos_pullrequest_intel_17.0.1 to start: Total Wait = 603
|
william76
added
the
AT: RETEST
|
Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: GeoffDanielson |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
|
trilinos-autotester
removed
the
AT: RETEST
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ jhux2 ]! |
|
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 were you planning on pushing an update first? |
|
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... |
2 similar comments
|
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... |
|
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... |
|
@mhoemmen @GeoffDanielson I'm ok with merging this as is. Adding more precise graph sizes will involve changes to Xpetra, which can be a separate PR. |
|
@jhux2 Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@trilinos/muelu
@trilinos/tpetra
Description
This removes Tpetra::DynamicProfile from muelu
Motivation and Context
Deprecation of DynamicProfile in Tpetra's effect on downstream packages
How Has This Been Tested?
Since this is a change to tested code, the affected unit tests have been rerun to ensure that they are no longer using the deprecated code path. Tests conducted on linux 2.6.32.
Checklist
commented out and can be easily added by removing the comment delimiters.