When returning gRPC probes, report scores from white's perspective.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 8cdf9e6f895b4e2b863260e29b2cab10fc13ed92..33a8f523da763ba9b8347e51962d0b3f350072ba 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,6 +2,7 @@
   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
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,9 +19,9 @@
 */
 
 #include <iostream>
+#include <thread>
 
 #include "bitboard.h"
-#include "evaluate.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -28,22 +29,89 @@
 #include "uci.h"
 #include "syzygy/tbprobe.h"
 
+#include <grpc/grpc.h>
+#include <grpc++/server.h>
+#include <grpc++/server_builder.h>
+#include "hashprobe.grpc.pb.h"
+
+using grpc::Server;
+using grpc::ServerBuilder;
+using grpc::ServerContext;
+using grpc::Status;
+using grpc::StatusCode;
+
+class HashProbeImpl final : public HashProbe::Service {
+public:
+       Status Probe(ServerContext* context,
+                    const HashProbeRequest* request,
+                    HashProbeResponse *response) {
+               Position pos(request->fen(), /*isChess960=*/false, Threads.main());
+               if (!pos.pos_is_ok()) {
+                       return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
+               }
+               bool found;
+               TTEntry *entry = TT.probe(pos.key(), found);
+               response->set_found(found);
+               if (found) {
+                       Value value = entry->value();
+                       Value eval = entry->eval();
+                       Bound bound = entry->bound();
+
+                       if (pos.side_to_move() == BLACK) {
+                               value = -value;
+                               eval = -eval;
+                               if (bound == BOUND_UPPER) {
+                                       bound = BOUND_LOWER;
+                               } else if (bound == BOUND_LOWER) {
+                                       bound = BOUND_UPPER;
+                               }
+                       }
+
+                       response->set_move(entry->move());
+                       response->set_depth(entry->depth());
+                       response->set_eval(eval);
+                       response->set_value(value);
+                       response->set_bound(HashProbeResponse::ValueBound(bound));
+               }
+               return Status::OK;
+       }
+};
+       
+void rpc_thread()
+{
+       std::string server_address("0.0.0.0:50051");
+       HashProbeImpl service;
+
+       ServerBuilder builder;
+       builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+       builder.RegisterService(&service);
+       std::unique_ptr<Server> server(builder.BuildAndStart());
+       std::cout << "Server listening on " << server_address << std::endl;
+       server->Wait();
+}
+
+namespace PSQT {
+  void init();
+}
+
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
   UCI::init(Options);
+  PSQT::init();
   Bitboards::init();
   Position::init();
   Bitbases::init();
   Search::init();
-  Eval::init();
   Pawns::init();
-  Threads.init();
-  Tablebases::init(Options["SyzygyPath"]);
-  TT.resize(Options["Hash"]);
+  Threads.set(Options["Threads"]);
+  Search::clear(); // After threads are up
+
+  std::thread(&rpc_thread).detach();
 
   UCI::loop(argc, argv);
 
-  Threads.exit();
+  Threads.set(0);
+  return 0;
 }