checkpoint

Makefile

@@ -53,14 +53,14 @@ CPPFLAGS += -MD -MP -Isrc/common -DUSE_SSE4
 LDFLAGS  += -llzma -lpthread -lrt
 
 TARGETS         := $(addprefix bin/, aobaz autousi server playshogi crc64 extract net-test gencode ocldevs)
-AUTOUSI_BASES   := $(addprefix src/autousi/, autousi client play) $(addprefix src/common/, iobase option jqueue xzi err shogibase osi child nnet nnet-cpu nnet-ocl nnet-srv opencl)
+AUTOUSI_BASES   := $(addprefix src/autousi/, autousi client play) $(addprefix src/common/, iobase option jqueue xzi err shogibase osi child nnet nnet-cpu nnet-ocl nnet-srv opencli)
 SERVER_BASES    := $(addprefix src/server/, server listen datakeep logging) $(addprefix src/common/, iobase xzi jqueue err option shogibase osi)
 GENCODE_BASES   := src/gencode/gencode
-PLAYSHOGI_BASES := src/playshogi/playshogi $(addprefix src/common/, option err iobase xzi shogibase osi child nnet nnet-cpu nnet-ocl nnet-srv opencl)
+PLAYSHOGI_BASES := src/playshogi/playshogi $(addprefix src/common/, option err iobase xzi shogibase osi child nnet nnet-cpu nnet-ocl nnet-srv opencli)
 CRC64_BASES     := src/crc64/crc64 $(addprefix src/common/, xzi err iobase osi)
 EXTRACT_BASES   := src/extract/extract $(addprefix src/common/, xzi err iobase osi)
-OCLDEVS_BASES   := src/ocldevs/ocldevs src/common/err src/common/opencl
-NET_TEST_BASES  := src/net-test/net-test $(addprefix src/common/, nnet nnet-cpu nnet-ocl jqueue err iobase shogibase xzi osi option opencl)
+OCLDEVS_BASES   := src/ocldevs/ocldevs src/common/err src/common/opencli
+NET_TEST_BASES  := src/net-test/net-test $(addprefix src/common/, nnet nnet-cpu nnet-ocl jqueue err iobase shogibase xzi osi option opencli)
 BASES           := $(AUTOUSI_BASES) $(SERVER_BASES) $(GENCODE_BASES) $(PLAYSHOGI_BASES) $(CRC64_BASES) $(EXTRACT_BASES) $(OCLDEVS_BASES) $(NET_TEST_BASES)
 OBJS            := $(addsuffix .o, $(BASES))
 INC_OUT         := $(addprefix src/common/, tbl_zkey.inc tbl_board.inc tbl_sq.inc tbl_bmap.inc)

build-vs.bat

@@ -1,24 +1,61 @@
+@rem Uncomment if you want to enable assersions
+rem set ENABLE_ASSERT_AOBA=1
+
+@rem Uncomment if you want to use OpenCL
+set USE_OpenCL_AOBA=1
+
+@rem uncomment if you want to use IntelMKL
+rem set USE_CPUBLAS_AOBA=IntelMKL
+
+@rem uncomment if you want to use OpenBLAS
+set USE_CPUBLAS_AOBA=OpenBLAS
+
+@cd /d %~dp0
 @del /q *~ bin\*.dll bin\*.exe src\common\tbl_*.inc 2> nul
 @rmdir /s /q objs 2> nul
 @if "%~1" == "clean" (exit /b 0)
 @if "%~2" neq "" (echo Usage: %~n0 [clean] && exit /b 1)
-@set CXXFLAGS=/nologo /W4 /EHsc /Foobjs\ /Febin\ /Ox /fp:fast
-@set CPPFLAGS=/DUSE_SSE4 /DUSE_MKL /DUSE_WINAPI /DUSE_OPENCL_AOBA /DNDEBUG /Isrc\common /Iwin\include
-@set LDFLAGS=/link /LIBPATH:win\lib64
+
 @mkdir objs
 
-lib /nologo /machine:x64 /def:win\def\OpenCL.def /out:objs\OpenCL.lib
-@if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+@set CXXFLAGS=/nologo /W4 /EHsc /Foobjs\ /Febin\ /Ox /fp:fast
+@set CPPFLAGS=/DUSE_SSE4 /DUSE_WINAPI /Isrc\common /Iwin\include
+@set LDFLAGS=/link /LIBPATH:win\lib64 liblzma.lib
+@if "%ENABLE_ASSERT_AOBA%"=="1" (
+    set CPPFLAGS=%CPPFLAGS% /DDEBUG
+) else (
+  set CPPFLAGS=%CPPFLAGS% /DNDEBUG
+)
+@if "%USE_OpenCL_AOBA%"=="1" (
+    set CPPFLAGS=%CPPFLAGS% /DUSE_OPENCL_AOBA
+    set LDFLAGS=%LDFLAGS% objs\OpenCL.lib
+    lib /nologo /machine:x64 /def:win\def\OpenCL.def /out:objs\OpenCL.lib
+    @if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
+)
+@if "%USE_CPUBLAS_AOBA%"=="IntelMKL" (
+    set CPPFLAGS=%CPPFLAGS% /DUSE_MKL
+    set LDFLAGS=%LDFLAGS% mkl_intel_lp64.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib 
+    copy win\lib64\libiomp5md.dll bin\
+    @if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
+)
+@if "%USE_CPUBLAS_AOBA%"=="OpenBLAS" (
+    set CPPFLAGS=%CPPFLAGS% /DUSE_OPENBLAS
+    set LDFLAGS=%LDFLAGS% libopenblas.dll.a
+    copy win\lib64\libopenblas.dll bin\
+    copy win\lib64\libgcc_s_seh-1.dll bin\
+    copy win\lib64\libgfortran-3.dll bin\
+    copy win\lib64\libquadmath-0.dll bin\
+    @if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
+)
 
-copy win\lib64\libiomp5md.dll bin\
 cl %CPPFLAGS% %CXXFLAGS% src\gencode\gencode.cpp
-@if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+@if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
 
 bin\gencode
-@if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+@if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
 
-cl %CPPFLAGS% %CXXFLAGS% src\net-test\net-test.cpp src\common\opencl.cpp src\common\nnet.cpp src\common\nnet-cpu.cpp src\common\nnet-ocl.cpp src\common\err.cpp src\common\iobase.cpp src\common\shogibase.cpp src\common\xzi.cpp src\common\osi.cpp src\common\option.cpp %LDFLAGS% Ws2_32.lib liblzma.lib mkl_intel_lp64.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib objs\OpenCL.lib
-@if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+cl %CPPFLAGS% %CXXFLAGS% src\net-test\net-test.cpp src\common\opencli.cpp src\common\nnet.cpp src\common\nnet-cpu.cpp src\common\nnet-ocl.cpp src\common\err.cpp src\common\iobase.cpp src\common\shogibase.cpp src\common\xzi.cpp src\common\osi.cpp src\common\option.cpp Ws2_32.lib %LDFLAGS% 
+@if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)
 
-cl %CPPFLAGS% %CXXFLAGS% src\ocldevs\ocldevs.cpp src\common\err.cpp src\common\opencl.cpp %LDFLAGS% objs\OpenCL.lib
-@if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
+cl %CPPFLAGS% %CXXFLAGS% src\ocldevs\ocldevs.cpp src\common\err.cpp src\common\opencli.cpp %LDFLAGS%
+@if %ERRORLEVEL% neq 0 (exit /b %ERRORLEVEL%)

license.txt

@@ -4,37 +4,38 @@ AobaZero 1.0 Licensing
 Hiroshi Yamashita, Kunihito Hoki, and Yuki Kobayashi, 2019
 
 This package contains multiple programs. We recognize that bin/aobaz belongs
-to GPLv3. This program is a derivative of Leela Zero [1]. This program also
-contains CLBlast [2], OpenCL [3], and half [4].
+to GPLv3. This program is a derivative of Leela Zero [1] which contains
+CLBlast [2], OpenCL [3], and half [4].
 
