Adds '--compare-solvers' option #882
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
dcookspi
added
SPI-0.39
SPI AOI
dcookspi
force-pushed
the
adds-compare-solvers
branch
from
ef24e06
to
08e87e1
Compare
rydrman
reviewed
Nov 28, 2023
crates/spk-solve/src/io.rs
Outdated
Comment on lines
964
to
1033
| let mut lines = Vec::new(); | ||
| let mut max_width = 0; | ||
| for (solver_kind, duration, solver, result) in solver_results.iter() { | ||
| let solved = if result.is_ok() { "solved" } else { "failed" }; | ||
| let seconds = duration.as_secs_f64(); | ||
| let total_builds = solver.get_total_builds(); | ||
| let num_steps = solver.get_number_of_steps(); | ||
| let num_steps_back = solver.get_number_of_steps_back(); | ||
|
|
||
| let kind = format!("{solver_kind}"); | ||
| let length = kind.len(); | ||
| max_width = max(max_width, length); | ||
|
|
||
| lines.push(( | ||
| kind, | ||
| solved, | ||
| seconds, | ||
| num_steps, | ||
| num_steps_back, | ||
| total_builds, | ||
| )); | ||
| } | ||
|
|
||
| for (solver_kind, solved, seconds, num_steps, num_steps_back, total_builds) in | ||
| lines.into_iter() | ||
| { | ||
| let padding = " ".repeat(max_width - solver_kind.len()); | ||
| let builds = "build".pluralize(total_builds); | ||
| let steps = "step".pluralize(num_steps); | ||
|
|
||
| println!("{solver_kind}{padding}: {solved} in {seconds:.6} seconds, {num_steps} {steps} ({num_steps_back} back), {total_builds} {builds} at {:.3} builds/sec", total_builds as f64 / seconds); | ||
| } | ||
|
|
||
| // Give the first result to finish back to the rest of the | ||
| // program as the result. | ||
| match solver_results.first() { | ||
| Some((_, _, _, result)) => match result { | ||
| Ok(s) => Ok(s.clone()), | ||
| Err(e) => Err(Error::String(format!("{e}"))), | ||
| }, | ||
| None => Err(Error::String( | ||
| "Multi-solver task failed to run any tasks for comparsion.".to_string(), | ||
| )), | ||
| } |
There was a problem hiding this comment.
Can this be captured in a separate function easily, I think it would go a long way to clarifying and keeping the the complexity of this outer function down as much as possible
There was a problem hiding this comment.
I've pulled this out into a method, and added a struct for the solver result data.
…compare the work they did. Signed-off-by: David Gilligan-Cook <dcook@imageworks.com>
Signed-off-by: David Gilligan-Cook <dcook@imageworks.com>
dcookspi
force-pushed
the
adds-compare-solvers
branch
from
08e87e1
to
f1a11d6
Compare
rydrman
approved these changes
Dec 18, 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 adds the
--compare-solversoption that will run all the solvers to completion and produce a short report comparing the work they did. The report is fairly basic at the moment, but it is useful when comparing solvers with different settings or tweaks. The first solver to finish is used as 'the result' to return the rest of the program.In cases where one solver might run for a long time before finishing, the existing
--timeout <seconds>option can be used to limit the solvers run time.Examples: