Cadical with preprocessor and local search #8502
Merged
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
kroening
force-pushed
the
cadical-preprocessor
branch
2 times, most recently
from
f256138 to
752b463
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #8502 +/- ##
===========================================
- Coverage 78.76% 78.71% -0.05%
===========================================
Files 1728 1728
Lines 198925 199044 +119
Branches 18326 18299 -27
===========================================
Hits 156686 156686
- Misses 42239 42358 +119 ☔ View full report in Codecov by Sentry. |
kroening
force-pushed
the
cadical-preprocessor
branch
from
752b463 to
e1ecc42
Compare
This adds the option to enable Cadical's preprocessor and local search. The default remains unchanged. The choice of preprocessor=1 and localsearch=0 for satcheck_cadical_preprocessingt is motivated by the following data on the HWMCC 2008 benchmarks: 0, 0: ./hwmcc08.sh 114.78s 1, 0: ./hwmcc08.sh 107.44s 2, 0: ./hwmcc08.sh 117.63s 5, 0: ./hwmcc08.sh 129.10s 1, 1: ./hwmcc08.sh 113.50s 5, 5: ./hwmcc08.sh 154.71s
kroening
force-pushed
the
cadical-preprocessor
branch
from
e1ecc42 to
8a7d0fa
Compare
kroening
requested review from
martin-cs,
tautschnig and
peterschrammel
as code owners
| @@ -137,8 +137,8 @@ typedef satcheck_glucose_no_simplifiert satcheck_no_simplifiert; | |||
|
|
|||
| #elif defined SATCHECK_CADICAL | |||
|
|
|||
| typedef satcheck_cadicalt satcheckt; | |||
| typedef satcheck_cadicalt satcheck_no_simplifiert; | |||
| typedef satcheck_cadical_no_preprocessingt satcheckt; | |||
There was a problem hiding this comment.
Suggested change
| typedef satcheck_cadical_no_preprocessingt satcheckt; | |
| typedef satcheck_cadical_preprocessingt satcheckt; |
❓
There was a problem hiding this comment.
I'd like to see broader benchmarking data before doing this.
| @@ -297,7 +297,8 @@ get_sat_solver(message_handlert &message_handler, const optionst &options) | |||
| else if(solver_option == "cadical") | |||
| { | |||
| #if defined SATCHECK_CADICAL | |||
| return make_satcheck_prop<satcheck_cadicalt>(message_handler, options); | |||
| return make_satcheck_prop<satcheck_cadical_no_preprocessingt>( | |||
There was a problem hiding this comment.
❓ Does this need to honour the no_simplifier flag as for the other solvers above?
There was a problem hiding this comment.
Once the preprocessing becomes default, it should.
tautschnig
approved these changes
Nov 28, 2024
Comment on lines
+41
to
44
| std::string satcheck_cadical_baset::solver_text() const | ||
| { | ||
| return std::string("CaDiCaL ") + solver->version(); | ||
| } |
There was a problem hiding this comment.
Shouldn't we override that method to make clear in the output that the solver is used in a non-default configuration?
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 adds the option to enable Cadical's preprocessor and local search. The default remains unchanged.
The choice of
preprocessor=1andlocalsearch=0forsatcheck_cadical_preprocessingtis motivated by the following data on the HWMCC 2008 benchmarks:0, 0: ./hwmcc08.sh 114.78s
1, 0: ./hwmcc08.sh 107.44s
2, 0: ./hwmcc08.sh 117.63s
5, 0: ./hwmcc08.sh 129.10s
1, 1: ./hwmcc08.sh 113.50s
5, 5: ./hwmcc08.sh 154.71s