-The other programs and scripts are basically in the public domain. However,
-to build Windows x64 binary, this package contains prerequisite programs
-OpenCL [3], liblzma [5] built by using Visual Studio Community 2017 [6], and
-from Intel Math Kernel Library [7] in win/. 
+The other programs and scripts are basically in the public domain. Please use
+the licensing statement of Unlicense (https://unlicense.org) if you require
+legal permission for the programs in public domain [5]. However, to build
+Windows x64 binary, this package contains prerequisite binaries liblzma [6]
+built by using Visual Studio Community 2017 [7], OpenBLAS [8] built by
+MinGW-w64 [9], and from Intel Math Kernel Library [10] in win/.
 
 This package contains part of source code from Leela Zero in
 src/usi_engine/ [1], from CLBlast in src/usi_engine/kernels/clblast/ [2],
 from OpenCL in src/usi_engine/CL/ and win/include/CL/ [3], from half in
-src/usi_engine/half [4], from liblzma in win/include and win/lib64 [5] built
-by using Visual Studio Community 2017 [6], and from Intel Math Kernel Library
-in win/ [7]. We place detailed license information under the directory
-licenses/.
+src/usi_engine/half [4], and from liblzma in win/include [6]. We place
+detailed license information under the directory licenses/.
 
-Please use the licensing statement of Unlicense (https://unlicense.org)
-if you require legal permission for the programs in public domain [8].
 
-[1] Gian-Carlo Pascutto et al., Leela Zero, http://zero.sjeng.org/home/,
+[ 1] Gian-Carlo Pascutto et al., Leela Zero, http://zero.sjeng.org/home/,
 2019 (last access).
-[2] Cedric Nugteren et al., CLBlast, https://github.com/cnugteren/clblast/,
+[ 2] Cedric Nugteren et al., CLBlast, https://github.com/cnugteren/clblast/,
 2019 (last access).
-[3] The Khronos Group Inc., OpenCL, https://www.khronos.org/opencl/, 2019
+[ 3] The Khronos Group Inc., OpenCL, https://www.khronos.org/opencl/, 2019
 (last access).
-[4] Christian Rau, half - IEEE 754-based half-precision floating point
+[ 4] Christian Rau, half - IEEE 754-based half-precision floating point
 library, http://half.sourceforge.net/, 2019 (last access).
-[5] Lasse Collin, XZ Utils, https://tukaani.org/xz/, 2019 (last access).
-[6] Microsoft Corporation, Microsoft Visual Studio Community 2017
+[ 5] Unlicense.org, Unlicense Yourself: Set Your Code Free,
+https://unlicense.org/, 2019 (last access).
+[ 6] Lasse Collin, XZ Utils, https://tukaani.org/xz/, 2019 (last access).
+[ 7] Microsoft Corporation, Microsoft Visual Studio Community 2017
 distributable, https://visualstudio.microsoft.com/license-terms/mlt553321/,
 2019 (last access).
-[7] Intel Corporation, LICENSE FAQ, https://software.intel.com/en-us/mkl/license-faq
-[8] Unlicense.org, Unlicense Yourself: Set Your Code Free,
-https://unlicense.org/, 2019 (last access).
+[ 8] OpenBLAS v0.2.19, https://www.openblas.net/, 2020 (last access).
+[ 9] MinGW-w64, http://mingw-w64.org/doku.php, 2020 (last access).
+[10] Intel Corporation, LICENSE FAQ,
+https://software.intel.com/en-us/mkl/license-faq, 2019 (last access).

licenses/mingw.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2012 MinGW.org project
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice, this permission notice and the below disclaimer
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

licenses/openblas.txt

@@ -0,0 +1,29 @@
+Copyright (c) 2011-2014, The OpenBLAS Project
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+   3. Neither the name of the OpenBLAS project nor the names of 
+      its contributors may be used to endorse or promote products 
+      derived from this software without specific prior written 
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/common/nnet-ipc.cpp

@@ -1,5 +1,8 @@
 // 2019 Team AobaZero
 // This source code is in the public domain.
+#ifdef _MSC_VER
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
 #include "err.hpp"
 #include "nnet-ipc.hpp"
 #include "param.hpp"

src/common/nnet-ocl.hpp

@@ -2,7 +2,7 @@
 // This source code is in the public domain.
 #pragma once
 #include "nnet.hpp"
-#include "opencl.hpp"
+#include "opencli.hpp"
 #include <string>
 #include <utility>
 #include <vector>

src/common/nnet-srv.cpp

@@ -1,5 +1,8 @@
 // 2019 Team AobaZero
 // This source code is in the public domain.
+#ifdef _MSC_VER
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
 #include "err.hpp"
 #include "nnet-cpu.hpp"
 #include "nnet-ocl.hpp"

src/common/opencl.cpp → src/common/opencli.cpp

@@ -1,6 +1,6 @@
 #if defined(USE_OPENCL_AOBA)
 #include "err.hpp"
-#include "opencl.hpp"
+#include "opencli.hpp"
 #include <memory>
 #include <mutex>
 #include <sstream>

src/common/osi.cpp

@@ -133,7 +133,7 @@ class OSI::mmap_impl {
       if (GetLastError() == ERROR_ALREADY_EXISTS)
 	die(ERR_INT("The file mapping object (name: %s) exists.", name)); }
     else {
-      _h = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, name);
+      _h = OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, name);
       if (_h == nullptr) 
 	die(ERR_INT("OpenFileMapping() failed: %s", LastErr().get())); }
 
