Merge commit '9032c6cbe74ccf7e8963755501e7e6cc473ae471' into cluster

This is a rather involved merge, since the cluster changes interact
fairly badly with the refactoring we're merging:

The new code wants the search to know nothing at all about the UCI protocol,
it just calls a callback with some worker information (including a Position),
which then transforms that information into a InfoFull which is then sent
through another callback, upon which UCIEngine converts it to UCI and writes
it to stdout.

On the other hand, the MPI information wants to exchange PVs between workers
at this point, and it wants to use the UCI string as the primary medium of
exchange. Position is a lot of work to serialize, so we choose a middle road;
we capture the InfoFull by switching out the callback, serializes it, does the
MPI exchange on that, unserializes it and then continues with the print callback
(if there is new information).

src/cluster.cpp

@@ -387,7 +387,7 @@ void save(TranspositionTable& TT,
 /// Picks the bestMove across ranks, and send the associated info and PV to the root of the cluster.
 /// Note that this bestMove and PV must be output by the root, the guarantee proper ordering of output.
 /// TODO update to the scheme in master.. can this use aggregation of votes?
-void pick_moves(MoveInfo& mi, std::string& PVLine) {
+void pick_moves(MoveInfo& mi, std::vector<std::vector<char>>& serializedInfo) {
 
     MoveInfo* pMoveInfo = NULL;
     if (is_root())
@@ -427,21 +427,33 @@ void pick_moves(MoveInfo& mi, std::string& PVLine) {
     // Send PV line to root as needed
     if (mi.rank != 0 && mi.rank == rank())
     {
-        int               size;
-        std::vector<char> vec;
-        vec.assign(PVLine.begin(), PVLine.end());
-        size = vec.size();
-        MPI_Send(&size, 1, MPI_INT, 0, 42, MoveComm);
-        MPI_Send(vec.data(), size, MPI_CHAR, 0, 42, MoveComm);
+        int numLines = serializedInfo.size();
+        MPI_Send(&numLines, 1, MPI_INT, 0, 42, MoveComm);
+
+        for (const auto& serializedInfoOne : serializedInfo)
+        {
+            int size;
+            size = serializedInfoOne.size();
+            MPI_Send(&size, 1, MPI_INT, 0, 42, MoveComm);
+            MPI_Send(serializedInfoOne.data(), size, MPI_CHAR, 0, 42, MoveComm);
+        }
     }
     if (mi.rank != 0 && is_root())
     {
-        int               size;
-        std::vector<char> vec;
-        MPI_Recv(&size, 1, MPI_INT, mi.rank, 42, MoveComm, MPI_STATUS_IGNORE);
-        vec.resize(size);
-        MPI_Recv(vec.data(), size, MPI_CHAR, mi.rank, 42, MoveComm, MPI_STATUS_IGNORE);
-        PVLine.assign(vec.begin(), vec.end());
+        serializedInfo.clear();
+
+        int numLines;
+        MPI_Recv(&numLines, 1, MPI_INT, mi.rank, 42, MoveComm, MPI_STATUS_IGNORE);
+
+        for (int i = 0; i < numLines; ++i)
+        {
+            int               size;
+            std::vector<char> vec;
+            MPI_Recv(&size, 1, MPI_INT, mi.rank, 42, MoveComm, MPI_STATUS_IGNORE);
+            vec.resize(size);
+            MPI_Recv(vec.data(), size, MPI_CHAR, mi.rank, 42, MoveComm, MPI_STATUS_IGNORE);
+            serializedInfo.push_back(std::move(vec));
+        }
     }
 }