Skip to content

Add support for a CDCL-type SAT solver using the Resolvo crate #1179

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.

Sign up for GitHub

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

Merged
merged 64 commits into from
May 28, 2025
Merged

Add support for a CDCL-type SAT solver using the Resolvo crate #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4c69029
Preliminary work to adopt Resolvo as the solver
jrray Jan 30, 2025
e04c7e9
Implement candidate sorting
jrray Jan 31, 2025
032b549
Implement candidate filtering by version number
jrray Jan 31, 2025
d64c8b5
Add basic unsat test
jrray Feb 1, 2025
e4466b7
Implement simple dependency handling
jrray Feb 1, 2025
57578b0
Handle var dependencies
jrray Feb 1, 2025
baeeee4
Fill in missing interner functions
jrray Feb 1, 2025
ba7dc3d
Better solver errors
jrray Feb 1, 2025
1c4e02e
Change the solvable to the component level
jrray Feb 2, 2025
8f2da39
Crudely support global vars
jrray Feb 1, 2025
536013d
Trim down the debug output for SolvedRequest
jrray Feb 3, 2025
1e8f85f
Exclude source packages from solves
jrray Feb 3, 2025
d233bc9
Create an abstraction interface for solvers
jrray Feb 3, 2025
668878a
Finish integrating cdcl solver into existing solver tests
jrray Feb 6, 2025
60e5462
Handle dependency inclusion policy
jrray Feb 6, 2025
5274994
Support global var options
jrray Feb 6, 2025
af16e85
Populate Solution options
jrray Feb 6, 2025
5747f7d
Implement requests for source builds
jrray Feb 7, 2025
53a0ca9
Pass the "All" component test
jrray Feb 7, 2025
9027e5d
This other component test passes reliably now
jrray Feb 7, 2025
b946576
Implement tracking component "uses" as dependencies
jrray Feb 7, 2025
10b175f
Implement tracking component requirements as dependencies
jrray Feb 7, 2025
2479b76
Start to implement handling embedded packages
jrray Feb 7, 2025
9f7c087
More passing embedded package tests
jrray Feb 8, 2025
9631f88
Another embedded package test passing
jrray Feb 8, 2025
2e6f4d3
More work on solving embedded packages
jrray Feb 8, 2025
5ac278c
Another test that passes after adjusting expected build
jrray Feb 8, 2025
e575f31
Handle requirements of components in embedded packages
jrray Feb 8, 2025
6ef3931
Handle package embedding multiple versions of the same package
jrray Feb 8, 2025
0379c8a
Handle basic build from source cases
jrray Feb 8, 2025
54588a8
Explicitly enable build from source in tests
jrray Feb 9, 2025
ef5f867
Don't build from source from deprecated recipes
jrray Feb 9, 2025
e3f56ce
Enable "impossible checks" tests for new solver
jrray Feb 9, 2025
952b26a
Use Variantly to auto-generate these methods
jrray Feb 9, 2025
62cb045
Rework flags test for the Solver trait (pt. 1)
jrray Feb 22, 2025
3363227
Work towards using resolvo for spk commands
jrray Feb 9, 2025
1413825
Use new solver in more places
jrray Feb 9, 2025
7568cbe
Refactor type used for resolvo package names
jrray Feb 9, 2025
7e35be3
Add a crude solve result output to cmd_explain
jrray Feb 10, 2025
cfd6135
Fix requests for :all not filtering invalid versions
jrray Feb 10, 2025
855ada4
Implement update_options in new solver
jrray Feb 11, 2025
9362c6a
Update known var values when processing var requirements
jrray Feb 11, 2025
c2152b1
Wire up the normal solution output in cmd_explain
jrray Feb 11, 2025
98ad404
Improve sorting to avoid embedded packages
jrray Feb 11, 2025
a5c558a
Avoid reading packages where possible
jrray Feb 11, 2025
99f93dc
Add feedback for solver retries
jrray Feb 11, 2025
124319c
Add a replacement for running solve through formatter
jrray Feb 11, 2025
0f8b663
Also add run_and_log_resolve to the Solver trait
jrray Feb 11, 2025
f2c6c2d
Rework how BinaryPackageBuilder invokes the solver
jrray Feb 11, 2025
8adfb26
Add solver arg to `spk test`
jrray Feb 12, 2025
eae5253
Change these calls to mimic the one in install.rs
jrray Feb 12, 2025
68a685f
Add `flags::DecisionFormatterSettings` to `flags::Solver`
jrray Feb 12, 2025
8a8ef8d
Make it possible to choose resolvo with --solver-to-run
jrray Feb 12, 2025
018408f
Remove unnecessary clone
jrray Feb 13, 2025
28b1d0d
Refactor some build key logic from SortedBuildIterator
jrray Feb 13, 2025
0bdcfdf
Do a reverse sort using std::cmp::Reverse
jrray Feb 13, 2025
cd1834e
Rework build sorting in the new solver
jrray Feb 13, 2025
a578048
Don't inject credentials for resolvo repo
jrray Feb 19, 2025
b124cf3
Convenience conversion from EmbeddedBuildSource to BuildIdent
jrray Feb 19, 2025
cf5e258
Convert embedded packages properly from resolvo solve
jrray Feb 19, 2025
b4f5690
Resolvo: fix stubs getting added to solve without parent
jrray Feb 21, 2025
1cb58b8
Expand test coverage for resolvo solver
jrray Feb 22, 2025
36647bc
Fix resolvo solver with migration-to-components
jrray Mar 5, 2025
cfba38f
Add configure_for_build_environment to the Solver trait
jrray Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .site/spi/.spdev/overrides.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def inject_credentials(super_script_list: spdev.shell.Script) -> spdev.shell.Scr
"1",
"sed",
"-i",
'"s|https://github.com|https://$GITHUB_SPFS_PULL_USERNAME:[email protected]|"',
'"s|https://github.com/spkenv|https://$GITHUB_SPFS_PULL_USERNAME:[email protected]/spkenv|"',
)
)

Expand Down
Loading
Loading