Add auxengine-options.

killerducky · Feb 17, 2019 · 01c6cf6 · 01c6cf6
1 parent 2628fdb
commit 01c6cf6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/mcts/params.cc b/src/mcts/params.cc
@@ -184,6 +184,10 @@ const OptionId SearchParams::kAuxEngineDepthId{
 const OptionId SearchParams::kAuxEngineBoostId{
     "auxengine-boost", "AuxEngineBoost",
     "How much to boost Policy, in percentage"};
+const OptionId SearchParams::kAuxEngineOptionsId{
+    "auxengine-options", "AuxEngineOptions",
+    "Semicolon separated list of UCI options for the auxiliary engine\n"
+    "e.g. 'Hash value 1024;Threads value 4'"};
 
 void SearchParams::Populate(OptionsParser* options) {
   // Here the uci optimized defaults" are set.
@@ -224,6 +228,7 @@ void SearchParams::Populate(OptionsParser* options) {
   options->Add<IntOption>(kAuxEngineThresholdId, 1, 1000000) = 100;
   options->Add<IntOption>(kAuxEngineDepthId, 1, 100) = 20;
   options->Add<FloatOption>(kAuxEngineBoostId, 0.0f, 1000.0f) = 50.0f;
+  options->Add<StringOption>(kAuxEngineOptionsId);
 }
 
 SearchParams::SearchParams(const OptionsDict& options)

diff --git a/src/mcts/params.h b/src/mcts/params.h
@@ -107,6 +107,9 @@ class SearchParams {
   float GetAuxEngineBoost() const {
     return options_.Get<float>(kAuxEngineBoostId.GetId());
   }
+  std::string GetAuxEngineOptions() const {
+    return options_.Get<std::string>(kAuxEngineOptionsId.GetId());
+  }
 
   // Search parameter IDs.
   static const OptionId kMiniBatchSizeId;
@@ -141,6 +144,7 @@ class SearchParams {
   static const OptionId kAuxEngineThresholdId;
   static const OptionId kAuxEngineDepthId;
   static const OptionId kAuxEngineBoostId;
+  static const OptionId kAuxEngineOptionsId;
 
  private:
   const OptionsDict& options_;

diff --git a/src/mcts/search.cc b/src/mcts/search.cc
@@ -661,9 +661,14 @@ void Search::OpenAuxEngine() {
   LOGFILE << "aolsen " << path;
   if (!auxengine_ready_) {
     auxengine_c_ = boost::process::child(path, boost::process::std_in < auxengine_os_, boost::process::std_out > auxengine_is_);
-    // magic setting SF specific stuff
-    auxengine_os_ << "setoption name Hash value 1024" << std::endl;
-    auxengine_os_ << "uci" << std::endl;
+    {
+      std::istringstream iss(params_.GetAuxEngineOptions());
+      std::string token;
+      while(std::getline(iss, token, ';')) {
+        auxengine_os_ << "setoption name " << token << std::endl;
+      }
+      auxengine_os_ << "uci" << std::endl;
+    }
     std::string line;
     while(std::getline(auxengine_is_, line)) {
       LOGFILE << "aolsen auxengine:" << line;