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

Apply Trilinos changes to accept updated TriBITS (TriBITSPub/TriBITS#299) #10504

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented May 6, 2022

This applies the only change to Trilinos needed to accept the updated version of TriBITS. This is the only commit from PR #9978 needed to allow building Trilinos with updated versions of TriBITS 'master'.

Currently, this is a one-line change due to pulling in non-TriBITS targets through add_subdirectory().

I am creating this PR because we can't merge PR #9978 due to a break in backward compatibility with the move to modern CMake (see here). This will allow building Trilinos 'develop' against external TriBITS versions by just setting Trilinos_TRIBITS_DIR at configure time. That is critical for testing updated versions of TriBITS.

…riBITS#299)

The updated version of TriBITS using modern CMake for TriBITSPub/TriBITS#299
creates a ${PACKAGE_NAME}_all_libs library target (used to create an ALIAS
${PACKAGE_NAME}::all_libs library target) from all of the targets under a
package's base CMakeLists.txt file that don't have the TRIBITS_TESTONLY_LIB
property set to TRUE.  The tribits_add_library( ... TESTONLY ... ) function
call automatically sets this property but if a package uses raw CMake to
create targets (like Sacado is doing here with GoogleTest), then one must set
the TRIBITS_TESTONLY_LIB property or one must create the
${PACKAGE_NAME}_all_libs and ${PACKAGE_NAME}::all_libs targets manually.
Small price to pay on the path to making TriBITS more flexible and allowing
raw CMake target formation.
@bartlettroscoe bartlettroscoe added type: enhancement Issue is an enhancement, not a bug pkg: Stokhos labels May 6, 2022
@bartlettroscoe bartlettroscoe self-assigned this May 6, 2022
@bartlettroscoe
Copy link
Member Author

@keitat, @ibaned, or @etphipp,

Can one of you please approve this PR so it can be merged? Merging this will greatly simplify the process of testing updated versions of TriBITS 'master' with updated versions of Trilinos 'develop'. (I have a bunch of testing to do since I am about done with TriBITSPub/TriBITS#299 and I want try to catch issues before the updated TriBITS 'master' gets merged to Trilinos 'develop'.)

@bartlettroscoe bartlettroscoe added the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label May 6, 2022
@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_8.3.0

  • Build Num: 7577
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 5073
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 5591
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 12600
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 5279
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: python-3

  • Build Num: 1840
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: _cuda_10.1.243

  • Build Num: 948
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: tribits-299-trilinos-changes
  • SHA: 40e6dfa
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

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

  • Build Num: 7577
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 5073
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 5591
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 12600
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 5279
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: python-3

  • Build Num: 1840
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4

Build Information

Test Name: _cuda_10.1.243

  • Build Num: 948
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
FORCE_CLEAN true
PR_LABELS type: enhancement;pkg: Stokhos;AT: AUTOMERGE
PULLREQUESTNUM 10504
PULLREQUEST_CDASH_TRACK Pull Request
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH tribits-299-trilinos-changes
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 40e6dfa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 00f1cf4


CDash Test Results for PR# 10504.

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

1 similar comment
@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

@trilinos-autotester trilinos-autotester merged commit 7188706 into trilinos:develop May 9, 2022
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 10504: IS A SUCCESS - Pull Request successfully merged

Trilinos TriBITS Refactor automation moved this from In Progress to Done May 9, 2022
@trilinos-autotester trilinos-autotester removed the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label May 9, 2022
@bartlettroscoe
Copy link
Member Author

Thanks @etphipp!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pkg: Stokhos type: enhancement Issue is an enhancement, not a bug
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants