feat: add optional parallel feature for population-evaluation parallelism
Adds a `parallel` Cargo feature that pulls in rayon and parallelizes the only step that's actually expensive in practice — calls to `Problem::evaluate` — across the population. RNG-driven steps (parent and donor selection, variation, replacement decisions) stay serial, so seeded runs remain deterministic regardless of feature state, and the default and `--features parallel` builds produce bit-identical results. Wiring: - New `algorithms::parallel_eval::evaluate_batch` helper with two cfg-gated implementations (rayon's `into_par_iter` when the feature is on, plain `into_iter` otherwise). Both preserve input order, so pareto_front and crowding-distance decisions remain reproducible. - `RandomSearch`, `Nsga2`, and `DifferentialEvolution` now route population/offspring evaluation through the helper. NSGA-II's main loop is restructured into a serial selection-and-variation phase followed by a parallel-friendly batch evaluation phase. - DE's per-target loop is restructured into three phases (serial trial construction → batch evaluation → serial replacement). Side effect of the restructuring: DE is now the canonical synchronous DE/rand/1/bin rather than the asynchronous variant where target `i+1` sees `i`'s in-flight update. Synchronous is the textbook formulation, so this is a small correctness improvement on top of the parallelism enable. - PAES stays serial — its main loop has a sequential dependency on the current candidate and would gain nothing from rayon. Cost: algorithm impls now require `P: Sync` and `P::Decision: Send` unconditionally so a single impl serves both feature modes. This is a small bound tightening that any plain-data Problem already satisfies; in return the public `Problem` trait itself stays unchanged and the default build picks up no new dependencies. Verified: - `cargo test` and `cargo test --features parallel` both pass; the Nsga2 `deterministic_with_same_seed` test confirms reproducibility. - `cargo run --release --example benchmarks` and the same with `--features parallel` produce bit-identical ZDT1 / Rastrigin results.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
use rand::Rng as _;
|
||||
|
||||
use crate::algorithms::parallel_eval::evaluate_batch;
|
||||
use crate::core::candidate::Candidate;
|
||||
use crate::core::objective::Direction;
|
||||
use crate::core::population::Population;
|
||||
@@ -60,7 +61,7 @@ impl DifferentialEvolution {
|
||||
|
||||
impl<P> Optimizer<P> for DifferentialEvolution
|
||||
where
|
||||
P: Problem<Decision = Vec<f64>>,
|
||||
P: Problem<Decision = Vec<f64>> + Sync,
|
||||
{
|
||||
fn run(&mut self, problem: &P) -> OptimizationResult<P::Decision> {
|
||||
assert!(
|
||||
@@ -88,57 +89,56 @@ where
|
||||
use crate::traits::Initializer as _;
|
||||
self.bounds.initialize(n, &mut rng)
|
||||
};
|
||||
let mut evaluations = 0usize;
|
||||
let mut evals: Vec<f64> = decisions
|
||||
.iter()
|
||||
.map(|d| {
|
||||
let e = problem.evaluate(d);
|
||||
evaluations += 1;
|
||||
e.objectives[0]
|
||||
})
|
||||
.collect();
|
||||
let initial_pop = evaluate_batch(problem, decisions.clone());
|
||||
let mut evaluations = initial_pop.len();
|
||||
let mut evals: Vec<f64> =
|
||||
initial_pop.iter().map(|c| c.evaluation.objectives[0]).collect();
|
||||
|
||||
for _gen in 0..self.config.generations {
|
||||
for i in 0..n {
|
||||
let (r1, r2, r3) = pick_three_distinct(n, i, &mut rng);
|
||||
let j_rand = rng.random_range(0..dim);
|
||||
let mut trial = decisions[i].clone();
|
||||
for j in 0..dim {
|
||||
let take_donor =
|
||||
rng.random_bool(self.config.crossover_probability) || j == j_rand;
|
||||
if take_donor {
|
||||
let mutant = decisions[r1][j]
|
||||
+ self.config.differential_weight
|
||||
* (decisions[r2][j] - decisions[r3][j]);
|
||||
let (lo, hi) = self.bounds.bounds[j];
|
||||
trial[j] = mutant.clamp(lo, hi);
|
||||
// Phase 1 (serial): construct one trial per target. RNG state is
|
||||
// consumed in deterministic order so seeded runs reproduce
|
||||
// exactly regardless of the `parallel` feature.
|
||||
let trials: Vec<Vec<f64>> = (0..n)
|
||||
.map(|i| {
|
||||
let (r1, r2, r3) = pick_three_distinct(n, i, &mut rng);
|
||||
let j_rand = rng.random_range(0..dim);
|
||||
let mut trial = decisions[i].clone();
|
||||
for j in 0..dim {
|
||||
let take_donor =
|
||||
rng.random_bool(self.config.crossover_probability) || j == j_rand;
|
||||
if take_donor {
|
||||
let mutant = decisions[r1][j]
|
||||
+ self.config.differential_weight
|
||||
* (decisions[r2][j] - decisions[r3][j]);
|
||||
let (lo, hi) = self.bounds.bounds[j];
|
||||
trial[j] = mutant.clamp(lo, hi);
|
||||
}
|
||||
}
|
||||
}
|
||||
let trial_obj = {
|
||||
let e = problem.evaluate(&trial);
|
||||
evaluations += 1;
|
||||
e.objectives[0]
|
||||
};
|
||||
trial
|
||||
})
|
||||
.collect();
|
||||
|
||||
// Phase 2 (parallel-friendly): evaluate every trial.
|
||||
let trial_cands = evaluate_batch(problem, trials);
|
||||
evaluations += trial_cands.len();
|
||||
|
||||
// Phase 3 (serial): greedy replacement.
|
||||
for (i, trial_cand) in trial_cands.into_iter().enumerate() {
|
||||
let trial_obj = trial_cand.evaluation.objectives[0];
|
||||
let target_obj = evals[i];
|
||||
let trial_better = match direction {
|
||||
Direction::Minimize => trial_obj <= target_obj,
|
||||
Direction::Maximize => trial_obj >= target_obj,
|
||||
};
|
||||
if trial_better {
|
||||
decisions[i] = trial;
|
||||
decisions[i] = trial_cand.decision;
|
||||
evals[i] = trial_obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let final_pop: Vec<Candidate<Vec<f64>>> = decisions
|
||||
.into_iter()
|
||||
.map(|d| {
|
||||
let e = problem.evaluate(&d);
|
||||
evaluations += 1;
|
||||
Candidate::new(d, e)
|
||||
})
|
||||
.collect();
|
||||
let final_pop: Vec<Candidate<Vec<f64>>> = evaluate_batch(problem, decisions);
|
||||
evaluations += final_pop.len();
|
||||
let front = pareto_front(&final_pop, &objectives);
|
||||
let best = best_candidate(&final_pop, &objectives);
|
||||
OptimizationResult::new(
|
||||
|
||||
Reference in New Issue
Block a user