From 60497a85d6f0e8bba45983280b879989389b053b Mon Sep 17 00:00:00 2001 From: mstembera Date: Sun, 26 Jul 2020 17:22:49 -0700 Subject: [PATCH] Fix a crash on Use NNUE default true This was because the UCI::use_nnue variable was never updated to true. closes https://github.com/official-stockfish/Stockfish/pull/2843 bench: 4578298 NNUE: 3377227 --- src/uci.cpp | 2 +- src/uci.h | 1 - src/ucioption.cpp | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/uci.cpp b/src/uci.cpp index 3bd7be58..7261bc72 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -215,7 +215,7 @@ namespace { void UCI::init_nnue(const std::string& evalFile) { - if (UCI::use_nnue && !UCI::load_eval_finished) + if (Options["Use NNUE"] && !UCI::load_eval_finished) { // Load evaluation function from a file Eval::NNUE::load_eval(evalFile); diff --git a/src/uci.h b/src/uci.h index 34f01bac..e5ebe144 100644 --- a/src/uci.h +++ b/src/uci.h @@ -79,7 +79,6 @@ Move to_move(const Position& pos, std::string& str); void init_nnue(const std::string& evalFile); extern bool load_eval_finished; -extern bool use_nnue; } // namespace UCI diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 0d0fe23d..e818ef13 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -44,9 +44,8 @@ void on_threads(const Option& o) { Threads.set(size_t(o)); } void on_tb_path(const Option& o) { Tablebases::init(o); } void on_use_nnue(const Option& o) { - use_nnue = o; - if (use_nnue) + if (o) std::cout << "info string NNUE eval used" << std::endl; else std::cout << "info string Standard eval used" << std::endl; @@ -204,6 +203,5 @@ Option& Option::operator=(const string& v) { return *this; } -bool use_nnue = false; bool load_eval_finished = false; } // namespace UCI