Skip to content

Commit e3adc4a

Browse files
committed
Fix FoW unit harness build integration
1 parent 912b38c commit e3adc4a

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

setup.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
with io.open("README.md", "r", encoding="utf8") as fh:
2828
long_description = fh.read().strip()
2929

30-
sources = glob("src/*.cpp") + glob("src/syzygy/*.cpp") + glob("src/nnue/*.cpp") + glob("src/nnue/features/*.cpp") + glob("src/imperfect/*.cpp")
31-
headers = glob("src/*.h") + glob("src/syzygy/*.h") + glob("src/nnue/*.h") + glob("src/nnue/features/*.h") + glob("src/imperfect/*.h")
30+
sources = (glob("src/*.cpp") + glob("src/syzygy/*.cpp") + glob("src/nnue/*.cpp") +
31+
glob("src/nnue/features/*.cpp") + glob("src/imperfect/*.cpp") +
32+
glob("src/imperfect/tests/*.cpp"))
33+
headers = (glob("src/*.h") + glob("src/syzygy/*.h") + glob("src/nnue/*.h") +
34+
glob("src/nnue/features/*.h") + glob("src/imperfect/*.h") +
35+
glob("src/imperfect/tests/*.h"))
3236
ffish_source_file = os.path.normcase("src/ffishjs.cpp")
3337
try:
3438
sources.remove(ffish_source_file)

src/imperfect/tests/fow_unit_tests.cpp

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,14 @@ Variant const* chess_variant() {
4141
return variants.find("chess")->second;
4242
}
4343

44-
Position make_position(const std::string& fen) {
45-
Position pos;
46-
StateInfo st;
44+
void set_position(Position& pos, StateInfo& st, const std::string& fen) {
4745
pos.set(chess_variant(), fen, false, &st, nullptr);
48-
return pos;
4946
}
5047

5148
TestCase visibility_castling_and_ep() {
52-
Position pos = make_position("r3k2r/8/8/8/8/8/8/R3K2R w KQkq d6 0 1");
49+
StateInfo st;
50+
Position pos;
51+
set_position(pos, st, "r3k2r/8/8/8/8/8/8/R3K2R w KQkq d6 0 1");
5352
VisibilityInfo vi = compute_visibility(pos);
5453

5554
const bool epVisible = is_visible(pos, SQ_D6, vi);
@@ -60,7 +59,9 @@ TestCase visibility_castling_and_ep() {
6059
}
6160

6261
TestCase visibility_pawn_masking() {
63-
Position pos = make_position("8/8/8/8/8/3pP3/8/8 w - - 0 10");
62+
StateInfo st;
63+
Position pos;
64+
set_position(pos, st, "8/8/8/8/8/3pP3/8/8 w - - 0 10");
6465
VisibilityInfo vi = compute_visibility(pos);
6566

6667
const bool blockerHidden = !(vi.visible & SQ_D6) && (vi.visible & SQ_E6);
@@ -82,7 +83,9 @@ ObservationHistory seed_observation_history(const Position& pos) {
8283
}
8384

8485
TestCase belief_enumeration_cap() {
85-
Position pos = make_position("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR b KQkq - 0 1");
86+
StateInfo st;
87+
Position pos;
88+
set_position(pos, st, "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR b KQkq - 0 1");
8689
BeliefState belief;
8790
ObservationHistory history = seed_observation_history(pos);
8891
belief.rebuild_from_observations(history, pos);
@@ -95,7 +98,9 @@ TestCase belief_enumeration_cap() {
9598
}
9699

97100
TestCase belief_incremental_filter() {
98-
Position pos = make_position("8/2k5/8/8/8/8/2K5/8 w - - 0 1");
101+
StateInfo st;
102+
Position pos;
103+
set_position(pos, st, "8/2k5/8/8/8/8/2K5/8 w - - 0 1");
99104
BeliefState belief;
100105
ObservationHistory history = seed_observation_history(pos);
101106
belief.rebuild_from_observations(history, pos);
@@ -196,7 +201,9 @@ TestSuiteResult run_cfr_suite() {
196201
TestSuiteResult run_benchmark_suite() {
197202
TestSuiteResult suite{"benchmarks"};
198203

199-
Position pos = make_position("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1");
204+
StateInfo st;
205+
Position pos;
206+
set_position(pos, st, "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1");
200207
ObservationHistory history = seed_observation_history(pos);
201208
BeliefState belief;
202209
belief.rebuild_from_observations(history, pos);
@@ -213,7 +220,9 @@ TestSuiteResult run_sanitizer_suite() {
213220
TestSuiteResult suite{"sanitizers"};
214221
// Minimal construction/destruction loops to flag leaks/races in ASan/TSan runs
215222
for (int i = 0; i < 3; ++i) {
216-
Position pos = make_position("8/8/8/8/8/8/8/8 w - - 0 1");
223+
StateInfo st;
224+
Position pos;
225+
set_position(pos, st, "8/8/8/8/8/8/8/8 w - - 0 1");
217226
ObservationHistory hist = seed_observation_history(pos);
218227
BeliefState belief;
219228
belief.rebuild_from_observations(hist, pos);

0 commit comments

Comments
 (0)