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

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2117497f2436be1173235d5e782039feab59677d..d24891d9e659f7aab9cdd7ecf16390597b54abc9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,6 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,18 +22,21 @@
 #include <thread>
 
 #include "bitboard.h"
+#include "endgame.h"
 #include "position.h"
+#include "psqt.h"
 #include "search.h"
+#include "syzygy/tbprobe.h"
 #include "thread.h"
 #include "tt.h"
 #include "uci.h"
-#include "syzygy/tbprobe.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;
@@ -43,6 +44,7 @@ using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
 using namespace hashprobe;
+using namespace Stockfish;
 
 Status HashProbeImpl::Probe(ServerContext* context,
                             const HashProbeRequest* request,
@@ -81,13 +83,6 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
        if (type_of(move) == CASTLING) {
                to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
        }
-               
-       decoded->set_from_sq(UCI::square(from));
-       decoded->set_to_sq(UCI::square(to));
-
-       if (type_of(move) == PROMOTION) {
-               decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]);
-       }
 
        Piece moved_piece = pos->moved_piece(move);
        std::string pretty;
@@ -98,7 +93,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        pretty = "O-O-O";
                }
        } else if (type_of(moved_piece) == PAWN) {
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        // Capture.
                        pretty = char('a' + file_of(from));
                        pretty += "x";
@@ -115,7 +110,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        // Remove all illegal moves to disambiguate.
                        Bitboard att_copy = attackers;
                        while (att_copy) {
-                               Square s = pop_lsb(&att_copy);
+                               Square s = pop_lsb(att_copy);
                                Move m = make_move(s, to);
                                if (!pos->pseudo_legal(m) || !pos->legal(m)) {
                                        attackers &= ~SquareBB[s];
@@ -135,7 +130,7 @@ void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
                        }
                }
 
-               if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+               if (type_of(move) == EN_PASSANT || pos->piece_on(to) != NO_PIECE) {
                        pretty += "x";
                }
 
@@ -228,23 +223,21 @@ void HashProbeThread::Shutdown() {
        server->Shutdown();
 }
 
-namespace PSQT {
-  void init();
-}
-
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
+  CommandLine::init(argc, argv);
   UCI::init(Options);
+  Tune::init();
   PSQT::init();
   Bitboards::init();
   Position::init();
   Bitbases::init();
-  Search::init();
-  Pawns::init();
-  Threads.set(Options["Threads"]);
+  Endgames::init();
+  Threads.set(size_t(Options["Threads"]));
   Search::clear(); // After threads are up
+  Eval::NNUE::init();
 
   UCI::loop(argc, argv);