diff --git a/engine/src/constants.h b/engine/src/constants.h index 258499a5..9f4074e1 100644 --- a/engine/src/constants.h +++ b/engine/src/constants.h @@ -53,7 +53,7 @@ const string engineName = "MultiAra"; const string engineName = "ClassicAra"; #endif -const string engineVersion = "0.9.2"; +const string engineVersion = "0.9.2.post0"; const string engineAuthors = "Johannes Czech, Moritz Willig, Alena Beyer et al."; #define LOSS_VALUE -1 @@ -72,7 +72,6 @@ const string engineAuthors = "Johannes Czech, Moritz Willig, Alena Beyer et al." #else #define VALUE_TO_CENTI_PARAM 1.2f #endif -#define TIME_OUT_IS_READY_MS 13000 #ifndef MODE_POMMERMAN #define TERMINAL_NODE_CACHE 8192 diff --git a/engine/src/nn/mxnetapi.h b/engine/src/nn/mxnetapi.h index ca39c064..f0c1d291 100644 --- a/engine/src/nn/mxnetapi.h +++ b/engine/src/nn/mxnetapi.h @@ -58,11 +58,11 @@ class MXNetAPI : public NeuralNetAPI void predict(float* inputPlanes, float* valueOutput, float* probOutputs, float* auxiliaryOutputs) override; protected: - void load_model(); - void load_parameters(); - void bind_executor(); + void load_model() override; + void load_parameters() override; + void bind_executor() override; - void init_nn_design(); + void init_nn_design() override; /** * @brief SplitParamMap Splits loaded param map into arg parm and aux param with target context diff --git a/engine/src/uci/crazyara.cpp b/engine/src/uci/crazyara.cpp index 1e4d0cfb..dc3d9a21 100644 --- a/engine/src/uci/crazyara.cpp +++ b/engine/src/uci/crazyara.cpp @@ -433,7 +433,8 @@ void CrazyAra::init() bool CrazyAra::is_ready() { if (!networkLoaded) { - TimeOutReadyThread timeoutThread(TIME_OUT_IS_READY_MS); + const size_t timeoutMS = Options["Timeout_MS"]; + TimeOutReadyThread timeoutThread(timeoutMS); thread tTimeoutThread = thread(run_timeout_thread, &timeoutThread); init_search_settings(); init_play_settings(); diff --git a/engine/src/uci/optionsuci.cpp b/engine/src/uci/optionsuci.cpp index e7b7bc38..3d2657a1 100644 --- a/engine/src/uci/optionsuci.cpp +++ b/engine/src/uci/optionsuci.cpp @@ -152,6 +152,7 @@ void OptionsUCI::init(OptionsMap &o) o["SyzygyPath"] << Option("", on_tb_path); #endif o["Threads"] << Option(2, 1, 512); + o["Timeout_MS"] << Option(13000, 1, 99999999); #ifdef MODE_CRAZYHOUSE // we repeat "crazyhouse" in the list because of problem in XBoard/Winboard #23 o["UCI_Variant"] << Option("crazyhouse", {"crazyhouse", "crazyhouse"});