Trilinos merge requestshttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests2019-05-01T22:16:41Zhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5060Xpetra: Adding ETI for Xpetra::TpetraImport2019-05-01T22:16:41ZJames WillenbringXpetra: Adding ETI for Xpetra::TpetraImport*Created by: csiefer2*
Auto-PR for SHA 52e7c5d*Created by: csiefer2*
Auto-PR for SHA 52e7c5dhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5053Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-05-01T14:29:29ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190501_000613 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190501_000613 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190501_000613 branch to masterhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5052Xpetra: ETI for CrsMatrixWrap (try 2)2019-05-03T21:10:57ZJames WillenbringXpetra: ETI for CrsMatrixWrap (try 2)*Created by: jhux2*
Partially address issue #4986.*Created by: jhux2*
Partially address issue #4986.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5054WIP: Improve 'mutrino' test run-times some (ATDV-131, TRIL-219)2019-05-03T14:54:43ZJames WillenbringWIP: Improve 'mutrino' test run-times some (ATDV-131, TRIL-219)*Created by: bartlettroscoe*
CC: @fryeguy52
These improvements are based on the work by Brad King at Kitware in:
* https://gitlab.kitware.com/snl/project-1/issues/91
Also see [ATDV-131](https://sems-atlassian-srn.sandia.gov/br...*Created by: bartlettroscoe*
CC: @fryeguy52
These improvements are based on the work by Brad King at Kitware in:
* https://gitlab.kitware.com/snl/project-1/issues/91
Also see [ATDV-131](https://sems-atlassian-srn.sandia.gov/browse/ATDV-131)
## How was this tested?
I ran this on 'mutrino' in some extensive testing in summarized in [ATDV-131](https://sems-atlassian-srn.sandia.gov/browse/ATDV-131?focusedCommentId=34363&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-34363). The final commit to use `ctest -j4` for both the builds was verified on 'mutrino' with:
```
$ env \
Trilinos_PACKAGES=Panzer \
CTEST_START_WITH_EMPTY_BINARY_DIRECTORY=FALSE \
CTEST_DO_CONFIGURE=OFF \
CTEST_DO_BUILD=FALSE \
./ctest-s-local-test-driver.sh intel-opt-openmp-HSW intel-opt-openmp-KNL
***
*** ./ctest-s-local-test-driver.sh intel-opt-openmp-HSW intel-opt-openmp-KNL
***
ATDM_TRILINOS_DIR = '/home/rabartl/Trilinos.base/Trilinos'
Load some env to get python, cmake, etc ...
Hostname 'mutrino' matches known ATDM host 'mutrino' and system 'mutrino'
Setting compiler and build options for buld name 'default'
Using mutrino compiler stack INTEL to build DEBUG code with Kokkos node type SERIAL and KOKKOS_ARCH=HSW
Running builds:
intel-opt-openmp-HSW
intel-opt-openmp-KNL
Running Jenkins driver Trilinos-atdm-mutrino-intel-opt-openmp-HSW.sh ...
real 6m15.261s
user 0m2.926s
sys 0m0.814s
Running Jenkins driver Trilinos-atdm-mutrino-intel-opt-openmp-KNL.sh ...
real 14m15.213s
user 0m2.558s
sys 0m0.617s
```
which posted to CDash builds:
* HSW: https://testing.sandia.gov/cdash/index.php?project=Trilinos&parentid=4976653
* KNL: https://testing.sandia.gov/cdash/index.php?project=Trilinos&parentid=4976655
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5051Muelu Maxwell test: Add option to read in nullspace2019-05-01T02:23:06ZJames WillenbringMuelu Maxwell test: Add option to read in nullspace*Created by: cgcgcg*
@trilinos/muelu
## Description
Allow to read nullspace from file.*Created by: cgcgcg*
@trilinos/muelu
## Description
Allow to read nullspace from file.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5050Xpetra: Adding ETI for XpetraTpetraVector2019-05-02T18:35:07ZJames WillenbringXpetra: Adding ETI for XpetraTpetraVector*Created by: csiefer2*
For issue #4986.*Created by: csiefer2*
For issue #4986.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5049Fix some typos related to overriding parallel build and test levels2019-05-01T00:19:55ZJames WillenbringFix some typos related to overriding parallel build and test levels*Created by: bartlettroscoe*
Fixes some typos I found when looking at this documentation.*Created by: bartlettroscoe*
Fixes some typos I found when looking at this documentation.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5048Ifpack2: Add update damping to AdditiveSchwarz2019-05-01T14:08:26ZJames WillenbringIfpack2: Add update damping to AdditiveSchwarz*Created by: csiefer2*
Auto-PR for SHA 7a4b9a5*Created by: csiefer2*
Auto-PR for SHA 7a4b9a5https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5046Tpetra: Fixing shadow warning for #50452019-05-01T18:46:41ZJames WillenbringTpetra: Fixing shadow warning for #5045*Created by: kddevin*
<!---
Be sure to select `develop` as the `base` branch against which to create this
pull request. Only pull requests against `develop` will undergo Trilinos'
automated testing. Pull requests against `master` w...*Created by: kddevin*
<!---
Be sure to select `develop` as the `base` branch against which to create this
pull request. Only pull requests against `develop` will undergo Trilinos'
automated testing. Pull requests against `master` will be ignored.
Provide a general summary of your changes in the Title above. If this pull
request pertains to a particular package in Trilinos, it's worthwhile to start
the title with "PackageName: ".
Note that anything between these delimiters is a comment that will not appear
in the pull request description once created. Most areas in this message are
commented out and can be easily added by removing the comment delimiters.
Please make sure to mark:
* Reviewers
* Assignees
* Labels
Replace <teamName> below with the appropriate Trilinos package/team name.
-->
@trilinos/tpetra
## Description
Fixed shadow warning reported in #5045
## Motivation and Context
Reported by an important customer
<!---
If applicable, let us know how this merge request is related to any other open
issues or pull requests:
## Related Issues
* Closes
* Blocks
* Is blocked by
* Follows
* Precedes
* Related to
* Part of
* Composed of
-->
## How Has This Been Tested?
<!---
Please describe in detail how you tested your changes. Include details of your
testing environment and the tests you ran to see how your change affects other
areas of the code. Consider including configure, build, and test log files.
-->
<!---
## Screenshots
Not obligatory, but is there anything pertinent that we should see?
-->
<!---
Go over all the following points, and put an `x` in all the boxes that apply.
If you are unsure about any of these, please ask—we are here to help.
-->
## Checklist
- [ ] My commit messages mention the appropriate GitHub issue numbers.
- [ ] My code follows the code style of the affected package(s).
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] No new compiler warnings were introduced.
- [ ] These changes break backwards compatibility.
<!---
## Additional Information
Anything else we need to know in evaluating this merge request?
-->
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5041Set CTEST_PARALLEL_LEVEL (CDOFA-43)2019-04-30T16:34:39ZJames WillenbringSet CTEST_PARALLEL_LEVEL (CDOFA-43)*Created by: bartlettroscoe*
Set the cache var CTEST_PARALLEL_LEVEL from ATDM_CONFIG_CTEST_PARALLEL_LEVEL
to make it easy to run 'make dashboard' efficiently.
@fryeguy52, this will make it easy to run 'make dashboard' efficiently ri...*Created by: bartlettroscoe*
Set the cache var CTEST_PARALLEL_LEVEL from ATDM_CONFIG_CTEST_PARALLEL_LEVEL
to make it easy to run 'make dashboard' efficiently.
@fryeguy52, this will make it easy to run 'make dashboard' efficiently right out of the box for [CDOFA-43](https://sems-atlassian-srn.sandia.gov/browse/CDOFA-43)https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5043Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-05-01T14:29:27ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190430_000619 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190430_000619 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190430_000619 branch to masterhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5040Protected ATDM Trilinos install support and install for cuda build on 'waterm...2019-05-01T15:39:54ZJames WillenbringProtected ATDM Trilinos install support and install for cuda build on 'waterman' for SPARC testing*Created by: bartlettroscoe*
This implements a scheme to install Trilinos as the 'atdm-devops-admin' user to protect it from bad 'jenkins' jobs that might accidentally change or delete a Trilinos install.
This also includes support f...*Created by: bartlettroscoe*
This implements a scheme to install Trilinos as the 'atdm-devops-admin' user to protect it from bad 'jenkins' jobs that might accidentally change or delete a Trilinos install.
This also includes support for installing a `waterman_cuda-9.2_shared_opt` build on 'waterman' in order to test SPARC 'master'. This will be the first CUDA testing of SPARC against Trilinos.
## How was this tested?
I did a lot of manual testing as documented in [ATDV-151](https://sems-atlassian-srn.sandia.gov/browse/ATDV-151).
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5032Ifpack2 kokkos promotion preparation2019-05-03T23:35:31ZJames WillenbringIfpack2 kokkos promotion preparation*Created by: kyungjoo-kim*
@trilinos/ifpack2
## Description
kokkoskernels removes experimental namespace. this patch includes appropriate fixes. it also includes the latest ifpack2 improvement. one possible thing that could happe...*Created by: kyungjoo-kim*
@trilinos/ifpack2
## Description
kokkoskernels removes experimental namespace. this patch includes appropriate fixes. it also includes the latest ifpack2 improvement. one possible thing that could happen in sparc is that norm interface needs to be modified. @jjwilke (github does not complete your id automatically). would you change sparc for that ? another major change would be separating tpetra memory space from the internal memory space. The internal memory space is either host space or cuda space. Tpetra memoryspace is right now assumed to be uvm.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5039Tpetra: Fix #5038 (spurious "unused function" build warnings)2019-04-30T15:39:53ZJames WillenbringTpetra: Fix #5038 (spurious "unused function" build warnings)*Created by: mhoemmen*
@trilinos/tpetra
## Description
Fix spurious "unused function" build warnings in Tpetra.
## Motivation and Context
The build warnings block Sierra/Trilinos integration.
## Related Issues
* Closes...*Created by: mhoemmen*
@trilinos/tpetra
## Description
Fix spurious "unused function" build warnings in Tpetra.
## Motivation and Context
The build warnings block Sierra/Trilinos integration.
## Related Issues
* Closes #5038 https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5037MueLu: fixing bug in Maxwell3D Tpetra see #49892019-04-30T13:19:19ZJames WillenbringMueLu: fixing bug in Maxwell3D Tpetra see #4989*Created by: lucbv*
@trilinos/muelu
## Description
Small fix in Maxwell3D-Tpetra test
## Motivation and Context
This has been reported as a blocker issue in #4989
## Related Issues
* Closes #4989
* Blocks
* Is blocked b...*Created by: lucbv*
@trilinos/muelu
## Description
Small fix in Maxwell3D-Tpetra test
## Motivation and Context
This has been reported as a blocker issue in #4989
## Related Issues
* Closes #4989
* Blocks
* Is blocked by
* Follows
* Precedes
* Related to
* Part of
* Composed of
## How Has This Been Tested?
A local build that reproduced this specific test failure has been performed.
The test now works fine with this correction.
## Checklist
- [x] My commit messages mention the appropriate GitHub issue numbers.
- [x] My code follows the code style of the affected package(s).
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
- [x] I have added tests to cover my changes.
- [x] All new and existing tests passed.
- [x] No new compiler warnings were introduced.
- [ ] These changes break backwards compatibility.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5030TrilinosCouplings: Fix #50292019-04-29T21:28:08ZJames WillenbringTrilinosCouplings: Fix #5029*Created by: mhoemmen*
@trilinos/trilinoscouplings
## Description
Fix #5029 (missing header file include in TrilinosCouplings example).
## Related Issues
* Closes #5029 *Created by: mhoemmen*
@trilinos/trilinoscouplings
## Description
Fix #5029 (missing header file include in TrilinosCouplings example).
## Related Issues
* Closes #5029 https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5028Xpetra: split CrsMatrixWrap class2019-05-03T21:10:47ZJames WillenbringXpetra: split CrsMatrixWrap class*Created by: jhux2*
Work towards completing issue #4986.*Created by: jhux2*
Work towards completing issue #4986.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5026NOX: use similarity transform Jacobian when computing row sums2019-05-01T14:25:42ZJames WillenbringNOX: use similarity transform Jacobian when computing row sums*Created by: rppawlo*
*Created by: rppawlo*
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5024MueLu: region MG rework of algorithms and adding tests2019-05-03T16:38:19ZJames WillenbringMueLu: region MG rework of algorithms and adding tests*Created by: lucbv*
@trilinos/muelu
## Description
This is a fairly large rework of the region MG research algorithms.
It introduces a better separation of driver and algorithm using free functions in headers so far.
It mainly us...*Created by: lucbv*
@trilinos/muelu
## Description
This is a fairly large rework of the region MG research algorithms.
It introduces a better separation of driver and algorithm using free functions in headers so far.
It mainly uses Xpetra capabilities instead of Epetra so a Tpetra path is now available.
New examples are also added and used to perform nightly tests when `MueLu_ENABLE_Experimental=ON`
## Motivation and Context
This work allows us to generalize a bit the region MG algorithms and to tests them more extensively.
It also makes it possible to take advantage of some kokkos refactored code for structured grid in MueLu.
## Related Issues
* Closes
* Blocks
* Is blocked by
* Follows
* Precedes
* Related to #4084, #4085
* Part of
* Composed of
## How Has This Been Tested?
This has been tested locally.
## Checklist
- [ ] My commit messages mention the appropriate GitHub issue numbers.
- [x] My code follows the code style of the affected package(s).
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
- [x] I have added tests to cover my changes.
- [x] All new and existing tests passed.
- [ ] No new compiler warnings were introduced.
- [ ] These changes break backwards compatibility.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5022Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-04-29T14:21:00ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190427_000612 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190427_000612 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190427_000612 branch to master