official-pikafish
diff --git a/‎build_rescorer.cmd
+35 b/‎build_rescorer.cmd
+35
diff --git a/‎meson.build
+44-26 b/‎meson.build
+44-26
diff --git a/‎meson_options.txt
+11-1 b/‎meson_options.txt
+11-1
diff --git a/‎src/main.cc
+2-5 b/‎src/main.cc
+2-5
@@ -0,0 +1,35 @@
+@echo off
+setlocal
+
+echo Deleting build directory:
+rd /s build
+
+set CC=cl
+set CXX=cl
+set CC_LD=link
+set CXX_LD=link
+
+if exist "C:\Program Files\Microsoft Visual Studio\2022" (
+  where /q cl
+  if errorlevel 1 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  set backend=vs2022
+) else if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019" (
+  where /q cl
+  if errorlevel 1 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  set backend=vs2019
+) else (
+  where /q cl
+  if errorlevel 1 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  set backend=vs2017
+)
+
+meson build --backend %backend% --buildtype release -Drescorer=true -Dlc0=false -Dgtest=false -Ddefault_library=static
+
+if errorlevel 1 exit /b
+
+pause
+
+cd build
+
+msbuild /m /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=true ^
+/p:PreferredToolArchitecture=x64 rescorer.sln /filelogger
@@ -16,7 +16,7 @@
 
 project('lc0', 'cpp',
         default_options : ['cpp_std=c++17', 'b_ndebug=if-release', 'warning_level=3', 'b_lto=true', 'b_vscrt=mt'],
-        meson_version: '>=0.54')
+        meson_version: '>=0.55')
 
 cc = meson.get_compiler('cpp')
 
@@ -57,6 +57,7 @@ endif
 
 # Files to compile.
 deps = []
+common_files = []
 files = []
 includes = []
 has_backends = false
@@ -95,7 +96,7 @@ pb_files = [
   gen.process('libs/lczero-common/proto/net.proto',
     preserve_path_from : meson.current_source_dir() + '/libs/lczero-common/')
 ]
-files += pb_files
+common_files += pb_files
 
 # Extract git short revision.
 short_rev = 'unknown'
