Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROL Trilinos Sync 18-May-2018 #2784

Merged
merged 64 commits into from
May 20, 2018
Merged

Conversation

dridzal
Copy link
Contributor

@dridzal dridzal commented May 18, 2018

@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.

chrisrichardson and others added 30 commits May 7, 2018 13:42
…eDifference now only approximates derivatives of scalar- and vector-valued functions using the finite difference approximation. ValidateFunction calls FiniteDifference for check_derivative. ValidateFunction also implements check_symmetry, check_adjoint_consistency, and check_inverse. Aliases for scalar, vector, and directional derivative functions moved to ROL::FunctionBindings. Added fix_direction and fix_position methods for partial specification of function arguments.
…d potential conflict with Boost. Activated test for FiniteDifference/ValidateFunction
gregvw and others added 12 commits May 15, 2018 17:38
…FOR_EXCEPTION,

  which has the following CMake configuration choices:

  - ROL_stacktrace:STRING="Teuchos::stacktrace"    (default)

    Which replaces the macro TEUCHOS_TEST_FOR_EXCEPTION

  - ROL_stacktrace:STRING="boost::stacktrace" ( untested - stub implemented )

  - ROL_stacktrace:STRING="backward-cpp"

    Which calls uses the stacktrace provided by the header backward.hpp. See
    the repository: https://github.com/bombela/backward-cpp

  - ROL_stacktrace:STRING="noop"

    Which is the no-operation implementation that simply throws the exception
    if the first argument evaluates to true. Intended for RELEASE builds.

- Replaced calls to TEUCHOS_TEST_FOR_EXCEPTION to ROL_TEST_FOR_EXCEPTION
  throughout the package.
…apters/teuchos/src. Corresponding tests moved as well. CMakeLists for Tpetra adapter and various Teuchos::Comm dependent examples updated to include headers from their new locations. PinT components not yet moved
…twise::EReductionType and ROL::Elementwise::REDUCE_XYZ
…ROL_ParameterList. Moved src/vector/ROL_MultiVector.hpp to adapters/teuchos/src/vector due to dependence on Teuchos::SerialDenseMatrix
…now only copies from rol/src, excluding src/zoo/testproblems
@dridzal dridzal self-assigned this May 18, 2018
@dridzal dridzal requested review from gregvw and dpkouri May 18, 2018 23:29
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 699
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2784
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH rol-trilinos-sync
TRILINOS_SOURCE_REPO https://github.com/dridzal/Trilinos
TRILINOS_SOURCE_SHA 5929c82
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 75b13d9

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 416
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2784
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH rol-trilinos-sync
TRILINOS_SOURCE_REPO https://github.com/dridzal/Trilinos
TRILINOS_SOURCE_SHA 5929c82
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 75b13d9

Using Repos:

Repo: TRILINOS (dridzal/Trilinos)
  • Branch: rol-trilinos-sync
  • SHA: 5929c82
  • Mode: TEST_REPO

Pull Request Author: dridzal

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 699
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2784
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH rol-trilinos-sync
TRILINOS_SOURCE_REPO https://github.com/dridzal/Trilinos
TRILINOS_SOURCE_SHA 5929c82
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 75b13d9

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 416
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2784
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH rol-trilinos-sync
TRILINOS_SOURCE_REPO https://github.com/dridzal/Trilinos
TRILINOS_SOURCE_SHA 5929c82
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 75b13d9


CDash Test Results for PR# 2784.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

Copy link
Member

@bartlettroscoe bartlettroscoe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fetched this branch locally and ran:

$  git diff --dirstat=0 dridzal/rol-trilinos-sync \
  `git merge-base  dridzal/rol-trilinos-sync github/develop`

and I verified that all 538 files changes were isolated to the package/rol/ directory.

Therefore, I will assume that ROL developers reviewed all of those changes and therefore I approve.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ bartlettroscoe ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - Master Automerge is disabled (in .cfg file)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants