From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 12 Jul 2023 14:57:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=487c21b1aa64dcc09dd95b845a66f39ae3c3754e;hp=-c

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

487c21b1aa64dcc09dd95b845a66f39ae3c3754e
diff --combined src/Makefile
index e12b068c,a0f098fa..71a940f5
--- a/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
  
@@@ -381,7 -378,7 +381,7 @@@ endi
  ifeq ($(COMP),gcc)
  	comp=gcc
  	CXX=g++
 -	CXXFLAGS += -pedantic -Wextra -Wshadow -Wmissing-declarations
 +	CXXFLAGS += -pedantic -Wextra -Wmissing-declarations
  
  	ifeq ($(arch),$(filter $(arch),armv7 armv8 riscv64))
  		ifeq ($(OS),Android)
@@@ -567,7 -564,7 +567,7 @@@ endi
  ### 3.3 Optimization
  ifeq ($(optimize),yes)
  
 -	CXXFLAGS += -O3
 +	CXXFLAGS += -O3 -g
  
  	ifeq ($(comp),gcc)
  		ifeq ($(OS), Android)
@@@ -705,7 -702,7 +705,7 @@@ ifeq ($(pext),yes
  endif
  
  ### 3.7.1 Try to include git commit sha for versioning
- GIT_SHA = $(shell git rev-parse --short HEAD 2>/dev/null)
+ GIT_SHA = $(shell git rev-parse HEAD 2>/dev/null | cut -c 1-8)
  ifneq ($(GIT_SHA), )
  	CXXFLAGS += -DGIT_SHA=$(GIT_SHA)
  endif
@@@ -930,7 -927,7 +930,7 @@@ default
  ### Section 5. Private Targets
  ### ==========================================================================
  
 -all: $(EXE) .depend
 +all: $(EXE) client .depend
  
  config-sanity: net
  	@echo ""
@@@ -1038,32 -1035,6 +1038,32 @@@ icx-profile-use
  	EXTRALDFLAGS='-fprofile-use ' \
  	all
  
 +### GRPC
 +
 +PROTOS_PATH = .
 +PROTOC = protoc
 +GRPC_CPP_PLUGIN = grpc_cpp_plugin
 +GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`
 +
 +%.grpc.pb.h %.grpc.pb.cc: %.proto
 +	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
 +
 +# oh my
 +%.cpp: %.cc
 +	cp $< $@
 +
 +%.pb.h %.pb.cc: %.proto
 +	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 +
 +#LDFLAGS += -Wl,-Bstatic -Wl,-\( -lprotobuf -lgrpc++_unsecure -lgrpc_unsecure -lgrpc -lz -Wl,-\) -Wl,-Bdynamic -ldl
 +LDFLAGS += -Wl,--start-group /usr/lib/x86_64-linux-gnu/libprotobuf.a /usr/lib/x86_64-linux-gnu/libgrpc++_unsecure.a /usr/lib/x86_64-linux-gnu/libgrpc_unsecure.a /usr/lib/x86_64-linux-gnu/libgrpc.a /usr/lib/x86_64-linux-gnu/libaddress_sorting.a /usr/lib/x86_64-linux-gnu/libupb.a /usr/lib/x86_64-linux-gnu/libcares.a /usr/lib/x86_64-linux-gnu/libgpr.a /usr/lib/x86_64-linux-gnu/libabsl_*.a -Wl,--end-group -ldl -lz
 +#LDFLAGS += /usr/lib/x86_64-linux-gnu/libprotobuf.a /usr/lib/libgrpc++_unsecure.a /usr/lib/libgrpc_unsecure.a /usr/lib/libgrpc.a /usr/lib/x86_64-linux-gnu/libcares.a -ldl -lz
 +
 +client: $(CLIOBJS)
 +	$(CXX) -o $@ $(CLIOBJS) $(LDFLAGS)
 +
 +# Other stuff
 +
  .depend: $(SRCS)
  	-@$(CXX) $(DEPENDFLAGS) -MM $(SRCS) > $@ 2> /dev/null
  
diff --combined src/main.cpp
index 557c8c27,593408f6..e5f3b329
--- a/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"
@@@ -31,203 -27,8 +30,203 @@@
  #include "tt.h"
  #include "uci.h"
  
 +#include <grpc/grpc.h>
 +#include <grpc++/server.h>
 +#include <grpc++/server_builder.h>
 +#include "hashprobe.h"
 +#include "hashprobe.grpc.pb.h"
 +#include "tt.h"
 +
 +using grpc::Server;
 +using grpc::ServerBuilder;
 +using grpc::ServerContext;
 +using grpc::Status;
 +using grpc::StatusCode;
 +using namespace hashprobe;
  using namespace Stockfish;
  
 +Status HashProbeImpl::Probe(ServerContext* context,
 +                            const HashProbeRequest* request,
 +			    HashProbeResponse *response) {
 +	Position pos;
 +	StateInfo st;
 +	pos.set(request->fen(), /*isChess960=*/false, &st, Threads.main());
 +	if (!pos.pos_is_ok()) {
 +		return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
 +	}
 +
 +	bool invert = (pos.side_to_move() == BLACK);
 +	StateListPtr setup_states = StateListPtr(new std::deque<StateInfo>(1));
 +
 +	ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 +
 +	MoveList<LEGAL> moves(pos);
 +	for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
 +		HashProbeLine *line = response->add_line();
 +		FillMove(&pos, em->move, line->mutable_move());
 +		setup_states->push_back(StateInfo());
 +		pos.do_move(em->move, setup_states->back());
 +		ProbeMove(&pos, setup_states.get(), !invert, line);
 +		pos.undo_move(em->move);
 +	}
 +
 +	return Status::OK;
 +}
 +
 +void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
 +	if (!is_ok(move)) return;
 +
 +	Square from = from_sq(move);
 +	Square to = to_sq(move);
 +
 +	if (type_of(move) == CASTLING) {
 +		to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
 +	}
 +
 +	Piece moved_piece = pos->moved_piece(move);
 +	std::string pretty;
 +	if (type_of(move) == CASTLING) {
 +		if (to > from) {
 +			pretty = "O-O";
 +		} else {
 +			pretty = "O-O-O";
 +		}
 +	} else if (type_of(moved_piece) == PAWN) {
 +		if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
 +			// Capture.
 +			pretty = char('a' + file_of(from));
 +			pretty += "x";
 +		}
 +		pretty += UCI::square(to);
 +		if (type_of(move) == PROMOTION) {
 +			pretty += "=";
 +			pretty += " PNBRQK"[promotion_type(move)];
 +		}
 +	} else {
 +		pretty = " PNBRQK"[type_of(moved_piece)];
 +		Bitboard attackers = pos->attackers_to(to) & pos->pieces(color_of(moved_piece), type_of(moved_piece));
 +		if (more_than_one(attackers)) {
 +			// Remove all illegal moves to disambiguate.
 +			Bitboard att_copy = attackers;
 +			while (att_copy) {
 +				Square s = pop_lsb(att_copy);
 +				Move m = make_move(s, to);
 +				if (!pos->pseudo_legal(m) || !pos->legal(m)) {
 +					attackers &= ~square_bb(s);
 +				}
 +			}
 +		}
 +		if (more_than_one(attackers)) {
 +			// Disambiguate by file if possible.
 +			Bitboard attackers_this_file = attackers & file_bb(file_of(from));
 +			if (attackers != attackers_this_file) {
 +				pretty += char('a' + file_of(from));
 +				attackers = attackers_this_file;
 +			}
 +			if (more_than_one(attackers)) {
 +				// Still ambiguous, so need to disambiguate by rank.
 +				pretty += char('1' + rank_of(from));
 +			}
 +		}
 +
 +		if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
 +			pretty += "x";
 +		}
 +
 +		pretty += UCI::square(to);
 +	}
 +
 +	if (pos->gives_check(move)) {
 +		// Check if mate.
 +		StateInfo si;
 +		pos->do_move(move, si, true);
 +		if (MoveList<LEGAL>(*pos).size() > 0) {
 +			pretty += "+";
 +		} else {
 +			pretty += "#";
 +		}
 +		pos->undo_move(move);
 +	}
 +
 +	decoded->set_pretty(pretty);
 +}
 +
 +void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
 +	bool found;
 +	TTEntry *entry = TT.probe(pos->key(), found);
 +	response->set_found(found);
 +	if (found) {
 +		TTEntry entry_copy = *entry;
 +		Value value = entry_copy.value();
 +		Value eval = entry_copy.eval();
 +		Bound bound = entry_copy.bound();
 +
 +		if (invert) {
 +			value = -value;
 +			eval = -eval;
 +			if (bound == BOUND_UPPER) {
 +				bound = BOUND_LOWER;
 +			} else if (bound == BOUND_LOWER) {
 +				bound = BOUND_UPPER;
 +			}
 +		}
 +
 +		response->set_depth(entry_copy.depth());
 +		FillValue(eval, response->mutable_eval());
 +		if (entry_copy.depth() > DEPTH_NONE) {
 +			FillValue(value, response->mutable_value());
 +		}
 +		response->set_bound(HashProbeLine::ValueBound(bound));
 +
 +		// Follow the PV until we hit an illegal move.
 +		std::stack<Move> pv;
 +		std::set<Key> seen;
 +		while (is_ok(entry_copy.move()) &&
 +		       pos->pseudo_legal(entry_copy.move()) &&
 +		       pos->legal(entry_copy.move())) {
 +			FillMove(pos, entry_copy.move(), response->add_pv());
 +			if (seen.count(pos->key())) break;
 +			pv.push(entry_copy.move());
 +			seen.insert(pos->key());
 +			setup_states->push_back(StateInfo());
 +			pos->do_move(entry_copy.move(), setup_states->back());
 +			entry = TT.probe(pos->key(), found);
 +			if (!found) {
 +				break;
 +			}
 +			entry_copy = *entry;
 +		}
 +
 +		// Unroll the PV back again, so the Position object remains unchanged.
 +		while (!pv.empty()) {
 +			pos->undo_move(pv.top());
 +			pv.pop();
 +		}
 +	}
 +}
 +
 +void HashProbeImpl::FillValue(Value value, HashProbeScore* score) {
 +	if (abs(value) < VALUE_MATE - MAX_PLY) {
 +		score->set_score_type(HashProbeScore::SCORE_CP);
 +		score->set_score_cp(value * 100 / PawnValueEg);
 +	} else {
 +		score->set_score_type(HashProbeScore::SCORE_MATE);
 +		score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2);
 +	}
 +}
 +
 +HashProbeThread::HashProbeThread(const std::string &server_address) {
 +	builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
 +	builder.RegisterService(&service);
 +	server = std::move(builder.BuildAndStart());
 +	std::cout << "Server listening on " << server_address << std::endl;
 +	std::thread([this]{ server->Wait(); }).detach();
 +}
 +
 +void HashProbeThread::Shutdown() {
 +	server->Shutdown();
 +}
 +
  int main(int argc, char* argv[]) {
  
    std::cout << engine_info() << std::endl;
@@@ -238,8 -39,6 +237,6 @@@
    PSQT::init();
    Bitboards::init();
    Position::init();
-   Bitbases::init();
-   Endgames::init();
    Threads.set(size_t(Options["Threads"]));
    Search::clear(); // After threads are up
    Eval::NNUE::init();
diff --combined src/misc.cpp
index 581eb751,f1554060..d8895d87
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@@ -170,7 -170,13 +170,7 @@@ string engine_info(bool to_uci) 
        ss << year << setw(2) << setfill('0') << (1 + months.find(month) / 4) << setw(2) << setfill('0') << day;
        #endif
  
 -      ss << "-";
 -
 -      #ifdef GIT_SHA
 -      ss << stringify(GIT_SHA);
 -      #else
 -      ss << "nogit";
 -      #endif
 +      ss << "-asn";
    }
  
    ss << (to_uci  ? "\nid author ": " by ")
@@@ -484,25 -490,29 +484,29 @@@ static void* aligned_large_pages_alloc_
        return nullptr;
  
    // Dynamically link OpenProcessToken, LookupPrivilegeValue and AdjustTokenPrivileges
-   HMODULE k32 = GetModuleHandle("Advapi32.dll");
-   auto fun6 = (fun6_t)(void(*)())GetProcAddress(k32, "OpenProcessToken");
+ 
+   HMODULE hAdvapi32 = GetModuleHandle(TEXT("advapi32.dll"));
+ 
+   if (!hAdvapi32)
+       hAdvapi32 = LoadLibrary(TEXT("advapi32.dll"));
+ 
+   auto fun6 = (fun6_t)(void(*)())GetProcAddress(hAdvapi32, "OpenProcessToken");
    if (!fun6)
        return nullptr;
-   auto fun7 = (fun7_t)(void(*)())GetProcAddress(k32, "LookupPrivilegeValueA");
+   auto fun7 = (fun7_t)(void(*)())GetProcAddress(hAdvapi32, "LookupPrivilegeValueA");
    if (!fun7)
        return nullptr;
-   auto fun8 = (fun8_t)(void(*)())GetProcAddress(k32, "AdjustTokenPrivileges");
+   auto fun8 = (fun8_t)(void(*)())GetProcAddress(hAdvapi32, "AdjustTokenPrivileges");
    if (!fun8)
        return nullptr;
-             
  
    // We need SeLockMemoryPrivilege, so try to enable it for the process
-   // OpenProcessToken()
-   if (!fun6(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hProcessToken))
-       return nullptr;
+   if (!fun6( // OpenProcessToken()
+       GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hProcessToken))
+           return nullptr;
  
-   // LookupPrivilegeValueA()
-   if (fun7(nullptr, SE_LOCK_MEMORY_NAME, &luid))
+   if (fun7( // LookupPrivilegeValue(nullptr, SE_LOCK_MEMORY_NAME, &luid)
+       nullptr, "SeLockMemoryPrivilege", &luid))
    {
        TOKEN_PRIVILEGES tp { };
        TOKEN_PRIVILEGES prevTp { };
@@@ -514,8 -524,7 +518,7 @@@
  
        // Try to enable SeLockMemoryPrivilege. Note that even if AdjustTokenPrivileges() succeeds,
        // we still need to query GetLastError() to ensure that the privileges were actually obtained.
-       // AdjustTokenPrivileges()
-       if (fun8(
+       if (fun8( // AdjustTokenPrivileges()
                hProcessToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prevTp, &prevTpLen) &&
            GetLastError() == ERROR_SUCCESS)
        {
@@@ -525,8 -534,8 +528,8 @@@
                nullptr, allocSize, MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES, PAGE_READWRITE);
  
            // Privilege no longer needed, restore previous state
- 	  // AdjustTokenPrivileges ()
-           fun8(hProcessToken, FALSE, &prevTp, 0, nullptr, nullptr);
+           fun8( // AdjustTokenPrivileges ()
+               hProcessToken, FALSE, &prevTp, 0, nullptr, nullptr);
        }
    }
  
diff --combined src/position.cpp
index 3cfc23d3,6ecc52f8..89ac1897
--- a/src/position.cpp
+++ b/src/position.cpp
@@@ -284,6 -284,8 +284,6 @@@ Position& Position::set(const string& f
    thisThread = th;
    set_state();
  
 -  assert(pos_is_ok());
 -
    return *this;
  }
  
@@@ -329,8 -331,7 +329,7 @@@ void Position::set_check_info() const 
  
  /// Position::set_state() computes the hash keys of the position, and other
  /// data that once computed is updated incrementally as moves are made.
- /// The function is only used when a new position is set up, and to verify
- /// the correctness of the StateInfo data when running in debug mode.
+ /// The function is only used when a new position is set up
  
  void Position::set_state() const {
  
@@@ -637,9 -638,9 +636,9 @@@ bool Position::gives_check(Move m) cons
        return true;
  
    // Is there a discovered check?
-   if (   (blockers_for_king(~sideToMove) & from)
-       && !aligned(from, to, square<KING>(~sideToMove)))
-       return true;
+   if (blockers_for_king(~sideToMove) & from)
+       return   !aligned(from, to, square<KING>(~sideToMove))
+             || type_of(m) == CASTLING;
  
    switch (type_of(m))
    {
@@@ -664,11 -665,9 +663,9 @@@
    default: //CASTLING
    {
        // Castling is encoded as 'king captures the rook'
-       Square ksq = square<KING>(~sideToMove);
        Square rto = relative_square(sideToMove, to > from ? SQ_F1 : SQ_D1);
  
-       return   (attacks_bb<ROOK>(rto) & ksq)
-             && (attacks_bb<ROOK>(rto, pieces() ^ from ^ to) & ksq);
+       return check_squares(ROOK) & rto;
    }
    }
  }
@@@ -752,13 -751,10 +749,10 @@@ void Position::do_move(Move m, StateInf
        else
            st->nonPawnMaterial[them] -= PieceValue[MG][captured];
  
-       if (Eval::useNNUE)
-       {
-           dp.dirty_num = 2;  // 1 piece moved, 1 piece captured
-           dp.piece[1] = captured;
-           dp.from[1] = capsq;
-           dp.to[1] = SQ_NONE;
-       }
+       dp.dirty_num = 2;  // 1 piece moved, 1 piece captured
+       dp.piece[1] = captured;
+       dp.from[1] = capsq;
+       dp.to[1] = SQ_NONE;
  
        // Update board and piece lists
        remove_piece(capsq);
@@@ -766,7 -762,6 +760,6 @@@
        // Update material hash key and prefetch access to materialTable
        k ^= Zobrist::psq[captured][capsq];
        st->materialKey ^= Zobrist::psq[captured][pieceCount[captured]];
-       prefetch(thisThread->materialTable[st->materialKey]);
  
        // Reset rule 50 counter
        st->rule50 = 0;
@@@ -793,12 -788,9 +786,9 @@@
    // Move the piece. The tricky Chess960 castling is handled earlier
    if (type_of(m) != CASTLING)
    {
-       if (Eval::useNNUE)
-       {
-           dp.piece[0] = pc;
-           dp.from[0] = from;
-           dp.to[0] = to;
-       }
+       dp.piece[0] = pc;
+       dp.from[0] = from;
+       dp.to[0] = to;
  
        move_piece(from, to);
    }
@@@ -824,15 -816,12 +814,12 @@@
            remove_piece(to);
            put_piece(promotion, to);
  
-           if (Eval::useNNUE)
-           {
-               // Promoting pawn to SQ_NONE, promoted piece from SQ_NONE
-               dp.to[0] = SQ_NONE;
-               dp.piece[dp.dirty_num] = promotion;
-               dp.from[dp.dirty_num] = SQ_NONE;
-               dp.to[dp.dirty_num] = to;
-               dp.dirty_num++;
-           }
+           // Promoting pawn to SQ_NONE, promoted piece from SQ_NONE
+           dp.to[0] = SQ_NONE;
+           dp.piece[dp.dirty_num] = promotion;
+           dp.from[dp.dirty_num] = SQ_NONE;
+           dp.to[dp.dirty_num] = to;
+           dp.dirty_num++;
  
            // Update hash keys
            k ^= Zobrist::psq[pc][to] ^ Zobrist::psq[promotion][to];
@@@ -962,7 -951,7 +949,7 @@@ void Position::do_castling(Color us, Sq
    rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1);
    to = relative_square(us, kingSide ? SQ_G1 : SQ_C1);
  
-   if (Do && Eval::useNNUE)
+   if (Do)
    {
        auto& dp = st->dirtyPiece;
        dp.piece[0] = make_piece(us, KING);
diff --combined src/ucioption.cpp
index ee84e253,27f436d3..e10ba00a
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -27,7 -27,6 +27,7 @@@
  #include "thread.h"
  #include "tt.h"
  #include "uci.h"
 +#include "hashprobe.h"
  #include "syzygy/tbprobe.h"
  
  using std::string;
@@@ -35,7 -34,6 +35,7 @@@
  namespace Stockfish {
  
  UCI::OptionsMap Options; // Global object
 +std::unique_ptr<HashProbeThread> hash_probe_thread;
  
  namespace UCI {
  
@@@ -45,15 -43,7 +45,15 @@@ static void on_hash_size(const Option& 
  static void on_logger(const Option& o) { start_logger(o); }
  static void on_threads(const Option& o) { Threads.set(size_t(o)); }
  static void on_tb_path(const Option& o) { Tablebases::init(o); }
 -static void on_eval_file(const Option&) { Eval::NNUE::init(); }
 +static void on_use_NNUE(const Option& ) { Eval::NNUE::init(); }
 +static void on_eval_file(const Option& ) { Eval::NNUE::init(); }
 +static 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 {
@@@ -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);
  }
  
  
@@@ -138,9 -126,9 +137,9 @@@ Option::Option(double v, int minv, int 
  Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f)
  { defaultValue = v; currentValue = cur; }
  
- Option::operator double() const {
+ Option::operator int() const {
    assert(type == "check" || type == "spin");
-   return (type == "spin" ? stof(currentValue) : currentValue == "true");
+   return (type == "spin" ? std::stoi(currentValue) : currentValue == "true");
  }
  
  Option::operator std::string() const {