NNUE namespace cleanup

Disservin · vondele · commit af4b62a593cc · 2023-03-19T11:27:15.000+01:00
This patch moves the nnue namespace in the appropiate header that correspondes with the definition. It also makes navigation a bit easier. closes #4445 No functional change
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -36,7 +36,7 @@
 #include "timeman.h"
 #include "uci.h"
 #include "incbin/incbin.h"
-
+#include "nnue/evaluate_nnue.h"
 
 // Macro to embed the default efficiently updatable neural network (NNUE) file
 // data in the engine binary (using incbin.h, by Dale Weiler).
@@ -95,7 +95,7 @@ namespace Eval {
             if (directory != "<internal>")
             {
                 ifstream stream(directory + eval_file, ios::binary);
-                if (load_eval(eval_file, stream))
+                if (NNUE::load_eval(eval_file, stream))
                     currentEvalFileName = eval_file;
             }
 
@@ -111,7 +111,7 @@ namespace Eval {
                 (void) gEmbeddedNNUEEnd; // Silence warning on unused variable
 
                 istream stream(&buffer);
-                if (load_eval(eval_file, stream))
+                if (NNUE::load_eval(eval_file, stream))
                     currentEvalFileName = eval_file;
             }
         }
diff --git a/src/evaluate.h b/src/evaluate.h
@@ -43,17 +43,9 @@ namespace Eval {
 
   namespace NNUE {
 
-    std::string trace(Position& pos);
-    Value evaluate(const Position& pos, bool adjusted = false, int* complexity = nullptr);
-    void hint_common_parent_position(const Position& pos);
-
     void init();
     void verify();
 
-    bool load_eval(std::string name, std::istream& stream);
-    bool save_eval(std::ostream& stream);
-    bool save_eval(const std::optional<std::string>& filename);
-
   } // namespace NNUE
 
 } // namespace Eval
diff --git a/src/nnue/evaluate_nnue.h b/src/nnue/evaluate_nnue.h
@@ -55,6 +55,14 @@ namespace Stockfish::Eval::NNUE {
   template <typename T>
   using LargePagePtr = std::unique_ptr<T, LargePageDeleter<T>>;
 
+  std::string trace(Position& pos);
+  Value evaluate(const Position& pos, bool adjusted = false, int* complexity = nullptr);
+  void hint_common_parent_position(const Position& pos);
+
+  bool load_eval(std::string name, std::istream& stream);
+  bool save_eval(std::ostream& stream);
+  bool save_eval(const std::optional<std::string>& filename);
+
 }  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_EVALUATE_NNUE_H_INCLUDED
diff --git a/src/search.cpp b/src/search.cpp
@@ -34,6 +34,7 @@
 #include "tt.h"
 #include "uci.h"
 #include "syzygy/tbprobe.h"
+#include "nnue/evaluate_nnue.h"
 
 namespace Stockfish {
 
diff --git a/src/uci.cpp b/src/uci.cpp
@@ -32,6 +32,7 @@
 #include "tt.h"
 #include "uci.h"
 #include "syzygy/tbprobe.h"
+#include "nnue/evaluate_nnue.h"
 
 using namespace std;
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#include "timeman.h"`
`37`	`37`	`#include "uci.h"`
`38`	`38`	`#include "incbin/incbin.h"`
`39`		`-`
	`39`	`+#include "nnue/evaluate_nnue.h"`
`40`	`40`
`41`	`41`	`// Macro to embed the default efficiently updatable neural network (NNUE) file`
`42`	`42`	`// data in the engine binary (using incbin.h, by Dale Weiler).`
`@@ -95,7 +95,7 @@ namespace Eval {`
`95`	`95`	`if (directory != "<internal>")`
`96`	`96`	`{`
`97`	`97`	`ifstream stream(directory + eval_file, ios::binary);`
`98`		`- if (load_eval(eval_file, stream))`
	`98`	`+ if (NNUE::load_eval(eval_file, stream))`
`99`	`99`	`currentEvalFileName = eval_file;`
`100`	`100`	`}`
`101`	`101`
`@@ -111,7 +111,7 @@ namespace Eval {`
`111`	`111`	`(void) gEmbeddedNNUEEnd; // Silence warning on unused variable`
`112`	`112`
`113`	`113`	`istream stream(&buffer);`
`114`		`- if (load_eval(eval_file, stream))`
	`114`	`+ if (NNUE::load_eval(eval_file, stream))`
`115`	`115`	`currentEvalFileName = eval_file;`
`116`	`116`	`}`
`117`	`117`	`}`