@@ -152,18 +153,36 @@ files += gen_proto_src.process('src/neural/onnx/onnx.proto',
 #############################################################################
 ## Main files
 #############################################################################
-files += [
-  'src/benchmark/backendbench.cc',
-  'src/benchmark/benchmark.cc',
+common_files += [
   'src/chess/bitboard.cc',
   'src/chess/board.cc',
   'src/chess/position.cc',
   'src/chess/uciloop.cc',
+  'src/mcts/node.cc',
+  'src/neural/decoder.cc',
+  'src/neural/encoder.cc',
+  'src/trainingdata/reader.cc',
+  'src/trainingdata/trainingdata.cc',
+  'src/trainingdata/writer.cc',
+  'src/utils/commandline.cc',
+  'src/utils/configfile.cc',
+  'src/utils/esc_codes.cc',
+  'src/utils/files.cc',
+  'src/utils/logging.cc',
+  'src/utils/optionsdict.cc',
+  'src/utils/optionsparser.cc',
+  'src/utils/random.cc',
+  'src/utils/string.cc',
+  'src/version.cc',
+]
+
+files += [
+  'src/benchmark/backendbench.cc',
+  'src/benchmark/benchmark.cc',
   'src/engine.cc',
   'src/lc0ctl/describenet.cc',
   'src/lc0ctl/leela2onnx.cc',
-  'src/lc0ctl/onnx2leela.cc',  
-  'src/mcts/node.cc',
+  'src/lc0ctl/onnx2leela.cc',
   'src/mcts/params.cc',
   'src/mcts/search.cc',
   'src/mcts/stoppers/alphazero.cc',
@@ -175,8 +194,6 @@ files += [
   'src/mcts/stoppers/stoppers.cc',
   'src/mcts/stoppers/timemgr.cc',
   'src/neural/cache.cc',
-  'src/neural/decoder.cc',
-  'src/neural/encoder.cc',
   'src/neural/factory.cc',
   'src/neural/loader.cc',
   'src/neural/network_check.cc',
@@ -193,22 +210,9 @@ files += [
   'src/selfplay/game.cc',
   'src/selfplay/loop.cc',
   'src/selfplay/tournament.cc',
-  'src/trainingdata/reader.cc',
-  'src/trainingdata/trainingdata.cc',
-  'src/trainingdata/writer.cc',
-  'src/utils/commandline.cc',
-  'src/utils/configfile.cc',
-  'src/utils/esc_codes.cc',
-  'src/utils/files.cc',
   'src/utils/histogram.cc',
-  'src/utils/logging.cc',
   'src/utils/numa.cc',
-  'src/utils/optionsdict.cc',
-  'src/utils/optionsparser.cc',
-  'src/utils/random.cc',
-  'src/utils/string.cc',
   'src/utils/weights_adapter.cc',
-  'src/version.cc',
 ]
 includes += include_directories('src')
 
@@ -218,9 +222,9 @@ deps += dependency('threads')
 ## Platform specific files
 ############################################################################
 if host_machine.system() == 'windows'
-  files += 'src/utils/filesystem.win32.cc'
+  common_files += 'src/utils/filesystem.win32.cc'
 else
-  files += 'src/utils/filesystem.posix.cc'
+  common_files += 'src/utils/filesystem.posix.cc'
 endif
 
 #############################################################################
@@ -642,7 +646,7 @@ if get_option('build_backends')
 
 endif # if get_option('build_backends')
 
-if not has_backends and get_option('build_backends')
+if not has_backends and get_option('lc0') and get_option('build_backends')
   error('''
 
         No usable computation backends (cudnn/opencl/blas/etc) enabled.
@@ -697,8 +701,22 @@ if get_option('embed')
   add_project_arguments('-DEMBED', language : 'cpp')
 endif
 
-executable('lc0', 'src/main.cc',
+if get_option('lc0')
+  files += common_files
+  executable('lc0', 'src/main.cc',
        files, include_directories: includes, dependencies: deps, install: true)
+endif
+
+#############################################################################
+## Rescorer Executable
+#############################################################################
+
+if get_option('rescorer')
+  deps += subproject('gaviotatb').get_variable('gaviotatb_dep')
+  executable('rescorer', 'src/rescorer_main.cc',
+       [common_files, 'src/rescorer/rescoreloop.cc'],
+       include_directories: includes, dependencies: deps, install: true)
+endif
 
 #############################################################################
 ## Tests
 
@@ -191,4 +191,14 @@ option('onnx_include',
 option('xla',
        type: 'boolean',
        value: false,
-       description: 'Enable XLA backend')
+       description: 'Enable XLA backend')
+
+option('lc0',
+       type: 'boolean',
+       value: true,
+       description: 'Build Lc0')
+
+option('rescorer',
+       type: 'boolean',
+       value: false,
+       description: 'Build rescorer')
@@ -45,7 +45,7 @@ int main(int argc, const char** argv) {
   CERR << EscCodes::Bold() << EscCodes::Red()
        <<   " _    _";
   CERR << R"(|_|\/| |)";
-  CERR << R"(|  /\|_|)"<< EscCodes::Reset() << " v" << GetVersionStr()
+  CERR << R"(|  /\|_|)" << EscCodes::Reset() << " v" << GetVersionStr()
        << " built " << __DATE__;
 
   try {
@@ -65,10 +65,7 @@ int main(int argc, const char** argv) {
     CommandLine::RegisterMode("describenet",
                               "Shows details about the Leela network.");
 
-    if (CommandLine::ConsumeCommand("leela2plain")) {
-      ConvertLoop loop;
-      loop.RunLoop();
-    } else if (CommandLine::ConsumeCommand("selfplay")) {
+    if (CommandLine::ConsumeCommand("selfplay")) {
       // Selfplay mode.
       SelfPlayLoop loop;
       loop.RunLoop();