Build changes for COIN #1614
Merged
Build changes for COIN #1614
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
|
Hmm I didn't quite think this through. This PR has the appropriate build changes but without the appropriate source code changes in #1613 it will fail the cbc unit tests (it doesn't skip them anymore since |
bennibbelink
commented
Nov 8, 2023
tests/prog_translator_tests.cc
Outdated
| @@ -243,7 +243,7 @@ TEST(ProgTranslatorTests, translation) { | |||
| EXPECT_NO_THROW(SolveProg(iface)); | |||
| const double* soln = iface->getColSolution(); | |||
| const double* check = checkface.getColSolution(); | |||
| array_double_eq(soln, check, narcs + nfaux, "soln"); | |||
| array_double_near(soln, check, narcs + nfaux, 0.00000000001, "soln"); | |||
There was a problem hiding this comment.
This margin was chosen arbitrarily
There was a problem hiding this comment.
I think there is a cyclus definition of "small" somewhere - maybe eps? Not sure if/how it's available in testing
There was a problem hiding this comment.
Had to include cyc_limits.h, now we pass in cy_eps as the margin
gonuke
reviewed
Nov 9, 2023
CHANGELOG.rst
Outdated
| @@ -37,6 +37,7 @@ Since last release | |||
| * fix sell_policy that was offering bids when capacity was inbetween 0 and the | |||
| quantize, bids that one was not able to fullfill and caused cyclus to crash. (#1552) | |||
| * Deprecation warnings involving <boost/detail/sp_typeinfo.hpp> (#1611) | |||
| * Segmentation faults when calling Cbc (#1614) | |||
There was a problem hiding this comment.
Suggested change
| * Segmentation faults when calling Cbc (#1614) | |
| * Resolves segmentation faults when calling Cbc (#1614) |
There was a problem hiding this comment.
Addressed this, as well as the previous fix in CHANGELOG.rst that was similarly worded
gonuke
approved these changes
Nov 9, 2023
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.
This makes appropriate build changes in #1613 from the upstream repo to follow our CI best practices