Xpetra: Fix Issue 5672 and ETI Xpetra_MapFactory #5723
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
added 6 commits
August 15, 2019 20:55
|
I'm running a test on Geminga to test out the build that's reported in #5672 which is still running so I'm not setting Automerge until I can review that build... but in the meantime, let's let the autotester do its thing too. |
csiefer2
previously approved these changes
Aug 16, 2019
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
|
NOTICE: The AutoTester has encountered an internal error (usually a Communications Timeout), testing will be restarted, previous tests may still be running but will be ignored by the AutoTester... |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
mhoemmen
reviewed
Aug 16, 2019
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 4258 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 4079 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 2519 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 2343 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 1920 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_2 # 386 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 386 (click to expand) |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 4260 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 4081 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 2521 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 2345 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 1922 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_2 # 387 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 387 (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
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
csiefer2
previously approved these changes
Aug 16, 2019
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 4266 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 4087 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 2527 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 2351 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 1928 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_2 # 392 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 392 (click to expand) |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 4272 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 4094 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 2533 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 2357 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 1934 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_2 # 398 (click to expand)Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 398 (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
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
|
@csiefer2 ok, so this got past gcc 4.8.4 but what I did is kludgy. If we want to merge it in, I'll want to do a cleanup pass to remove some scaffolding comments, etc. Here's the function that I modified: Trilinos/packages/xpetra/src/Map/Xpetra_MapFactory_def.hpp Lines 258 to 285 in 22180ca The problem was the code on line 276: GCC 4.8.4 didn't like this but newer compilers seemed fine with it. From what I can tell in the errors that CDash was throwing out we were trying to assign I added the guard based on GCC version to use the code that was existing already in Going forward, do we cleanup/merge this in? Should I test out another hack that if we're GCC > 5.x then instead of using I'll add the WIP flag for now and we can discuss Monday. |
william76
added
the
AT: WIP
|
@william76 wrote:
Fix this by using the two-argument overload of |
|
@mhoemmen |
|
I believe @mhoemmen right. That should fix the problem. Add this to the list of "code nobody ever build which ETI exposed as an issue" Ugh. |
Fixes the issue with `Xpetra::MapFactory::createLocalMap` calling the 2-template version of `Tpetra::createLocalMap()` (the non-class c'tor for `Tpetra::Map`) which errors out in some builds when there are multiple Node types enabled in the Trilinos configuration. Notably, this was happening in the GCC 4.8.4 build.
william76
removed
the
AT: WIP
|
@william76 @csiefer2 this code is actually used in some of the refactored factories (TentativePFactory_kokkos at least), it essentially allows us to create maps using |
csiefer2
approved these changes
Aug 19, 2019
|
@lucbv I suspect we never turned multiple node types on at the same time during testing... |
|
@csiefer2 I see, maybe we could have a |
william76
added
the
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
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: william76 |
|
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
Build InformationTest Name: Trilinos_pullrequest_python_2
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ csiefer2 ]! |
|
Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged |
|
Merge on Pull Request# 5723: IS A SUCCESS - Pull Request successfully merged |
trilinos-autotester
removed
the
AT: AUTOMERGE
jmgate
pushed a commit
to tcad-charon/Trilinos
that referenced
this pull request
Aug 20, 2019
…s:develop' (12eb4be). * trilinos-develop: (24 commits) Piro: fix Tpetra ordinal issues. (trilinos#5747) Trilinos Couplings: Fix for trilinos#5754 (trilinos#5755) Xpetra: remove Tpetra deprecated code (trilinos#5750) Xpetra: MapFactory - ETI - Update (PR trilinos#5723) Panzer: require Epetra to build Stokhos: fix for trilinos#5742 (trilinos#5743) Amesos2: Fix test for throw to work on MPI Panzer: consistent ordinals Xpetra: MapFactory - ETI - branch testing & checkpoint 2019-08-17 (v002) Xpetra: MapFactory - ETI - branch testing & checkpoint 2019-08-17 Phalanx/Panzer: deprecate some utilities Phalanx: adding memory manager Xpetra: MapFactory - ETI - branch checkpoint 2019-08-16 Phalanx: split out print from extent traits Phalanx: add field use range computation Xpetra: ETI - MapFactory - Merging with develop Xpetra: MapFactory - ETI - branch checkpoint 2019-08-15 Xpetra: MapFactory - ETI - branch checkpoint Xpetra: MapFactory - ETI - branch checkpoint 2019-08-13 Xpetra: ETI MapFactory ...
jmgate
pushed a commit
to tcad-charon/Trilinos
that referenced
this pull request
Aug 20, 2019
…s:develop' (12eb4be). * trilinos-develop: (24 commits) Piro: fix Tpetra ordinal issues. (trilinos#5747) Trilinos Couplings: Fix for trilinos#5754 (trilinos#5755) Xpetra: remove Tpetra deprecated code (trilinos#5750) Xpetra: MapFactory - ETI - Update (PR trilinos#5723) Panzer: require Epetra to build Stokhos: fix for trilinos#5742 (trilinos#5743) Amesos2: Fix test for throw to work on MPI Panzer: consistent ordinals Xpetra: MapFactory - ETI - branch testing & checkpoint 2019-08-17 (v002) Xpetra: MapFactory - ETI - branch testing & checkpoint 2019-08-17 Phalanx/Panzer: deprecate some utilities Phalanx: adding memory manager Xpetra: MapFactory - ETI - branch checkpoint 2019-08-16 Phalanx: split out print from extent traits Phalanx: add field use range computation Xpetra: ETI - MapFactory - Merging with develop Xpetra: MapFactory - ETI - branch checkpoint 2019-08-15 Xpetra: MapFactory - ETI - branch checkpoint Xpetra: MapFactory - ETI - branch checkpoint 2019-08-13 Xpetra: ETI MapFactory ...
searhein
pushed a commit
to searhein/Trilinos
that referenced
this pull request
Aug 20, 2019
…rosch-albany * 'develop' of https://github.com/trilinos/Trilinos: (138 commits) IOSS: Serialize IO test only with parallel-aware exodus Amesos2: Count entries in matrix before allocating (trilinos#5745) Piro: fix Tpetra ordinal issues. (trilinos#5747) Trilinos Couplings: Fix for trilinos#5754 (trilinos#5755) Tpetra: Fix trilinos#5762 Ctest: Fixing missing space Ctest: geminga test updates Xpetra: remove Tpetra deprecated code (trilinos#5750) Testing: change valgrind test days Xpetra: MapFactory - ETI - Update (PR trilinos#5723) Automatic snapshot commit from seacas at e6496d0cc0 Fix smart-jenkins-driver.sh (trilinos#4933) KokkosKernels: CUDA SPGEMM symbolic workaround MueLu RefMaxwell: Allow setting importer parameters MueLu: Allow setting distributor parameters at end of setup Xpetra: Allow setting parameters on Distributor of Import/Export Xpetra::ImportFactory: Add optional parameter list Panzer: require Epetra to build MueLu: add some braces to region MG smoothers Stokhos: fix for trilinos#5742 (trilinos#5743) ... # Conflicts: # packages/shylu/shylu_dd/frosch/cmake/Dependencies.cmake
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/xpetra
Fixes #5672
The fix looks like it required an ETI of MapFactory. There were a couple of other small bugs I located and fixed with this too.