diff --git a/src/evaluate.h b/src/evaluate.h index c8dc64ace..fc7784364 100644 --- a/src/evaluate.h +++ b/src/evaluate.h @@ -33,7 +33,7 @@ namespace Eval { // for the build process (profile-build and fishtest) to work. Do not change the // name of the macro or the location where this macro is defined, as it is used // in the Makefile/Fishtest. -#define EvalFileDefaultNameBig "nn-49c1193b131c.nnue" +#define EvalFileDefaultNameBig "nn-c0ae49f08b40.nnue" #define EvalFileDefaultNameSmall "nn-37f18f62d772.nnue" namespace NNUE { diff --git a/tests/instrumented.py b/tests/instrumented.py index 23de446ef..80831ce3f 100644 --- a/tests/instrumented.py +++ b/tests/instrumented.py @@ -67,7 +67,6 @@ def Stockfish(*args, **kwargs): class TestCLI(metaclass=OrderedClassMembers): - def beforeAll(self): pass @@ -141,7 +140,7 @@ class TestCLI(metaclass=OrderedClassMembers): def test_bench_128_threads_3_bench_tmp_epd_depth(self): self.stockfish = Stockfish( - f"bench 128 {get_threads()} 3 {os.path.join(PATH,'bench_tmp.epd')} depth".split( + f"bench 128 {get_threads()} 3 {os.path.join(PATH, 'bench_tmp.epd')} depth".split( " " ), True, @@ -167,7 +166,7 @@ class TestCLI(metaclass=OrderedClassMembers): def test_export_net_verify_nnue(self): current_path = os.path.abspath(os.getcwd()) self.stockfish = Stockfish( - f"export_net {os.path.join(current_path , 'verify.nnue')}".split(" "), True + f"export_net {os.path.join(current_path, 'verify.nnue')}".split(" "), True ) assert self.stockfish.process.returncode == 0 @@ -254,7 +253,7 @@ class TestInteractive(metaclass=OrderedClassMembers): self.stockfish.send_command("go depth 5") def callback(output): - regex = r"info depth \d+ seldepth \d+ multipv \d+ score cp \d+ nodes \d+ nps \d+ hashfull \d+ tbhits \d+ time \d+ pv" + regex = r"info depth \d+ seldepth \d+ multipv \d+ score cp -?\d+ nodes \d+ nps \d+ hashfull \d+ tbhits \d+ time \d+ pv" if output.startswith("info depth") and not re.match(regex, output): assert False if output.startswith("bestmove"): @@ -274,7 +273,7 @@ class TestInteractive(metaclass=OrderedClassMembers): def callback(output): nonlocal depth - regex = rf"info depth {depth} seldepth \d+ multipv \d+ score cp \d+ wdl \d+ \d+ \d+ nodes \d+ nps \d+ hashfull \d+ tbhits \d+ time \d+ pv" + regex = rf"info depth {depth} seldepth \d+ multipv \d+ score cp -?\d+ wdl \d+ \d+ \d+ nodes \d+ nps \d+ hashfull \d+ tbhits \d+ time \d+ pv" if output.startswith("info depth"): if not re.match(regex, output): @@ -390,7 +389,7 @@ class TestInteractive(metaclass=OrderedClassMembers): def test_verify_nnue_network(self): current_path = os.path.abspath(os.getcwd()) Stockfish( - f"export_net {os.path.join(current_path , 'verify.nnue')}".split(" "), True + f"export_net {os.path.join(current_path, 'verify.nnue')}".split(" "), True ) self.stockfish.send_command("setoption name EvalFile value verify.nnue") @@ -469,7 +468,7 @@ class TestSyzygy(metaclass=OrderedClassMembers): self.stockfish.send_command("go depth 5") def check_output(output): - if "score cp -20000" in output or "score mate" in output: + if "score cp -20000" in output or "score mate -" in output: return True self.stockfish.check_output(check_output)