From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 8 Aug 2020 14:40:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into HEAD
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=4004bcf3a48c47450344e93fcf186e3eb5d32165

Merge remote-tracking branch 'upstream/master' into HEAD
---

4004bcf3a48c47450344e93fcf186e3eb5d32165
diff --cc src/Makefile
index 9b10a195,4741e722..59179812
--- a/src/Makefile
+++ b/src/Makefile
@@@ -39,13 -39,11 +39,14 @@@ PGOBENCH = ./$(EXE) benc
  SRCS = benchmark.cpp bitbase.cpp bitboard.cpp endgame.cpp evaluate.cpp main.cpp \
  	material.cpp misc.cpp movegen.cpp movepick.cpp pawns.cpp position.cpp psqt.cpp \
  	search.cpp thread.cpp timeman.cpp tt.cpp uci.cpp ucioption.cpp tune.cpp syzygy/tbprobe.cpp \
 -	nnue/evaluate_nnue.cpp nnue/features/half_kp.cpp
++	nnue/evaluate_nnue.cpp nnue/features/half_kp.cpp \
 +	hashprobe.grpc.pb.cc hashprobe.pb.cc
 +CLISRCS = client.cpp hashprobe.grpc.pb.cc hashprobe.pb.cc uci.cpp
  
  OBJS = $(notdir $(SRCS:.cpp=.o))
 +CLIOBJS = $(notdir $(CLISRCS:.cpp=.o))
  
- VPATH = syzygy
+ VPATH = syzygy:nnue:nnue/features
  
  ### Establish the operating system name
  KERNEL = $(shell uname -s)
diff --cc src/misc.cpp
index d9c0679b,3d7c75e5..4ff52f48
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@@ -145,13 -144,10 +144,11 @@@ const string engine_info(bool to_uci) 
    {
        date >> month >> day >> year;
        ss << setw(2) << day << setw(2) << (1 + months.find(month) / 4) << year.substr(2);
 +      ss << "-asn";
    }
  
-   ss << (Is64Bit ? " 64" : "")
-      << (HasPext ? " BMI2" : (HasPopCnt ? " POPCNT" : ""))
-      << (to_uci  ? "\nid author ": " by ")
-      << "T. Romstad, M. Costalba, J. Kiiski, G. Linscott";
+   ss << (to_uci  ? "\nid author ": " by ")
+      << "the Stockfish developers (see AUTHORS file)";
  
    return ss.str();
  }
diff --cc src/ucioption.cpp
index 5982f26a,faeb78ae..79a2385a
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -44,13 -40,8 +42,15 @@@ void on_hash_size(const Option& o) { TT
  void on_logger(const Option& o) { start_logger(o); }
  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& ) { Eval::init_NNUE(); }
+ void on_eval_file(const Option& ) { Eval::init_NNUE(); }
 +void on_rpc_server_address(const Option& o) {
 +	if (hash_probe_thread) {
 +		hash_probe_thread->Shutdown();
 +	}
 +	std::string addr = o;
 +	hash_probe_thread.reset(new HashProbeThread(addr));
 +}
  
  /// Our case insensitive less() function as required by UCI protocol
  bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
@@@ -87,7 -78,8 +87,9 @@@ void init(OptionsMap& o) 
    o["SyzygyProbeDepth"]      << Option(1, 1, 100);
    o["Syzygy50MoveRule"]      << Option(true);
    o["SyzygyProbeLimit"]      << Option(7, 0, 7);
+   o["Use NNUE"]              << Option(false, on_use_NNUE);
+   o["EvalFile"]              << Option("nn-9931db908a9b.nnue", on_eval_file);
 +  o["RPCServerAddress"]      << Option("<empty>", on_rpc_server_address);
  }