|
|
@@ -33,6 +33,9 @@ pub struct Args {
|
|
|
pub parallel: Option<u32>,
|
|
|
/// Skip the scenario phase (tool `--perf-only`).
|
|
|
pub perf_only: bool,
|
|
|
+ /// Skip the context-depth suite (16K..256K) — run only the main pass
|
|
|
+ /// (scenarios + the typical-depth perf rows).
|
|
|
+ pub no_depth: bool,
|
|
|
/// Local tokenizer source for llama-benchy (tool `--tokenizer`): a
|
|
|
/// tokenizer.json or a dir holding one. Needed when the served model
|
|
|
/// id is not resolvable in the local HF cache (custom export lanes).
|
|
|
@@ -295,24 +298,29 @@ pub async fn run(config: &Config, a: &Args, dry_run: bool) -> Result<()> {
|
|
|
// Phase 2 — context-depth suite (16K..256K @ c2, 2 repeats): appended
|
|
|
// to the same log so `parse_perf_rows` picks its rows up too. A depth
|
|
|
// failure must not cost the finished quality run — warn, keep going.
|
|
|
- eprintln!(
|
|
|
- "bench: depth suite: {} @ c{}, {} repeats{}",
|
|
|
- crate::bench_depth::DEPTHS,
|
|
|
- crate::bench_depth::CONCURRENCY,
|
|
|
- crate::bench_depth::RUNS,
|
|
|
- if a.tokenizer.is_some() {
|
|
|
- " (+tokenizer)"
|
|
|
- } else {
|
|
|
- ""
|
|
|
- }
|
|
|
- );
|
|
|
- fs::create_dir_all(&depth_scratch)?;
|
|
|
- let dcode = run_tool(&bin, &depth_args, &depth_scratch, &log_path, true, ssh_host)?;
|
|
|
- if dcode != 0 {
|
|
|
+ // `--no-depth` skips the whole phase (quick-grasp campaigns).
|
|
|
+ if !a.no_depth {
|
|
|
eprintln!(
|
|
|
- "bench: WARNING depth suite exited with {dcode} — main report unaffected ({})",
|
|
|
- log_path.display()
|
|
|
+ "bench: depth suite: {} @ c{}, {} repeats{}",
|
|
|
+ crate::bench_depth::DEPTHS,
|
|
|
+ crate::bench_depth::CONCURRENCY,
|
|
|
+ crate::bench_depth::RUNS,
|
|
|
+ if a.tokenizer.is_some() {
|
|
|
+ " (+tokenizer)"
|
|
|
+ } else {
|
|
|
+ ""
|
|
|
+ }
|
|
|
);
|
|
|
+ fs::create_dir_all(&depth_scratch)?;
|
|
|
+ let dcode = run_tool(&bin, &depth_args, &depth_scratch, &log_path, true, ssh_host)?;
|
|
|
+ if dcode != 0 {
|
|
|
+ eprintln!(
|
|
|
+ "bench: WARNING depth suite exited with {dcode} — main report unaffected ({})",
|
|
|
+ log_path.display()
|
|
|
+ );
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ eprintln!("bench: depth suite skipped (--no-depth)");
|
|
|
}
|
|
|
|
|
|
// Remote host: download the json + the md from the remote scratch dir so
|