Trilinos merge requestshttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests2019-01-30T05:45:38Zhttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/4286TriKota: Disable Dakota's ROL interface2019-01-30T05:45:38ZJames WillenbringTriKota: Disable Dakota's ROL interface*Created by: briadam*
<!---
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: briadam*
<!---
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/trikota
## Description
Initial pass at addressing trilinos/Trilinos#4270: disable Dakota's
ROL interface when building under trilinos/packages/TriKota.
Rationale: Would prefer to have Dakota use ROL as provided by
Trilinos, but creates a circular package dependence due to ROL's
optional use of TriKota. As ROL may remove dependence on Dakota sparse
grid at some point, better to workaround this for now.
Also cleanup TriKota's interface to Dakota's CMake based on changes in
the last few Dakota versions.
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
Addresses #4270
<!---
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.
-->
Tested through make and ctest phases with this config (note requires upstream changes to ROL submitted separately).
```
cmake \
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX=../install \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DTrilinos_ENABLE_TESTS:BOOL=ON \
-DTrilinos_ENABLE_Teuchos:BOOL=ON \
-DTrilinos_ENABLE_ROL:BOOL=ON \
-DTrilinos_ENABLE_TriKota:BOOL=ON \
-DTrilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
-DTrilinos_ENABLE_ALL_FORWARD_DEP_PACKAGES:BOOL=OFF \
-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \
-DTrilinos_ENABLE_COMPLEX_DOUBLE:BOOL=ON \
../source
```
<!---
## 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
- [y] 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.
- [y] I have read the [code contribution guidelines](../blob/master/CONTRIBUTING.md) for this project.
- [n ] I have added tests to cover my changes.
- [y] All new and existing tests passed.
- [y] No new compiler warnings were introduced.
- [n] These changes break backwards compatibility.
## Additional Information
I don't appear to have permission to assign reviewers, assignees, etc., but this may be of interest to @agsalin, @dpkouri, @dridzal, @ikalash https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3560Tpetra_*Platform.cpp/hpp: remove deprecated interface from builds2018-10-08T13:47:47ZJames WillenbringTpetra_*Platform.cpp/hpp: remove deprecated interface from builds*Created by: prwolfe*
This has been deprecated for a few months and both the warnings-as-error
and Sierra builds complain when the *cpp files get built. I
Also removed the calls from all the other locations in Trilinos
where it is us...*Created by: prwolfe*
This has been deprecated for a few months and both the warnings-as-error
and Sierra builds complain when the *cpp files get built. I
Also removed the calls from all the other locations in Trilinos
where it is used (examples mostly).
Thanks to Mark H. for the consulting time.
## Description
This removes includes and calls to deprecated classes and replaces them with the new ones.
## Motivation and Context
These are always an issue when Sierra gets them later. I prefer to stay ahead of the game.
A lot of the changes to examples are in @trilinos/rol - do we need to do anything special to get this into your development area?
## 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.
- [ ] 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/3425Fix checkin-test-sems.sh2018-09-11T22:46:43ZJames WillenbringFix checkin-test-sems.sh*Created by: bartlettroscoe*
It was passing in the arguments to checkin-test-sems.sh to the soruce script
which is not what you want. This is a silly bash behavior. It should be
fixed in all use cases now.
*Created by: bartlettroscoe*
It was passing in the arguments to checkin-test-sems.sh to the soruce script
which is not what you want. This is a silly bash behavior. It should be
fixed in all use cases now.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3409Switch SEMS env default to match GCC 4.8.4 OpenMPI 1.10.1 CI build (#3407)2018-09-08T00:28:47ZJames WillenbringSwitch SEMS env default to match GCC 4.8.4 OpenMPI 1.10.1 CI build (#3407)*Created by: bartlettroscoe*
@dridzal, @mhoemmen
## Description
The default SEMS env should match the env used in the post-push CI build.
This change should have been made when the CI build was updated to use OpenMPI
1.10.1.
...*Created by: bartlettroscoe*
@dridzal, @mhoemmen
## Description
The default SEMS env should match the env used in the post-push CI build.
This change should have been made when the CI build was updated to use OpenMPI
1.10.1.
NOTE: This also updates the default CMake to 3.11.1.
This should resolve the errors reported in #3407.
## Motivation and Context
STK no longer supports OpenMPI 1.6.5 (see #3407)
## How Has This Been Tested?
I just loaded the env manually with:
```
$ . cmake/std/GCC-4.8.4-OpenMPI-1.10.1-MpiReleaseDebugSharedPtOpenMP_env.sh
$ module list
Currently Loaded Modulefiles:
1) sems-env
2) atdm-env
3) sems-python/2.7.9
4) atdm-cmake/3.11.1
5) sems-git/2.10.1
6) atdm-ninja_fortran/1.7.2
7) sems-gcc/4.8.4
8) sems-openmpi/1.10.1
9) sems-boost/1.63.0/base
10) sems-zlib/1.2.8/base
11) sems-hdf5/1.8.12/parallel
12) sems-netcdf/4.4.1/exo_parallel
13) sems-parmetis/4.0.3/parallel
14) sems-scotch/6.0.3/nopthread_64bit_parallel
15) sems-superlu/4.3/base
```
and
```
. cmake/load_sems_dev_env.sh default
$ module list
Currently Loaded Modulefiles:
1) sems-env
2) atdm-env
3) sems-python/2.7.9
4) atdm-cmake/3.11.1
5) sems-git/2.10.1
6) atdm-ninja_fortran/1.7.2
7) sems-gcc/4.8.4
8) sems-openmpi/1.10.1
9) sems-boost/1.63.0/base
10) sems-zlib/1.2.8/base
11) sems-hdf5/1.8.12/parallel
12) sems-netcdf/4.4.1/exo_parallel
13) sems-parmetis/4.0.3/parallel
14) sems-scotch/6.0.3/nopthread_64bit_parallel
15) sems-superlu/4.3/base
```
<!---
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.
-->
## Checklist
- [x] My commit messages mention the appropriate GitHub issue numbers.
- [x] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3314Tempus: Add potential full-space optimization interface.2018-08-22T14:24:29ZJames WillenbringTempus: Add potential full-space optimization interface.*Created by: etphipp*
This PR adds a transient full-space optimization interface to be
used with packages such as ROL with its DynamicConstraint interface. An
implementation of the interface is provided by BackwardEuler only
(curren...*Created by: etphipp*
This PR adds a transient full-space optimization interface to be
used with packages such as ROL with its DynamicConstraint interface. An
implementation of the interface is provided by BackwardEuler only
(currently). A test that the interface computes what one would expect
for BackwardEuler is also provided. The idea is to then implement ROL's
DynamicConstraint interface using Tempus, and then continue to develop
and refine the interface.
The interface should easy to implement for any multistep method. It is not yet clear how multistage, 1-step methods should be handled. This PR also does nothing with the objective, since Tempus has no interface for integrating responses (as far as I can tell).https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3248Piro fix for building with Clang 62018-08-08T14:42:26ZJames WillenbringPiro fix for building with Clang 6*Created by: mperego*
<!---
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: mperego*
<!---
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/piro @trilinos/rol
## Description
<!--- Please describe your changes in detail. -->
Fix for enabling compilation with Clang 6. Added template keyword in Piro::NOXSolves when calling template member function of a Teuchos::ParameterList.
Also fixed a typo in ROL::ThyraProductME_Objective constructor that was generating a warning.
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!---
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
-->
Closes issue #3157
## 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
- [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.
- [ ] 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.
<!---
## Additional Information
Anything else we need to know in evaluating this merge request?
-->
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3055Piro Thyra Sensitivities2018-07-14T22:07:54ZJames WillenbringPiro Thyra Sensitivities*Created by: mperego*
Piro: Implemet adjoint sensitivities for Piro::NoxSolver (Thyra stack). Issue #3088
The adjoint system is solved by implicitly transposing the Jacobian operator and its preconditioner operator (thanks to @bartle...*Created by: mperego*
Piro: Implemet adjoint sensitivities for Piro::NoxSolver (Thyra stack). Issue #3088
The adjoint system is solved by implicitly transposing the Jacobian operator and its preconditioner operator (thanks to @bartlettroscoe for the helping me with this).
This contains also a fix for update logic in ROL Thyra adapter, as well as a fix to allow Belos Thyra adapter to correctly select left/right preconditioner by @bartlettroscoe . https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3104Disable randomly failing ROL test in Intel PR build (#3103)2018-07-13T14:37:52ZJames WillenbringDisable randomly failing ROL test in Intel PR build (#3103)*Created by: bartlettroscoe*
@trilinos/framework, @trilinos/rol
## Description
This test randomly fails in the Intel auto PR build (see #3103) and just blocked my PR merge #3100.
## Motivation and Context
Tests should not r...*Created by: bartlettroscoe*
@trilinos/framework, @trilinos/rol
## Description
This test randomly fails in the Intel auto PR build (see #3103) and just blocked my PR merge #3100.
## Motivation and Context
Tests should not randomly fail in PR builds.
## How Has This Been Tested?
I did not. That is why here is auto PR testing :-)
## Checklist
- [x] My commit messages mention the appropriate GitHub issue numbers.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/3081Fix ROL CUDA build failure (#3072)2018-07-10T01:37:34ZJames WillenbringFix ROL CUDA build failure (#3072)*Created by: bartlettroscoe*
CC: @trilinos/rol, @dridzal (ROL package lead)
## Description
Fixes the ROL CUDA build failure described in #3072. The fix was trivial (not sure why other compilers did not catch this or at least prov...*Created by: bartlettroscoe*
CC: @trilinos/rol, @dridzal (ROL package lead)
## Description
Fixes the ROL CUDA build failure described in #3072. The fix was trivial (not sure why other compilers did not catch this or at least prove a warning).
I also included a commit to add debug print info for `nvcc_wrapper` (see kokkos/nvcc_wrapper#19 and kokkos/nvcc_wrapper#20).
## Motivation and Context
ROL was not building for a CUDA build (see #3072). We wold like an auto PR CUDA build that includes all Primary Tested packages and ROL is a PT package (see #2464). Also, SPARC uses ROL and adding support for SPARC means testing ROL on all of the platforms where SPARC uses ROL and CUDA is an important build on many of those platforms.
## How Has This Been Tested?
I tested this on 'white' with:
```
$ cd ~/Trilinos.base/BUILD/WHITE/CUDA/CUDA-DEBUG/
$ source ~/Trilinos.base/Trilinos/cmake/std/atdm/load-env.sh cuda-debug
Hostname 'white11' matches known ATDM host 'white' and system 'ride'
ATDM_CONFIG_TRILNOS_DIR = /home/rabartl/Trilinos.base/Trilinos
Setting default compiler and build options for JOB_NAME='cuda-debug'
Using white/ride compiler stack CUDA to build DEBUG code with Kokkos node type CUDA
$ time cmake \
-GNinja
-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnvAllPtPackages.cmake \
-DTrilinos_ENABLE_TESTS=ON -DTrilinos_ENABLE_ROL=ON \
~/Trilinos.base/Trilinos \
&> configure.out
real 1m43.759s
user 0m58.268s
sys 0m17.081s
$ time make NP=16 &> make.out
real 54m28.573s
user 696m12.668s
sys 80m53.877s
$ time bsub -x -Is -q rhel7F -n 16 ctest -j16 --timeout 600 &> ctest.out
real 14m51.969s
user 0m0.032s
sys 0m0.035s
```
and the build passed and the test results were:
```
90% tests passed, 16 tests failed out of 156
Subproject Time Summary:
ROL = 11219.28 sec*proc (156 tests)
Total Test time (real) = 890.82 sec
The following tests FAILED:
32 - ROL_test_elementwise_TpetraMultiVector_MPI_4 (Failed)
130 - ROL_example_PDE-OPT_0ld_poisson_example_01_MPI_4 (Failed)
131 - ROL_example_PDE-OPT_0ld_stefan-boltzmann_example_03_MPI_4 (Failed)
134 - ROL_example_PDE-OPT_0ld_adv-diff-react_example_01_MPI_4 (Failed)
135 - ROL_example_PDE-OPT_0ld_adv-diff-react_example_02_MPI_4 (Timeout)
136 - ROL_example_PDE-OPT_0ld_stoch-adv-diff_example_01_MPI_4 (Timeout)
137 - ROL_example_PDE-OPT_poisson_example_01_MPI_4 (Failed)
139 - ROL_example_PDE-OPT_stefan-boltzmann_example_01_MPI_4 (Failed)
141 - ROL_example_PDE-OPT_stefan-boltzmann_example_03_MPI_4 (Failed)
142 - ROL_example_PDE-OPT_adv-diff-react_example_02_MPI_4 (Failed)
143 - ROL_example_PDE-OPT_navier-stokes_example_01_MPI_4 (Timeout)
144 - ROL_example_PDE-OPT_navier-stokes_example_02_MPI_4 (Failed)
145 - ROL_example_PDE-OPT_obstacle_example_01_MPI_4 (Failed)
150 - ROL_example_PDE-OPT_nonlinear-elliptic_example_01_MPI_4 (Failed)
151 - ROL_example_PDE-OPT_nonlinear-elliptic_example_02_MPI_4 (Failed)
152 - ROL_example_PDE-OPT_topo-opt_poisson_example_01_MPI_4 (Failed)
Errors while running CTest
```
Those are the same 16 tests already shown failing in the build `Trilinos-atdm-white-ride-cuda-debug-pt-all-at-once` for example shown [here](https://testing-vm.sandia.gov/cdash/viewTest.php?onlyfailed&buildid=3698659). (I will create a new GitHub issue for those failing tests once this PR is merge.)
## Checklist
- [x] My commit messages mention the appropriate GitHub issue numbers.
Initial cleanup of new ATDM builds of Trilinoshttps://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/2701Rol trilinos develop as of afff363 "Adding cantilever beam tests."2018-05-09T14:55:21ZJames WillenbringRol trilinos develop as of afff363 "Adding cantilever beam tests."*Created by: bartlettroscoe*
CC: @trilinos/rol
## Description
This is a PR that merged the state of rol-trilinos/develop as of the commit:
```
afff363 "Adding cantilever beam tests."
Author: Drew P. Kouri <dpkouri@sandia.gov...*Created by: bartlettroscoe*
CC: @trilinos/rol
## Description
This is a PR that merged the state of rol-trilinos/develop as of the commit:
```
afff363 "Adding cantilever beam tests."
Author: Drew P. Kouri <dpkouri@sandia.gov>
Date: Mon May 7 12:53:50 2018 -0600 (31 hours ago)
M packages/rol/test/step/CMakeLists.txt
A packages/rol/test/step/test_16.cpp
A packages/rol/test/step/test_17.cpp
```
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/2659ROL Trilinos Sync2018-05-01T21:35:01ZJames WillenbringROL Trilinos Sync*Created by: dridzal*
@trilinos/rol
## Description
Regular merge between the ROL-Trilinos repo and the main Trilinos repo, via a Trilinos fork.
## How Has This Been Tested?
Trilinos check-in tests, performed in ROL-Trilinos and...*Created by: dridzal*
@trilinos/rol
## Description
Regular merge between the ROL-Trilinos repo and the main Trilinos repo, via a Trilinos fork.
## How Has This Been Tested?
Trilinos check-in tests, performed in ROL-Trilinos and in the Trilinos fork.
https://gitlab.osti.gov/jmwille/Trilinos/-/merge_requests/356ROL: Fixed examples that failed to build2016-05-20T16:16:10ZJames WillenbringROL: Fixed examples that failed to build*Created by: amklinv*
These examples were broken by a recent commit to Tpetra that added
a MatrixMarket reader for graphs. The Tpetra MatrixMarket readers
and writers are all templated on the matrix type (even the vector
readers and wr...*Created by: amklinv*
These examples were broken by a recent commit to Tpetra that added
a MatrixMarket reader for graphs. The Tpetra MatrixMarket readers
and writers are all templated on the matrix type (even the vector
readers and writers), and the ROL examples were templating them
on the vector type.