-
Notifications
You must be signed in to change notification settings - Fork 76
Smartly Apply Constraints During Cartesian Product #773
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
Open
Scienfitz
wants to merge
19
commits into
main
Choose a base branch
from
feature/smart_cartesian_product_constraints
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
b1d4589
Add UnsupportedEarlyFilteringError exception
Scienfitz 0312a0b
Add incremental filtering interface to DiscreteConstraint
Scienfitz 55bdf24
Add incremental filtering to discrete constraint implementations
Scienfitz aec6686
Add searchspace utility functions
Scienfitz a7b8594
Rework from_product and from_simplex to use constrained Cartesian pro…
Scienfitz 5123372
Update test imports for moved utility functions
Scienfitz 6006ac4
Add tests for constrained Cartesian product
Scienfitz beb23a1
Update CHANGELOG
Scienfitz 05f92fd
Simplify logic
Scienfitz 2bf0f55
Make has_polars_implementation a classproperty
Scienfitz 232d4d0
Rename _required_filtering_parameters to _required_parameters
Scienfitz 8973d3f
Add breaking changes entry for moved utility functions
Scienfitz 2c634b5
Improve UnsupportedEarlyFilteringError messages to reference the data…
Scienfitz 05fe304
Add allow_missing flag to get_invalid and remove UnsupportedEarlyFilt…
Scienfitz c1c53f3
Avoid FutureWarning in PermutationInvarianceConstraint concat
Scienfitz 3360cd5
Lift _required_parameters to Constraint base and use it in validation
Scienfitz 5e5d731
Use warning instead of error
Scienfitz c4008d9
Remove dead Polars constraint fallback code
Scienfitz 8f2e521
Rename compute_parameter_order to optimize_parameter_order
Scienfitz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -13,8 +13,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||||||||||||
| - `identify_non_dominated_configurations` method to `Campaign` and `Objective` | ||||||||||||||
| for determining the Pareto front | ||||||||||||||
| - Interpoint constraints for continuous search spaces | ||||||||||||||
| - `has_polars_implementation` property on `DiscreteConstraint` | ||||||||||||||
| - `allow_missing` flag on `DiscreteConstraint.get_invalid` and `get_valid` | ||||||||||||||
|
|
||||||||||||||
| ### Changed | ||||||||||||||
| - Discrete search space construction now applies constraints incrementally during | ||||||||||||||
| Cartesian product building, significantly reducing memory usage and construction | ||||||||||||||
| time for constrained spaces | ||||||||||||||
| - Polars path in discrete search space construction now builds the Cartesian product | ||||||||||||||
| only for parameters involved in Polars-capable constraints, merging the rest | ||||||||||||||
| incrementally via pandas | ||||||||||||||
|
Comment on lines
+23
to
+25
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. that would be quite inconsistent with the existing CHANGELOG fyi |
||||||||||||||
|
|
||||||||||||||
| ### Breaking Changes | ||||||||||||||
| - `parameter_cartesian_prod_pandas` and `parameter_cartesian_prod_polars` moved | ||||||||||||||
| from `baybe.searchspace.discrete` to `baybe.searchspace.utils` | ||||||||||||||
| - `ContinuousLinearConstraint.to_botorch` now returns a collection of constraint tuples | ||||||||||||||
| instead of a single tuple (needed for interpoint constraints) | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.