fixed both ryser algs, added tests, updated tuning #24
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
msricher
requested changes
Nov 24, 2024
| return n ^ (n >> 1); | ||
| } | ||
|
|
||
| inline int count_bits (int n) { |
There was a problem hiding this comment.
Use std::popcount from <bits>.
| rowsum += ptr[m * i + j]; | ||
| (void)n; | ||
|
|
||
| size_t i, j, k; |
There was a problem hiding this comment.
Initialize variables at the deepest scope possible. Like in the for loops, for (size_t i = 0; .....). Check this generally. I cleaned it up most other places.
| /* Update product of row sums. */ | ||
|
|
||
| rowsumprod *= rowsum; | ||
| out += rowsumprod * (1 - ((__builtin_popcountll(k) & 1) << 1)); |
There was a problem hiding this comment.
Use std::popcount here too. It's new in C++20, which we're using... it's best to avoid these compiler extensions if possible.
| @@ -38,6 +38,9 @@ test = ["pytest"] | |||
| [tool.scikit-build] | |||
| wheel.expand-macos-universal-tags = true | |||
|
|
|||
| [tool.scikit-build] | |||
| cmake.args = ["-DPERMANENT_TUNE=ON"] | |||
There was a problem hiding this comment.
Set this to OFF by default.
|
I have made theses changes, will make another pull request |
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.
Fixed the square Ryser algorithm, updated the rectangle Ryser algorithm, added code for second svm to update the tuning function to get out 8 parameters instead of the original 4, added cmake fix to pyproject.toml, added more pytests