Add support for subpackage-specific compiler flags (#10111) #10219
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Origin repo remote tracking branch: 'rab-github/tril-10111-subpackage-lang-flags-patch' Origin repo remote repo URL: 'rab-github = [email protected]:bartlettroscoe/TriBITS.git' At commit: commit e5745de8db66bab43b1f43af8d3429a8a77e3ff9 Author: Roscoe A. Bartlett <[email protected]> Date: Fri Feb 18 13:17:08 2022 -0700 Summary: Add support for subpackage-specific compiler options (trilinos#442)
…1-subpackage-lang-flags (trilinos#10111)
bartlettroscoe
added
type: enhancement
bartlettroscoe
added
the
AT: AUTOMERGE
This was referenced Feb 20, 2022
|
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: python-3
Jenkins Parameters
Build InformationTest Name: _cuda_10.1.243
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: python-3
Jenkins Parameters
Build InformationTest Name: _cuda_10.1.243
Jenkins Parameters
|
|
Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
|
@bartlettroscoe I am re-compiling Trilinos now to try this. This week, I am a bit short of time, but I will try to give feedback as soon as possible. |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
1 similar comment
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
searhein
approved these changes
Feb 24, 2022
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ searhein ]! |
|
Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged |
|
Merge on Pull Request# 10219: IS A SUCCESS - Pull Request successfully merged |
trilinos-autotester
removed
the
AT: AUTOMERGE
@searhein, just curious, but what warnings? What compiler options did you set? Does the documentation at:
make sense? (No one has reviewed this other than myself.) |
|
@bartlettroscoe Sorry for taking a bit longer to respond. For us, the teaching has started again, such that I have considerably less time to work on the coding at the moment. I had some issues with implicit type conversions on a machine. So, I wanted to add "-Wconversion" for FROSch, in order to fix any issues in that direction. The documentation is clear to me. Thank you! |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #10111
This brings in just the commit TriBITSPub/TriBITS@8ddc37c from PR TriBITSPub/TriBITS#453:
I could not sync all of TriBITS due to outstanding Trilinos PR #9978 (see TriBITSPub/TriBITS#433). This make the Git work more tricky.
The git gymnastics to cherry-pick and snapshot just the commit TriBITSPub/TriBITS@8ddc37c were a bit involved but I will explain it in detail below. (I need to document this workflow in a technical document about how to patch a snapshot with just cherry-picked commits from the other repo being snapshotted in.)
Git operations to snapshot just the cherry-picked commit from TriBITS (click to expand)
.
In order to allow Git to do all the work to adjust for the different base versions of TriBITS, you have to:
Find the version of TriBITS in the most recent snapshot of TriBITS into Trilinos 'develop' (in this case, it was Trilinos commit 5ab3736)
Get the version of TriBITS from that most recent snapshot (in this case, it was commit TriBITSPub/TriBITS@1241168)
Create a temp branch 'tril-10111-subpackage-lang-flags-patch' in the TriBITS repo off that TriBITS version TriBITSPub/TriBITS@1241168
Cherry-pick the TriBITS commit TriBITSPub/TriBITS@8ddc37c from TriBITS PR Add support for subpackage-specific compiler flags (#442) TriBITSPub/TriBITS#453 onto the TriBITS repo branch 'tril-10111-subpackage-lang-flags-patch'.
Push the new TriBITS branch 'tril-10111-subpackage-lang-flags-patch' to a remote repo.
Back in the Trilinos repo, create a temp branch '10111-subpackage-lang-flags-tribits-snapshot' off of the most recent Trilinos TriBITS snapshot commit 5ab3736
Snapshot the TriBITS version on TriBITS branch 'tril-10111-subpackage-lang-flags-patch' into the temp Trilinos branch '10111-subpackage-lang-flags-tribits-snapshot'.
Create a new Trilinos branch '10111-subpackage-lang-flags' off of Trilinos 'develop'
Merge the temp Trilinos branch '10111-subpackage-lang-flags-tribits-snapshot' into the branch '10111-subpackage-lang-flags'.
Push the branch '10111-subpackage-lang-flags' to a remote.
Create this PR from the branch '10111-subpackage-lang-flags'
Yes, that is a lot of git commands but the magic of this is that the patch from a future version of TriBITS from PR TriBITSPub/TriBITS#453 is adjusted back to the older version of TriBITS currently in Trilinos 'develop' and then merged back into Trilinos 'develop' cleanly. And the version info is sustained the whole time.