Tpetra: Clean up CrsGraph::Swap testing #4089
Merged
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
There were some `#if 0` blocks in the test which needed to be changed to use `Tpetra::Details::Behavior::verbose()` for consistency.
william76
added
pkg: Tpetra
AT: AUTOMERGE
|
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
Using Repos:
Pull Request Author: william76 |
mhoemmen
previously approved these changes
Dec 19, 2018
| { | ||
| std::cout << "p=0 | gbl_row : " << p.first << " (" << p.second.size() << ") "; | ||
| for(auto& j: p.second) | ||
| std::cout << "p=0 | gbl_num_rows: " << gbl_rows.size() << std::endl; |
There was a problem hiding this comment.
For future reference (not for this PR), when printing debugging messages nondeterministically over multiple MPI processes to cout or cerr, good practice is to assemble each line (including the endline character) from each process as a string. This tends to make messages from different processes less mixed up. For example:
std::ostringstream os;
os << "(Proc " << myRank << ") gbl_num_rows: " << gbl_rows.size () << std::endl;
std::cout << os.str ();There was a problem hiding this comment.
At some point, it would make sense to turn that into a macro:
#define TPETRA_PRINTLN_LOCAL( out, myRank, stuff ) \
do { \
std::ostringstream tpl_out; \
tpl_out << "(Proc " << myRank << ") " << stuff << std::endl; \
out << tpl_out.str (); \
} while (false)Alas, C++ lacks the equivalent of Common Lisp's GENSYM, so I can't guarantee that tpl_out doesn't shadow any other names in scope. This should still work, though.
There was a problem hiding this comment.
Is the #define TPETRA_PRINTLN_LOCAL a thing that already exists, or are you suggesting creating this macro in the file to use? Either way is doable, but if there's already a macro or function defined that does this then I'm happy to use it :)
There was a problem hiding this comment.
@william76 I'm just suggesting this as a later thing to think about, after this PR is done :-D Thanks though!
Addressing comments from @mhoemmen on PR 4089. - Changed my typedefs naming convention from `foo_t` to `foo_type`
|
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
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2164 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 1967 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 454 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 65 (click to expand) |
|
@mhoemmen I updated the typedefs in the test file and pushed the change. :) |
|
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
Using Repos:
Pull Request Author: william76 |
mhoemmen
previously approved these changes
Dec 19, 2018
| pair_edge_t(3, 1), pair_edge_t(7, 5), pair_edge_t(10, 4) }; | ||
| vec_owners = {pair_owner_t(0, 0), pair_owner_t(1, 0), pair_owner_t(3, 1), pair_owner_t(7, 1), | ||
| pair_owner_t(10, 1)}; | ||
| vec_edges = {pair_edge_type(0, 0), pair_edge_type(0, 11), pair_edge_type(1, 7), pair_edge_type(1, 8), |
There was a problem hiding this comment.
I like these typedefs btw :-D
|
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
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2165 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 1968 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 455 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 66 (click to expand) |
|
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
Using Repos:
Pull Request Author: william76 |
mhoemmen
reviewed
Dec 20, 2018
|
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
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 2167 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 1970 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 457 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 68 (click to expand) |
|
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
Using Repos:
Pull Request Author: william76 |
9 tasks
|
ok, I think I got the little tweaks and style fixes sorted out... unless something is glaringly wrong, I don't think I'll update this PR again before it's merged on in. Requesting a review from someone on the @trilinos/tpetra team :) |
mhoemmen
approved these changes
Dec 20, 2018
| const bool do_fillComplete=true) | ||
| template<class LO, class GO, class Node> | ||
| Teuchos::RCP<Tpetra::CrsGraph<LO, GO, Node> > | ||
| generate_crsgraph(Teuchos::RCP<Teuchos::Comm<int> >& comm, |
There was a problem hiding this comment.
Argh i forgot one thing: this should be Teuchos::RCP<const Teuchos::Comm<int>>. But if it compiles and passes the test, don't worry about it for now.
There was a problem hiding this comment.
@mhoemmen just to clarify, the only change here would be to make this a const, right?
That's easy enough to do and probably best to just do today before I forget about it over the break. I can throw that in and shoot off a new PR for it.
| { | ||
| std::cout << "p=0 | gbl_row : " << p.first << " (" << p.second.size() << ") "; | ||
| for(auto& j: p.second) | ||
| std::cout << "p=0 | gbl_num_rows: " << gbl_rows.size() << std::endl; |
There was a problem hiding this comment.
@william76 I'm just suggesting this as a later thing to think about, after this PR is done :-D Thanks though!
|
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
|
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ mhoemmen ]! |
|
Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged |
|
Merge on Pull Request# 4089: IS A SUCCESS - Pull Request successfully merged |
trilinos-autotester
removed
the
AT: AUTOMERGE
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/tpetra
There were some
#if 0blocks in the test which needed to be changed to useTpetra::Details::Behavior::verbose()for consistency.This PR is convenient as well for testing changes to PR jobs on Jenkins for @trilinos/framework for #4065 =) .