Merge from head fork

.gitignore

@@ -8,3 +8,5 @@ training/tf/venv
 leelaz-model*
 *.orig
 leelaz_opencl_tuning
+/build-autogtp-*
+/build-validation-*

.travis.yml

@@ -14,9 +14,6 @@ jobs:
       script:
       - docker build -f Dockerfiles/Dockerfile.gpu -t leela-zero:gpu .
       - docker run leela-zero:gpu
-    - script:
-      - docker build -f Dockerfiles/Dockerfile.gpu-half -t leela-zero:gpu-half .
-      - docker run leela-zero:gpu-half
     - script:
       - docker build -f Dockerfiles/Dockerfile.cpu -t leela-zero:cpu .
       - docker run leela-zero:cpu

CMakeLists.txt

@@ -135,3 +135,21 @@ target_link_libraries(tests ${BLAS_LIBRARIES})
 target_link_libraries(tests ${OpenCL_LIBRARIES})
 target_link_libraries(tests ${ZLIB_LIBRARIES})
 target_link_libraries(tests gtest_main ${CMAKE_THREAD_LIBS_INIT})
+
+include(GetGitRevisionDescription)
+git_describe(VERSION --tags)
+string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" MAJOR_VERSION "${VERSION}")
+string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" MINOR_VERSION "${VERSION}")
+
+SET(CPACK_GENERATOR "DEB")
+SET(CPACK_DEBIAN_PACKAGE_NAME "leelaz")
+SET(CPACK_DEBIAN_PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
+SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Gian-Carlo Pascutto https://github.com/gcp/leela-zero")
+SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Go engine with no human-provided knowledge, modeled after the AlphaGo Zero paper.")
+SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+SET(CPACK_DEBIAN_PACKAGE_SECTION "games")
+SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}")
+
+INCLUDE(CPack)

README.md

@@ -142,9 +142,19 @@ The engine supports the [GTP protocol, version 2](https://www.lysator.liu.se/~gu
 Leela Zero is not meant to be used directly. You need a graphical interface
 for it, which will interface with Leela Zero through the GTP protocol.
 
+[Lizzie](https://github.com/featurecat/lizzie/releases) is a client specifically
+for Leela Zero which shows live search probilities, a win rate graph, and has
+an automatic game analysis mode. Has binaries for Windows, Mac, and Linux.
+
 [Sabaki](http://sabaki.yichuanshen.de/) is a very nice looking GUI with GTP 2
-capability. It should work with this engine. A lot of go software can
-interface to an engine via GTP, so look around.
+capability.
+
+[LeelaSabaki](https://github.com/SabakiHQ/LeelaSabaki) is modified to
+show variations and winning statistics in the game tree, as well as a heatmap
+on the game board.
+
+A lot of go software can interface to an engine via GTP,
+so look around.
 
 Add the --gtp commandline option on the engine command line to enable Leela
 Zero's GTP support. You will need a weights file, specify that with the -w option.
@@ -281,11 +291,14 @@ If interrupted, training can be resumed with:
 
 # Todo
 
-- [ ] List of package names for more distros
-- [ ] Multi-GPU support for training
-- [ ] Optimize Winograd transformations
-- [ ] CUDA specific version using cuDNN
-- [ ] AMD specific version using MIOpen
+- [ ] Optimize Winograd transformations.
+- [ ] Implement GPU batching.
+- [ ] Parameter setting over GTP.
+- More backends:
+- [ ] Eigen based BLAS backend.
+- [ ] MKL-DNN based backend.
+- [ ] CUDA specific version using cuDNN.
+- [ ] AMD specific version using MIOpen.
 
 # Related links
 

autogtp/.gitignore

@@ -5,6 +5,7 @@
 /*.gz
 /moc_*.cpp
 /moc_*.h
+/autogtp.pro.user
 
 # Weight files
 /[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]*[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]

autogtp/Game.cpp

@@ -20,13 +20,15 @@
 #include <QFile>
 #include <QTextStream>
 #include <QRegularExpression>
+#include <QFileInfo>
 #include "Game.h"
 
-Game::Game(const QString& weights, const QString& opt, const QString& binary) :
+Game::Game(const QString& weights, const QString& opt, const QString& binary,
+           const QStringList& commands) :
     QProcess(),
     m_cmdLine(""),
     m_binary(binary),
-    m_timeSettings("time_settings 0 1 0"),
+    m_commands(commands),
     m_resignation(false),
     m_blackToMove(true),
     m_blackResigned(false),
@@ -36,6 +38,9 @@ Game::Game(const QString& weights, const QString& opt, const QString& binary) :
 #ifdef WIN32
     m_binary.append(".exe");
 #endif
+    if (!QFileInfo::exists(m_binary)) {
+        m_binary.remove(0, 2); // ./leelaz -> leelaz
+    }
     m_cmdLine = m_binary + " " + opt + " " + weights;
     m_fileName = QUuid::createUuid().toRfc4122().toHex();
 }
@@ -175,8 +180,15 @@ bool Game::gameStart(const VersionTuple &min_version) {
     // check any return values.
     checkVersion(min_version);
     QTextStream(stdout) << "Engine has started." << endl;
-    sendGtpCommand(m_timeSettings);
-    QTextStream(stdout) << "Infinite thinking time set." << endl;
+    for (auto command : m_commands) {
+        QTextStream(stdout) << command << endl;
+        if (!sendGtpCommand(command))
+        {
+            QTextStream(stdout) << "GTP failed on: " << command << endl;
+            exit(EXIT_FAILURE);
+        }
+    }
+    QTextStream(stdout) << "Thinking time set." << endl;
     return true;
 }
 

autogtp/Game.h

@@ -28,7 +28,8 @@ class Game : QProcess {
 public:
     Game(const QString& weights,
          const QString& opt,
-         const QString& binary = QString("./leelaz"));
+         const QString& binary = QString("./leelaz"),
+         const QStringList& commands = QStringList("time_settings 0 1 0"));
     ~Game() = default;
     bool gameStart(const VersionTuple& min_version);
     void move();
@@ -69,7 +70,7 @@ class Game : QProcess {
     };
     QString m_cmdLine;
     QString m_binary;
-    QString m_timeSettings;
+    QStringList m_commands;
     QString m_winner;
     QString m_fileName;
     QString m_moveDone;

autogtp/Job.cpp

@@ -67,7 +67,7 @@ Job(gpu, parent)
 
 Result ProductionJob::execute(){
     Result res(Result::Error);
-    Game game("networks/" + m_network, m_option);
+    Game game("networks/" + m_network + ".gz", m_option);
     if (!game.gameStart(m_leelazMinVersion)) {
         return res;
     }
@@ -131,7 +131,7 @@ void ProductionJob::init(const Order &o) {
 
 Result ValidationJob::execute(){
     Result res(Result::Error);
-    Game first("networks/" + m_firstNet,  m_option);
+    Game first("networks/" + m_firstNet + ".gz",  m_option);
     if (!first.gameStart(m_leelazMinVersion)) {
         return res;
     }
@@ -140,7 +140,7 @@ Result ValidationJob::execute(){
         first.setMovesCount(m_moves);
         QFile::remove(m_sgfFirst + ".sgf");
     }
-    Game second("networks/" + m_secondNet, m_option);
+    Game second("networks/" + m_secondNet + ".gz", m_option);
     if (!second.gameStart(m_leelazMinVersion)) {
         return res;
     }