titaniumtown/othello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

future_move: fix limiting arena size w/ multithreading

Browse Source
This commit is contained in:
Simon Gardling 2025-04-08 15:48:44 -04:00
parent 7e6c057127
commit ec3fc382d4
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/logic/future_moves.rs
View File

@ -160,27 +160,31 @@ impl FutureMoves {
) )
}; };
self.leaf_moves() let allowed_size = self.config.max_arena_size - self.arena.len();
let got = self
.leaf_moves()
.into_iter() .into_iter()
.filter(|&i| self.depth_of(i) == self.current_depth) .filter(|&i| self.depth_of(i) == self.current_depth)
.collect::<Vec<usize>>() .collect::<Vec<usize>>()
.into_par_iter() .into_par_iter()
.progress_with_style(ProgressStyle::with_template(pstyle_inner).unwrap()) .progress_with_style(ProgressStyle::with_template(pstyle_inner).unwrap())
.map(|parent_idx| (parent_idx, self.generate_children_raw(parent_idx))) .map(|parent_idx| (parent_idx, self.generate_children_raw(parent_idx)))
.collect::<Vec<(usize, Vec<Move>)>>() .take_any(allowed_size)
.into_iter() .collect::<Vec<(usize, Vec<Move>)>>();
.for_each(|(parent_idx, moves)| { let got_len = got.len();
let start_idx = self.arena.len();
self.arena.extend(moves);
let new_indices = start_idx..self.arena.len(); got.into_iter().for_each(|(parent_idx, moves)| {
self.arena[parent_idx].children.extend(new_indices); let start_idx = self.arena.len();
}); self.arena.extend(moves);
let new_indices = start_idx..self.arena.len();
self.arena[parent_idx].children.extend(new_indices);
});
self.prune_bad_children(); self.prune_bad_children();
self.current_depth += 1; self.current_depth += 1;
if got_len == allowed_size {
if self.arena.len() >= self.config.max_arena_size { // got.len() has hit the upper limit of size permitted
break; break;
} }
} }

2
src/main.rs
View File

@ -32,7 +32,7 @@ fn main() {
min_arena_depth: 14, min_arena_depth: 14,
top_k_children: 2, top_k_children: 2,
up_to_minus: 10, up_to_minus: 10,
max_arena_size: 400_000_000, max_arena_size: 200_000_000,
do_prune: true, do_prune: true,
print: true, print: true,
children_eval_method: Default::default(), children_eval_method: Default::default(),