Trilinos merge requestshttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests2018-11-09T18:58:43Zhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3766WIP: Belos: Fixes for GMRES in belos/tpetra/src/solvers2018-11-09T18:58:43ZJames WillenbringWIP: Belos: Fixes for GMRES in belos/tpetra/src/solvers*Created by: iyamazaki*
@trilinos/belos
## Description
Fixes a few bugs in the GMRES solvers in belos/tpetra/src/solvers
## Motivation and Context
There were a bug in the preconditioned GMRES, and with nonzero initial guess, in...*Created by: iyamazaki*
@trilinos/belos
## Description
Fixes a few bugs in the GMRES solvers in belos/tpetra/src/solvers
## Motivation and Context
There were a bug in the preconditioned GMRES, and with nonzero initial guess, in belos/tpetra/src/solvers.
## How Has This Been Tested?
Tested using the stand-alone tester (modified) in belos/tpetra/test/Native
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5119Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-05-07T09:58:30ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190507_000619 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190507_000619 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190507_000619 branch to masterhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5118Tpetra: Attempt to Fix #51172019-05-07T03:24:16ZJames WillenbringTpetra: Attempt to Fix #5117*Created by: mhoemmen*
@trilinos/tpetra
## Description
First attempt at fixing #5117. NOT ALL THE TESTS PASS with the current changes! The following TpetraCore tests still fail:
```
35 - TpetraCore_CrsGraph_UnitTests0_MPI_4...*Created by: mhoemmen*
@trilinos/tpetra
## Description
First attempt at fixing #5117. NOT ALL THE TESTS PASS with the current changes! The following TpetraCore tests still fail:
```
35 - TpetraCore_CrsGraph_UnitTests0_MPI_4 (Failed)
51 - TpetraCore_CrsMatrix_NonlocalAfterResume_MPI_4 (Failed)
62 - TpetraCore_CrsMatrix_Bug6171_MPI_2 (Failed)
72 - TpetraCore_Albany182_MPI_4 (Failed)
97 - TpetraCore_ImportExport2_UnitTests_MPI_4 (Failed)
99 - TpetraCore_MatrixMarket_Tpetra_CrsMatrix_InOutTest_MPI_4 (Failed)
100 - TpetraCore_MatrixMarket_Tpetra_CrsGraph_InOutTest_MPI_4 (Failed)
101 - TpetraCore_MatrixMarket_Operator_Test_MPI_4 (Failed)
132 - TpetraCore_MatrixMatrix_UnitTests_MPI_4 (Failed)
133 - TpetraCore_AddProfiling_UnitTests_MPI_4 (Failed)
135 - TpetraCore_MultiVector_UnitTests_MPI_4 (Failed)
161 - TpetraCore_RowMatrixTransposer_test_MPI_4 (Failed)
171 - TpetraCore_lesson05_redistribution_MPI_4 (Failed)
175 - TpetraCore_FEMAssembly_InsertGlobalIndicesDP_MPI_4 (Failed)
176 - TpetraCore_FEMAssembly_LocalElementLoopDP_MPI_4 (Failed)
177 - TpetraCore_FEMAssembly_TotalElementLoopDP_MPI_4 (Failed)
189 - TpetraCore_guide_power_method_1_MPI_4 (Failed)
190 - TpetraCore_guide_matrix_fill_1_MPI_4 (Failed)
193 - TpetraCore_guide_data_redist_1_MPI_4 (Failed)
```
## Related Issues
* Closes #5117
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5116Add support for 'fpic' build name keyword (ATDV-151)2019-05-07T03:46:06ZJames WillenbringAdd support for 'fpic' build name keyword (ATDV-151)*Created by: bartlettroscoe*
The current SPARC CUDA shared builds actually are hard-coded to link against static libs for Trilinos. For that, you nee to add -fPIC to the Trilinos static build. (See [ATDV-151](https://sems-atlassian-sr...*Created by: bartlettroscoe*
The current SPARC CUDA shared builds actually are hard-coded to link against static libs for Trilinos. For that, you nee to add -fPIC to the Trilinos static build. (See [ATDV-151](https://sems-atlassian-srn.sandia.gov/browse/ATDV-151))
The default is not to use -fPIC obviously.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5115Tpetra: "New RTI" (Reduction Transform Interface), Part 1 (for_each, transform)2019-05-07T08:30:28ZJames WillenbringTpetra: "New RTI" (Reduction Transform Interface), Part 1 (for_each, transform)*Created by: mhoemmen*
@trilinos/tpetra
## Description
Tpetra once had something called the Reduction Transform Interface (RTI). It let users apply a function to each entry of one or two (or three, I think) `Tpetra::Vector`s, an...*Created by: mhoemmen*
@trilinos/tpetra
## Description
Tpetra once had something called the Reduction Transform Interface (RTI). It let users apply a function to each entry of one or two (or three, I think) `Tpetra::Vector`s, and then possibly end with a reduction over the output Vector.
This commit starts anew with RTI, by adding the following features:
1. `withLocalAccess`: Access the local data of a `Tpetra::)Multi)Vector` in a given memory space -- a declarative replacement for DualView-style functions
2. `for_each`: Works like `std::for_each`, but for `Tpetra::(Multi)Vector`
3. `transform`: Works like unary or binary `std::transform`, but for `Tpetra::(Multi)Vector`
(2) and (3) use (1). All of these have extension points so that they can be adapted for other objects, such as CrsGraph or CrsMatrix.
## Motivation and Context
Users want to apply functions entrywise to a Vector or MultiVector. They want to get at the local data, and they want Tpetra to handle the sync and modify flag stuff for them. Tpetra wants the power to do things like lazy allocation (see #333) that go beyond what `Kokkos::DualView` allows. Tpetra wants to protect users from holding on to owning `Kokkos::View` that really belong to Tpetra objects, because that can cause bugs (e.g., if the mesh that produced the linear system has changed) and unnecessary memory usage.
## Next steps
1. Add `transform_reduce` (the "R" in "RTI")
2. Think about how to do kernel fusion with a mixture of Vector and CrsMatrix (or at least provide a "residual" interface)
## Related Issues
* Closes: #3471
* Related to #333, #364, #381, #415, #768, #1424, #1896https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5114MueLu: fix line detection factory2019-05-07T04:20:16ZJames WillenbringMueLu: fix line detection factory*Created by: lucbv*
@trilinos/muelu
## Description
Mainly removing the Scalar type in favor of the coordinate_type type.
## Motivation and Context
With the current implementation, the algorithm crashes if `Scalar=std::complex<>...*Created by: lucbv*
@trilinos/muelu
## Description
Mainly removing the Scalar type in favor of the coordinate_type type.
## Motivation and Context
With the current implementation, the algorithm crashes if `Scalar=std::complex<>`
## Related Issues
* Closes #5112
* Blocks
* Is blocked by
* Follows
* Precedes
* Related to
* Part of
* Composed of
## How Has This Been Tested?
I have perfromed a local test with complex enabled.
## 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/5113Clean up a warning & set Werror for Pamgen2019-05-07T04:08:54ZJames WillenbringClean up a warning & set Werror for Pamgen*Created by: ZUUL42*
<!---
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` wi...*Created by: ZUUL42*
<!---
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/pamgen @trilinos/framework
## Description
<!--- Please describe your changes in detail. -->
This removes a couple of lines that are unused variables and sets Werror for Pamgen.
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
This is work towards #3178 and takes care of #5104.
<!---
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
-->
<!---
## 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
- [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.
- [x] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
- [x] All new and existing tests passed.
- [x] 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/5111Move the gcc 4.8.4 build to use static libraries2019-05-06T19:40:38ZJames WillenbringMove the gcc 4.8.4 build to use static libraries*Created by: prwolfe*
@trilinos/framework
## Description
This is the changes needed to the PR environment and scripts to get the gcc 4.8.4 build to use static libraries. Note that the build still fails on some missing template inst...*Created by: prwolfe*
@trilinos/framework
## Description
This is the changes needed to the PR environment and scripts to get the gcc 4.8.4 build to use static libraries. Note that the build still fails on some missing template instantiations so this cannot merge until those issues are resolved.
## Motivation and Context
Builds for external customers should work withe either shared or static libraries
## Related Issues
* Closes #5058
## How Has This Been Tested?
I used the instructions at https://github.com/trilinos/Trilinos/wiki/Reproducing-PR-Testing-Errors to build this locally.
## Checklist
- [ x ] 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.
- [ x ] All new and existing tests passed.
- [ ] No new compiler warnings were introduced.
- [ ] These changes break backwards compatibility.
Additional issues for the template problems will be created directly.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5110NOX: Fix possible overflow when computing matrix size in NOX::LAPACK::Matrix2019-05-06T21:08:21ZJames WillenbringNOX: Fix possible overflow when computing matrix size in NOX::LAPACK::Matrix*Created by: etphipp*
Reported by Alan Heirich.*Created by: etphipp*
Reported by Alan Heirich.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5109Edits to atdm config install documentation2019-05-06T18:50:16ZJames WillenbringEdits to atdm config install documentation*Created by: fryeguy52*
*Created by: fryeguy52*
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5099Updating version file to reflect that 12.16 has been branched.2019-05-06T20:59:14ZJames WillenbringUpdating version file to reflect that 12.16 has been branched.*Created by: jwillenbring*
Updating to 12.17 for now because in Trilinos 13 we are going
to break backward compatibility and don't want to do so quite yet.
Also, we are planning to change the versioning approach. This change
does not...*Created by: jwillenbring*
Updating to 12.17 for now because in Trilinos 13 we are going
to break backward compatibility and don't want to do so quite yet.
Also, we are planning to change the versioning approach. This change
does not indicate we are planning a 12.18 release.
<!---
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/framework
## Description
<!--- Please describe your changes in detail. -->
I am updating the version of Trilinos on the development branch, which will eventually be promoted to the master branch, to make it clear that this is not the development version of Trilinos prior to 12.16.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5108MueLu: upgrade auto PR script2019-05-07T00:21:48ZJames WillenbringMueLu: upgrade auto PR script*Created by: jhux2*
Upgrade PR script
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/trilinos/trilinos/51...*Created by: jhux2*
Upgrade PR script
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/trilinos/trilinos/5108)
<!-- Reviewable:end -->
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5100MueLu: More RAPShift fixes2019-05-07T03:53:45ZJames WillenbringMueLu: More RAPShift fixes*Created by: csiefer2*
Auto-PR for SHA 48785b1*Created by: csiefer2*
Auto-PR for SHA 48785b1https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5097Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-05-06T09:31:59ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190506_000620 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190506_000620 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190506_000620 branch to masterhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5107Xpetra: fix header installation error2019-05-06T23:32:59ZJames WillenbringXpetra: fix header installation error*Created by: jhux2*
Fixes issue #5098.*Created by: jhux2*
Fixes issue #5098.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5096Xpetra: Fix xpetra tpetravector eti2019-05-06T21:04:02ZJames WillenbringXpetra: Fix xpetra tpetravector eti*Created by: jjellio*
@trilinos/muelu @trilinos/xpetra @csiefer2
## Description
Misplaced typedef created by the ShortName header...
## Motivation and Context
Broke things: see #5061
Fixes: #5061
## Testing
Using @kdde...*Created by: jjellio*
@trilinos/muelu @trilinos/xpetra @csiefer2
## Description
Misplaced typedef created by the ShortName header...
## Motivation and Context
Broke things: see #5061
Fixes: #5061
## Testing
Using @kddevin cmake + sems clang atdm modules
```
source ..//cmake/std/atdm/load-env.sh Trilinos-atdm-clang-release-debug
cmake -GNinja -DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnv.cmake -DTrilinos_ENABLE_TESTS=ON -D Trilinos_ENABLE_MueLu=ON -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON -D Tpetra_INST_INT_INT:BOOL=ON -D Tpetra_INST_INT_LONG_LONG:BOOL=OFF -D CMAKE_BUILD_TYPE:STRING="DEBUG" -D TPL_ENABLE_MPI:BOOL=ON -D TPL_ENABLE_BinUtils:BOOL=OFF -D TPL_ENABLE_Pthread:BOOL=OFF -D CMAKE_C_FLAGS:STRING="-Wall -pedantic -Wno-unknown-pragmas -Wno-narrowing -Wno-inline -Wshadow -Wdeprecated-declarations -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Winit-self -fstrict-aliasing -Wno-long-long" -D CMAKE_CXX_FLAGS:STRING="-Wall -pedantic -Wno-unknown-pragmas -Wno-narrowing -Wno-delete-non-virtual-dtor -Wno-inline -Wshadow -Wdeprecated-declarations -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Winit-self -fstrict-aliasing" -D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON -D Trilinos_ENABLE_TESTS:BOOL=ON -D Trilinos_ENABLE_EXAMPLES:BOOL=ON -D Trilinos_ENABLE_SHADOW_WARNINGS:BOOL=ON -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF -D Trilinos_ENABLE_Fortran:BOOL=OFF -D Trilinos_ENABLE_Stokhos:BOOL=ON -D Trilinos_ENABLE_Nox:BOOL=ON -D Trilinos_ENABLE_ROL:BOOL=ON -D ROL_ENABLE_EXAMPLES:BOOL=OFF -D Trilinos_ENABLE_MiniTensor:BOOL=OFF -D ROL_ENABLE_MiniTensor:BOOL=OFF -D Trilinos_ENABLE_Panzer:BOOL=ON -D Trilinos_ENABLE_Tempus:BOOL=ON -D Trilinos_ENABLE_PanzerAdaptersSTK:BOOL=OFF -D Trilinos_ENABLE_PanzerAdaptersIOSS:BOOL=OFF -D Trilinos_ENABLE_Thyra:BOOL=ON -D Trilinos_ENABLE_MueLu:BOOL=ON -D Trilinos_ENABLE_Anasazi:BOOL=ON -D Trilinos_ENABLE_Belos:BOOL=ON -D Trilinos_ENABLE_TrilinosCouplings:BOOL=ON -D Trilinos_ENABLE_STKIO:BOOL=OFF -D Trilinos_ENABLE_STKUtil:BOOL=OFF -D Teuchos_ENABLE_STACKTRACE:BOOL=OFF ..
```
Built/Linked the MueLu driver which requires the Xpetra TpetraVector source file.
## 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.
- [ ] I have added tests to cover my changes.
- [] 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/5095MueLu: Fix MMDriver OpenMP errors2019-05-06T13:46:14ZJames WillenbringMueLu: Fix MMDriver OpenMP errors*Created by: jjellio*
Guards raw openmp diagnostics and fixes some compiler warnings
Closes: #5025
@trilinos/muelu @lucbv
## How Has This Been Tested?
Tested on White (Cuda)
## Checklist
- [x] My commit messages menti...*Created by: jjellio*
Guards raw openmp diagnostics and fixes some compiler warnings
Closes: #5025
@trilinos/muelu @lucbv
## How Has This Been Tested?
Tested on White (Cuda)
## Checklist
- [x] 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.
- [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/5094Tpetra cgsolve perf test fix2019-05-04T20:44:29ZJames WillenbringTpetra cgsolve perf test fix*Created by: crtrott*
@trilinos/tpetra
## Description
This fixes two issues in the Tpetra CGSolve test:
* MPI rank to GPU assignment was broken
* some command line arguments were not properly forwarded, and thus one couldn't...*Created by: crtrott*
@trilinos/tpetra
## Description
This fixes two issues in the Tpetra CGSolve test:
* MPI rank to GPU assignment was broken
* some command line arguments were not properly forwarded, and thus one couldn't do a fixed iteration account.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5090Xpetra: ETI for TpetraCrsGraph2019-05-04T02:02:22ZJames WillenbringXpetra: ETI for TpetraCrsGraph*Created by: csiefer2*
Slaying the #4986 beast.*Created by: csiefer2*
Slaying the #4986 beast.https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/5093Trilinos Master Merge PR Generator: Auto PR created to promote from master_me...2019-05-04T09:43:21ZJames WillenbringTrilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190504_000613 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190504_000613 branch to master*Created by: trilinos-autotester*
Auto PR created to promote from master_merge_20190504_000613 branch to master