From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 1 Dec 2020 22:03:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into HEAD
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=aa75388ec136a8cf83b09da2328c5fefd5a010bd

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

aa75388ec136a8cf83b09da2328c5fefd5a010bd
diff --cc src/Makefile
index 48180660,87203547..e3466ea1
--- a/src/Makefile
+++ b/src/Makefile
@@@ -791,9 -782,9 +785,9 @@@ default
  ### Section 5. Private Targets
  ### ==========================================================================
  
 -all: $(EXE) .depend
 +all: $(EXE) client .depend
  
- config-sanity:
+ config-sanity: net
  	@echo ""
  	@echo "Config:"
  	@echo "debug: '$(debug)'"
diff --cc src/position.cpp
index 2658c71a,07ce0a7c..13010c1a
--- a/src/position.cpp
+++ b/src/position.cpp
@@@ -279,7 -280,11 +280,9 @@@ Position& Position::set(const string& f
    chess960 = isChess960;
    thisThread = th;
    set_state(st);
+   st->accumulator.state[WHITE] = Eval::NNUE::INIT;
+   st->accumulator.state[BLACK] = Eval::NNUE::INIT;
  
 -  assert(pos_is_ok());
 -
    return *this;
  }
  
diff --cc src/ucioption.cpp
index df6283cb,bb0b8311..71239159
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -43,15 -41,8 +43,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_use_NNUE(const Option& ) { Eval::NNUE::init(); }
+ void on_eval_file(const Option& ) { Eval::NNUE::init(); }
 +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 {