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

Stratimikos: fix CMake for Amesos2 disabled #1973

Merged
merged 1 commit into from
Nov 9, 2017

Conversation

ibaned
Copy link
Contributor

@ibaned ibaned commented Nov 8, 2017

@trilinos/stratimikos

Description

Try to fix a use case brought up by @hkthorn
in respose to #1090

Motivation and Context

@hkthorn has a build where configure fails in this file.

How Has This Been Tested?

Not tested by me yet, I intend to use the checkin script.
@hkthorn could test her case if possible.

Checklist

  • 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 for this project.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • No new compiler warnings were introduced.
  • These changes break backwards compatibility.

Try to fix a use case brought up by @hkthorn
in respose to trilinos#1090
@ibaned ibaned self-assigned this Nov 8, 2017
@ibaned ibaned added the stage: in progress Work on the issue has started label Nov 8, 2017
@bartlettroscoe
Copy link
Member

@ibaned, the branch stratimikos-amesos2 has already been rebased and merged. Therefore, another branch should be created for this.

@ibaned
Copy link
Contributor Author

ibaned commented Nov 8, 2017

@bartlettroscoe what is the downside of doing two pull requests with the same branch name?

@bartlettroscoe
Copy link
Member

@bartlettroscoe what is the downside of doing two pull requests with the same branch name?

To be 100% clear, that branch should be created off of 'develop' and then I guess there is no harm. But my opinion is that a branch called something like stratimikos-amesos2-fix1 might be better.

@ibaned
Copy link
Contributor Author

ibaned commented Nov 8, 2017

this branch was recreated off of develop, so its only the same name but not the same history as the last one. unfortunately I don't see a way to change the source branch without creating a whole new PR, but I'll try to give them different names in the future.

@ibaned ibaned merged commit f9fcf1c into trilinos:develop Nov 9, 2017
ibaned added a commit that referenced this pull request Nov 9, 2017
@ibaned ibaned removed the stage: in progress Work on the issue has started label Nov 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants