fix memory leakage in vSum cache; remove mix6q

[skip_fishtest]
dhbloo · Feb 24, 2024 · 84906f4 · 84906f4
1 parent 3895b2e
commit 84906f4
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 921 deletions.
diff --git a/Rapfi/CMakeLists.txt b/Rapfi/CMakeLists.txt
@@ -48,7 +48,6 @@ set(CORE_SOURCES
     eval/eval.cpp
     eval/evaluator.cpp
     eval/mix6nnue.cpp
-    eval/mix6Qnnue.cpp
     eval/mix7nnue.cpp
     eval/mix8nnue.cpp
     eval/nnuev2.cpp
@@ -106,7 +105,6 @@ set(HEADERS
     eval/eval.h
     eval/evaluator.h
     eval/mix6nnue.h
-    eval/mix6Qnnue.h
     eval/mix7nnue.h
     eval/mix8nnue.h
     eval/nnuev2.h

diff --git a/Rapfi/config.cpp b/Rapfi/config.cpp
@@ -24,7 +24,6 @@
 #include "database/dbstorage.h"
 #include "database/yxdbstorage.h"
 #include "eval/evaluator.h"
-#include "eval/mix6Qnnue.h"
 #include "eval/mix6nnue.h"
 #include "eval/mix7nnue.h"
 #include "eval/mix8nnue.h"
@@ -599,20 +598,6 @@ void Config::readEvaluator(const cpptoml::table &t)
             },
             true));
     }
-    else if (*evaluatorType == "mix6qnnue") {
-        int alignBoardSize = t.get_as<int>("align_board_size").value_or(0);
-
-        Search::Threads.setupEvaluator(warpEvaluatorMaker([=](int                   boardSize,
-                                                              Rule                  rule,
-                                                              std::filesystem::path weightPath,
-                                                              const cpptoml::table &weightCfg) {
-            return std::make_unique<Evaluation::mix6q::Mix6QEvaluator>(
-                boardSize,
-                rule,
-                weightPath,
-                weightCfg.get_as<int>("align_board_size").value_or(alignBoardSize));
-        }));
-    }
     else if (*evaluatorType == "mix7nnue") {
         int alignBoardSize = t.get_as<int>("align_board_size").value_or(0);