Merge remote-tracking branch 'andrews05/parallel' into pr522+pr524

Pr0methean · Jun 24, 2023 · b870a1b · b870a1b
2 parents a688086 + 059e22b
commit b870a1b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/evaluate.rs b/src/evaluate.rs
@@ -85,7 +85,10 @@ impl Evaluator {
     #[cfg(feature = "parallel")]
     pub fn get_best_candidate(self) -> Option<Candidate> {
         let (eval_send, eval_recv) = self.eval_channel;
-        drop(eval_send); // disconnect the sender, breaking the loop in the thread
+        // Disconnect the sender, breaking the loop in the thread
+        drop(eval_send);
+        // Yield to ensure evaluations are finished - this can prevent deadlocks when run within an existing thread pool
+        while let Some(rayon::Yield::Executed) = rayon::yield_local() {}
         eval_recv.into_iter().min_by_key(Candidate::cmp_key)
     }