@@ -192,7 +192,7 @@ class OSI::cp_impl {
     PROCESS_INFORMATION pi; 
     ZeroMemory(&pi, sizeof(pi));
 
-    STARTUPINFO si;
+    STARTUPINFOA si;
     ZeroMemory(&si, sizeof(si));
     si.cb         = sizeof(si); 
     si.hStdError  = h_err_wr;
@@ -207,7 +207,7 @@ class OSI::cp_impl {
     strcpy(line, argv[0]);
     for (int i = 1; argv[i]; ++i) { strcat(line, " "); strcat(line, argv[i]); }
 
-    if (!CreateProcess(nullptr, line, nullptr, nullptr, TRUE,
+    if (!CreateProcessA(nullptr, line, nullptr, nullptr, TRUE,
 		       CREATE_NEW_PROCESS_GROUP, nullptr, nullptr, &si, &pi))
       die(ERR_INT("CreateProcess() failed: %s", LastErr().get()));
 
@@ -248,7 +248,7 @@ class OSI::cp_impl {
 };
 
 class OSI::Dir_impl {
-  WIN32_FIND_DATA _ffd;
+  WIN32_FIND_DATAA _ffd;
   HANDLE _hfind;
   bool _is_first, _is_end;
 

src/net-test/net-test.cpp

@@ -193,10 +193,7 @@ class Entry {
   uint get_n_one() const noexcept { return _n_one; }
   uint get_size_nnmove() const noexcept { return _size_nnmove; }
   uint get_no() const noexcept { return _no; }
-  bool ok() const noexcept {
-    if (_size_nnmove == _policy_answers.size()) return true;
-    cout << _size_nnmove << endl;
-    cout << _policy_answers.size() << endl; }
+  bool ok() const noexcept { return _size_nnmove == _policy_answers.size(); }
   void compare(const float *probs, float value) const noexcept {
     assert(probs);
 

src/ocldevs/ocldevs.cpp

@@ -2,7 +2,7 @@
 // This source code is in the public domain.
 #if defined(USE_OPENCL_AOBA)
 #include "err.hpp"
-#include "opencl.hpp"
+#include "opencli.hpp"
 #include <exception>
 #include <iostream>
 #include <memory>

src/usi-engine/OpenCLScheduler.cpp

@@ -47,7 +47,7 @@ using std::chrono::steady_clock;
 using std::chrono::duration_cast;
 using std::chrono::microseconds;
 static double elapsed_sum = 0.0;
-static uint nelapsed      = 0;
+static unsigned int nelapsed      = 0;
 const int fCalcNetTime = 0;
 
 

src/usi-engine/bona/yss_net.cpp

@@ -56,8 +56,8 @@ bool fUseLeelaZeroOpenCL = false;	// only for test.
 #endif
 
 #ifdef NN_PARALLEL
-#include "nnet-srv.hpp"
-#include "nnet-ipc.hpp"
+#include "../../common/nnet-srv.hpp"
+#include "../../common/nnet-ipc.hpp"
 
 using std::copy_n;
 

src/usi-engine/msvc/VS2017/leela-zero.vcxproj

@@ -19,6 +19,8 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\common\nnet-ipc.hpp" />
+    <ClInclude Include="..\..\..\common\nnet-srv.hpp" />
     <ClInclude Include="..\..\bona\bitop.h" />
     <ClInclude Include="..\..\bona\dfpn.h" />
     <ClInclude Include="..\..\bona\lock.h" />
@@ -65,7 +67,7 @@
     <ClCompile Include="..\..\..\common\nnet-ocl.cpp" />
     <ClCompile Include="..\..\..\common\nnet-srv.cpp" />
     <ClCompile Include="..\..\..\common\nnet.cpp" />
-    <ClCompile Include="..\..\..\common\opencl.cpp" />
+    <ClCompile Include="..\..\..\common\opencli.cpp" />
     <ClCompile Include="..\..\..\common\osi.cpp" />
     <ClCompile Include="..\..\..\common\shogibase.cpp" />
     <ClCompile Include="..\..\..\common\xzi.cpp" />
@@ -132,7 +134,7 @@
     <ProjectGuid>{7B887BFE-8D2C-46CD-B139-5213434BF218}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>leelazero</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
     <ProjectName>aoba-zero</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -248,9 +250,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MINIMUM;TLP;CSA_LAN;USI;YSS_ZERO;NO_LOGGING;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_OPENBLAS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MINIMUM;TLP;CSA_LAN;USI;YSS_ZERO;NO_LOGGING;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_WINAPI;USE_OPENBLAS</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\..\win\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\common;..\..\..\..\win\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

src/usi-engine/msvc/VS2017/leela-zero.vcxproj.filters

@@ -129,6 +129,12 @@
     <ClInclude Include="..\..\bona\yss_var.h">
       <Filter>Source Files\bona</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\common\nnet-srv.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\nnet-ipc.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\GTP.cpp">
@@ -323,9 +329,6 @@
     <ClCompile Include="..\..\..\common\nnet-srv.cpp">
       <Filter>Source Files\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\common\opencl.cpp">
-      <Filter>Source Files\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\common\osi.cpp">
       <Filter>Source Files\common</Filter>
     </ClCompile>
@@ -335,6 +338,9 @@
     <ClCompile Include="..\..\..\common\xzi.cpp">
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\common\opencli.cpp">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />