LeelaChessZero
diff --git a/‎build_rescorer.cmd
+35 b/‎build_rescorer.cmd
+35
diff --git a/‎meson.build
+45-27 b/‎meson.build
+45-27
diff --git a/‎meson_options.txt
+11-1 b/‎meson_options.txt
+11-1
diff --git a/‎src/chess/bitboard.cc
+18 b/‎src/chess/bitboard.cc
+18
diff --git a/‎src/chess/bitboard.h
+3 b/‎src/chess/bitboard.h
+3
diff --git a/‎src/mcts/search.cc
+1-1 b/‎src/mcts/search.cc
+1-1
@@ -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,37 @@ 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/syzygy/syzygy.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 +195,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,23 +211,9 @@ files += [
   'src/selfplay/game.cc',
   'src/selfplay/loop.cc',
   'src/selfplay/tournament.cc',
-  'src/syzygy/syzygy.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')
 
@@ -219,9 +223,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
 
 #############################################################################
@@ -639,7 +643,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.
@@ -694,8 +698,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')
@@ -344,4 +344,22 @@ uint16_t Move::as_nn_index(int transform) const {
   return transformed.as_nn_index(0);
 }
 
+Move MoveFromNNIndex(int idx, int transform) {
+  Move m = kIdxToMove[idx];
+  if (transform == 0) {
+    return m;
+  }
+  int inv_transform;
+  if (transform & TransposeTransform) {
+    inv_transform = TransposeTransform;
+    if (transform & FlipTransform) inv_transform |= MirrorTransform;
+    if (transform & MirrorTransform) inv_transform |= FlipTransform;
+  } else {
+    inv_transform = transform;
+  }
+  m.SetTo(Transform(m.to(), inv_transform));
+  m.SetFrom(Transform(m.from(), inv_transform));
+  return m;
+}
+
 }  // namespace lczero
@@ -298,4 +298,7 @@ class Move {
 
 using MoveList = std::vector<Move>;
 
+// Gets the move from the NN move index, undoing the given transform.
+Move MoveFromNNIndex(int idx, int transform);
+
 }  // namespace lczero
@@ -66,7 +66,7 @@ MoveList MakeRootMoveFilter(const MoveList& searchmoves,
   }
   if (syzygy_tb->root_probe(
           history.Last(), fast_play || history.DidRepeatSinceLastZeroingMove(),
-          &root_moves)) {
+          false, &root_moves)) {
     *dtz_success = true;
     tb_hits->fetch_add(1, std::memory_order_acq_rel);
   } else if (syzygy_tb->root_probe_wdl(history.Last(), &root_moves)) {
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ MoveList MakeRootMoveFilter(const MoveList& searchmoves,`
`66`	`66`	`}`
`67`	`67`	`if (syzygy_tb->root_probe(`
`68`	`68`	`history.Last(), fast_play \|\| history.DidRepeatSinceLastZeroingMove(),`
`69`		`- &root_moves)) {`
	`69`	`+ false, &root_moves)) {`
`70`	`70`	`*dtz_success = true;`
`71`	`71`	`tb_hits->fetch_add(1, std::memory_order_acq_rel);`
`72`	`72`	`} else if (syzygy_tb->root_probe_wdl(history.Last(), &root_moves)) {`