Merge remote-tracking branch 'upstream/master'

diff --cc src/Makefile
index e12b068cc7b14a7e522ee7b9813bbea44df65efa,a0f098fa67800061eb4084f2be86c380f35adea9..71a940f5496903d1c5d8d457584fae0a0b70cf75
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -56,15 -56,12 +56,15 @@@ els
  endif
  
  ### Source and object files
- 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 \
+ SRCS = benchmark.cpp bitboard.cpp evaluate.cpp main.cpp \
+       misc.cpp movegen.cpp movepick.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_ka_v2_hm.cpp
 +      nnue/evaluate_nnue.cpp nnue/features/half_ka_v2_hm.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:nnue:nnue/features
  

diff --cc src/main.cpp
index 557c8c2789b77fb8b830801ae030ffe0582f2bf1,593408f63a7d978a23e4cfb81bf70e44cafcdea0..e5f3b329543f22869fa0cc593b1371aff96bfe31
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -16,13 -16,9 +16,12 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
 +#include <deque>
  #include <iostream>
 +#include <stack>
 +#include <thread>
  
  #include "bitboard.h"
- #include "endgame.h"
  #include "position.h"
  #include "psqt.h"
  #include "search.h"

diff --cc src/misc.cpp
Simple merge

diff --cc src/position.cpp
Simple merge

diff --cc src/ucioption.cpp
index ee84e25323753d7e67710c86dcefc0bd1aa0600e,27f436d3b372953ab0bbd6dbe694e322fa693241..e10ba00a36f7147e1df9148dd6fa6a9c5c107c61
--- 1/src/ucioption.cpp
--- 2/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -88,9 -78,7 +88,8 @@@ void init(OptionsMap& o) 
    o["SyzygyProbeDepth"]      << Option(1, 1, 100);
    o["Syzygy50MoveRule"]      << Option(true);
    o["SyzygyProbeLimit"]      << Option(7, 0, 7);
-   o["Use NNUE"]              << Option(true, on_use_NNUE);
    o["EvalFile"]              << Option(EvalFileDefaultName, on_eval_file);
 +  o["RPCServerAddress"]      << Option("<empty>", on_rpc_server_address);
  }