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

diff --cc src/Makefile
index 4818066015a3e598bbe853ff3ea125a3011df224,87203547f2865705d8154b2c25966fa8895e8184..e3466ea1bb8791979a6430d27cd35f1b15c50315
--- 1/src/Makefile
--- 2/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/main.cpp
Simple merge

diff --cc src/misc.cpp
Simple merge

diff --cc src/position.cpp
index 2658c71a6e624eb2d431c357ed54b39623599abb,07ce0a7cdbc88f91834af2b86aa7740a0fe98e05..13010c1a43f49571193d745a144ad92a4867bb9d
--- 1/src/position.cpp
--- 2/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 df6283cbc00dfadb75ddccf0912c9161342705f7,bb0b8311475cc460683deae42afb7a9ace27f8ec..7123915933b90f59d48627cd95d42dc809b07a38
--- 1/src/ucioption.cpp
--- 2/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 {