1 Commits

4 changed files with 11 additions and 16 deletions
+1 -5
View File
@@ -86,11 +86,7 @@ jobs:
build-macos-arm64: build-macos-arm64:
needs: create-release needs: create-release
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container: registry.metabarcoding.org/cibuilder/rustcrossosx:latest
image: registry.metabarcoding.org/cibuilder/rustcrossosx:latest
credentials:
username: ${{ github.actor }}
password: ${{ secrets.REGISTRYTOKEN }}
defaults: defaults:
run: run:
working-directory: src working-directory: src
+1 -1
View File
@@ -1704,7 +1704,7 @@ dependencies = [
[[package]] [[package]]
name = "obikmer" name = "obikmer"
version = "1.1.27" version = "1.1.26"
dependencies = [ dependencies = [
"clap", "clap",
"csv", "csv",
+8 -9
View File
@@ -287,9 +287,8 @@ impl PartitionRunner {
drop(event_tx); drop(event_tx);
// ── Controller ──────────────────────────────────────────────────── // ── Controller ────────────────────────────────────────────────────
let initial_workers = n_nodes.min(max_workers).min(n_total); activate_tx.send(()).ok();
for _ in 0..initial_workers { activate_tx.send(()).ok(); } let mut n_active = 1usize;
let mut n_active = initial_workers;
let mut cpu_sample = CpuSample::now(); let mut cpu_sample = CpuSample::now();
let mut eff_at_last_spawn = 0.0f64; // 0 = no previous spawn to evaluate let mut eff_at_last_spawn = 0.0f64; // 0 = no previous spawn to evaluate
let mut completed = 0usize; let mut completed = 0usize;
@@ -362,13 +361,13 @@ fn maybe_activate(
// Going from k-1 → k workers, the minimum acceptable speedup is (k-1+0.2)/(k-1). // Going from k-1 → k workers, the minimum acceptable speedup is (k-1+0.2)/(k-1).
// For the very first extra worker (n_active == 1, no previous spawn), skip this // For the very first extra worker (n_active == 1, no previous spawn), skip this
// check: eff_at_last_spawn == 0 acts as the sentinel. // check: eff_at_last_spawn == 0 acts as the sentinel.
let last_spawn_was_beneficial = if *eff_at_last_spawn < 1e-9 || eff < 1e-9 { let last_spawn_was_beneficial = if *eff_at_last_spawn < 1e-9 {
true // first additional worker, or measurement too short: no prior data to evaluate true // first additional worker: no prior data to evaluate
} else { } else {
let k_new = *n_active as f64; // worker count after the last spawn let k_before = (*n_active - 1) as f64;
let min_gain = 0.2 / k_new; let min_speedup = (k_before + 0.2) / k_before;
let actual_gain = (eff - *eff_at_last_spawn) / eff; let actual_speedup = eff / *eff_at_last_spawn;
actual_gain >= min_gain actual_speedup >= min_speedup
}; };
if last_spawn_was_beneficial { if last_spawn_was_beneficial {
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "obikmer" name = "obikmer"
version = "1.1.27" version = "1.1.26"
edition = "2024" edition = "2024"
[[bin]] [[bin]]