Let the merge example fill, wait for engines and dump the filler's input; add a fill example that re-runs it stage by stage

A fill that went wrong took a seven-minute merge to look at again. Now
DR_FILL_DUMP=dir makes the merge write what the filler was given, and
the fill example runs fill_border on that, or a crop of it, on the engine
and writes coarse, each band and the feathered result as PPMs — seconds
per attempt on TensorRT. Both examples take DARKROOM_ORT_DIR as the app
does, and --wait-engines lets a compiling rung finish before timing.
This commit is contained in:
2026-09-19 20:41:22 +02:00
parent e43ae10439
commit 8baa46ff49
2 changed files with 249 additions and 7 deletions
+66 -7
View File
@@ -2,7 +2,7 @@
//!
//! ```sh
//! cargo run -p dr-ui --example merge --release -- fixtures/pano/2025-08-05/*.CR2
//! cargo run -p dr-ui --example merge --release -- --out /var/tmp frame1.CR2 …
//! cargo run -p dr-ui --example merge --release -- --out /var/tmp --fill frame1.CR2 …
//! ```
//!
//! The job the interface runs (`dr_ui::merge`), driven from a loop instead
@@ -18,18 +18,65 @@ fn main() {
env_logger::init();
let mut args: Vec<String> = std::env::args().skip(1).collect();
let mut out_dir = None;
if args.first().map(String::as_str) == Some("--out") {
args.remove(0);
out_dir = Some(PathBuf::from(args.remove(0)));
let mut fill = false;
let mut wait_engines = false;
loop {
match args.first().map(String::as_str) {
Some("--out") => {
args.remove(0);
out_dir = Some(PathBuf::from(args.remove(0)));
}
Some("--fill") => {
args.remove(0);
fill = true;
}
Some("--wait-engines") => {
args.remove(0);
wait_engines = true;
}
_ => break,
}
}
if args.len() < 2 {
eprintln!("usage: merge [--out DIR] <frame> <frame>...");
eprintln!("usage: merge [--out DIR] [--fill] [--wait-engines] <frame> <frame>...");
std::process::exit(2);
}
let Ok(gpu) = pollster::block_on(dr_gpu::GpuContext::new_headless()) else {
eprintln!("no GPU");
std::process::exit(1);
};
// The inference engine as the desktop app starts it, so the border fill
// runs where the app would run it — TensorRT, ONNX Runtime's CPU pool —
// rather than on tract, which is a hundred times slower for this model.
// `DARKROOM_ORT_DIR` first, as the desktop app takes it: a runtime with
// the TensorRT provider where the distribution's has none.
let mut runtime_dirs = Vec::new();
if let Some(dir) = std::env::var_os("DARKROOM_ORT_DIR") {
runtime_dirs.push(std::path::PathBuf::from(dir));
}
runtime_dirs.push(std::path::PathBuf::from("/usr/lib/darkroom"));
runtime_dirs.push(std::path::PathBuf::from("/usr/lib"));
dr_ui::inference::init(runtime_dirs);
// A compiling rung (TensorRT) serves models from the fallback until
// their engines are built, in the background, on first run; the app
// lives long enough for that, this example does not. `--wait-engines`
// waits for the cache to fill so the fill's timing is the rung's.
if wait_engines {
loop {
let s = dr_inference_engine::status();
eprintln!(
"inference: {} ({}), engines {}/{}",
s.line(),
s.reason,
s.engines.0,
s.engines.1
);
if !s.probing && s.engines.0 >= s.engines.1 {
break;
}
std::thread::sleep(std::time::Duration::from_secs(5));
}
}
let frames: Vec<dr_ui::merge::MergeInput> = args
.iter()
@@ -41,8 +88,10 @@ fn main() {
.map(std::path::Path::to_path_buf)
.unwrap_or_else(|| PathBuf::from("."))
});
let request =
let mut request =
dr_ui::merge::MergeRequest::new(frames, dr_ui::merge::MergeDestination::Local(dir));
// The filler from the shared models directory, as the app finds it.
request.inpaint_model = dr_ui::merge::inpaint_model_path();
let (tx, rx) = std::sync::mpsc::channel();
let (decide, decision) = std::sync::mpsc::channel();
let cancel = dr_ui::merge::Cancel::default();
@@ -75,8 +124,18 @@ fn main() {
Err(why) => println!(" frame {k}: NOT ALIGNED — {why}"),
}
}
println!(
" border fill: {}",
match &r.filler {
Ok(rung) => format!("available, runs on {rung}"),
Err(why) => why.clone(),
}
);
// Headless: the confirmation the dialog would ask for.
let _ = decide.send(dr_ui::merge::Decision::Merge { projection: None });
let _ = decide.send(dr_ui::merge::Decision::Merge {
projection: None,
fill: fill.then(dr_ui::merge::FillSettings::default),
});
}
Done {
path,