Add src to include paths, remove non-standard ".." in includes in learn directory.

src/Makefile

@@ -321,7 +321,7 @@ endif
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)
-CXXFLAGS += -g -Wall -Wcast-qual -fno-exceptions -std=c++17 $(EXTRACXXFLAGS) $(LEARNCXXFLAGS)
+CXXFLAGS += -g -Wall -Wcast-qual -fno-exceptions -std=c++17 -I. $(EXTRACXXFLAGS) $(LEARNCXXFLAGS)
 DEPENDFLAGS += -std=c++17
 LDFLAGS += $(EXTRALDFLAGS) $(LEARNLDFLAGS)
 

src/learn/convert.cpp

@@ -2,18 +2,20 @@
 
 #include "convert.h"
 
-// evaluate header for learning
-#include "../eval/evaluate_common.h"
-
 #include "multi_think.h"
-#include "../uci.h"
-#include "../syzygy/tbprobe.h"
-#include "../misc.h"
-#include "../thread.h"
-#include "../position.h"
-#include "../tt.h"
 
-#include "../extra/nnue_data_binpack_format.h"
+#include "uci.h"
+#include "misc.h"
+#include "thread.h"
+#include "position.h"
+#include "tt.h"
+
+// evaluate header for learning
+#include "eval/evaluate_common.h"
+
+#include "extra/nnue_data_binpack_format.h"
+
+#include "syzygy/tbprobe.h"
 
 #include <sstream>
 #include <fstream>

src/learn/gensfen.cpp

@@ -1,19 +1,23 @@
 #if defined(EVAL_LEARN)
 
 #include "gensfen.h"
-#include "packed_sfen.h"
 
-#include "../eval/evaluate_common.h"
+#include "packed_sfen.h"
-#include "../misc.h"
-#include "../nnue/evaluate_nnue_learner.h"
-#include "../position.h"
-#include "../syzygy/tbprobe.h"
-#include "../thread.h"
-#include "../tt.h"
-#include "../uci.h"
 #include "multi_think.h"
 
-#include "../extra/nnue_data_binpack_format.h"
+#include "misc.h"
+#include "position.h"
+#include "thread.h"
+#include "tt.h"
+#include "uci.h"
+
+#include "eval/evaluate_common.h"
+
+#include "extra/nnue_data_binpack_format.h"
+
+#include "nnue/evaluate_nnue_learner.h"
+
+#include "syzygy/tbprobe.h"
 
 #include <chrono>
 #include <climits>

src/learn/gensfen.h

@@ -1,9 +1,9 @@
 #ifndef _GENSFEN_H_
 #define _GENSFEN_H_
 
-#include <sstream>
+#include "position.h"
 
-#include "../position.h"
+#include <sstream>
 
 #if defined(EVAL_LEARN)
 namespace Learner {

src/learn/half_float.h

@@ -7,7 +7,7 @@
 // Floating point operation by 16bit type
 // Assume that the float type code generated by the compiler is in IEEE 754 format and use it.
 
-#include "../types.h"
+#include "types.h"
 
 namespace HalfFloat
 {

src/learn/learn.cpp

@@ -20,20 +20,24 @@
 #if defined(EVAL_LEARN)
 
 #include "learn.h"
-#include "convert.h"
 
-#include "../eval/evaluate_common.h"
+#include "convert.h"
-#include "../misc.h"
-#include "../nnue/evaluate_nnue_learner.h"
-#include "../position.h"
-#include "../syzygy/tbprobe.h"
-#include "../thread.h"
-#include "../tt.h"
-#include "../uci.h"
-#include "../search.h"
 #include "multi_think.h"
 
-#include "../extra/nnue_data_binpack_format.h"
+#include "misc.h"
+#include "position.h"
+#include "thread.h"
+#include "tt.h"
+#include "uci.h"
+#include "search.h"
+
+#include "eval/evaluate_common.h"
+
+#include "extra/nnue_data_binpack_format.h"
+
+#include "nnue/evaluate_nnue_learner.h"
+
+#include "syzygy/tbprobe.h"
 
 #include <chrono>
 #include <climits>

src/learn/learn.h

@@ -3,8 +3,6 @@
 
 #if defined(EVAL_LEARN)
 
-#include <vector>
-
 // ----------------------
 // Floating point for learning
 // ----------------------
@@ -39,9 +37,10 @@ using LearnFloatType = float;
 
 #include "packed_sfen.h"
 
-#include "../position.h"
+#include "position.h"
 
 #include <sstream>
+#include <vector>
 
 namespace Learner
 {

src/learn/learning_tools.cpp

@@ -2,7 +2,7 @@
 
 #if defined (EVAL_LEARN)
 
-#include "../misc.h"
+#include "misc.h"
 
 using namespace Eval;
 

src/learn/learning_tools.h

@@ -3,11 +3,11 @@
 
 // A set of machine learning tools related to the weight array used for machine learning of evaluation functions
 
-#include "learn.h"
-
 #if defined (EVAL_LEARN)
 
-#include "../misc.h"  // PRNG , my_insertion_sort
+#include "learn.h"
+
+#include "misc.h"  // PRNG , my_insertion_sort
 
 #include <array>
 #include <cmath>	// std::sqrt()

src/learn/multi_think.cpp

@@ -1,10 +1,10 @@
-#include "../types.h"
+#if defined(EVAL_LEARN)
-
-#if defined(EVAL_LEARN)
 
 #include "multi_think.h"
-#include "../tt.h"
+
-#include "../uci.h"
+#include "tt.h"
+#include "uci.h"
+#include "types.h"
 
 #include <thread>
 
@@ -35,13 +35,13 @@ void MultiThink::go_think()
 
 	// Secure end flag of worker thread
 	thread_finished.resize(thread_num);
-	
+
 	// start worker thread
 	for (size_t i = 0; i < thread_num; ++i)
 	{
 		thread_finished[i] = 0;
 		threads.push_back(std::thread([i, this]
-		{ 
+		{
 			// exhaust all processor threads.
 			WinProcGroup::bindThisThread(i);
 

src/learn/multi_think.h

@@ -3,15 +3,16 @@
 
 #if defined(EVAL_LEARN)
 
-#include <functional>
+#include "learn.h"
-#include <mutex>
 
-#include "../misc.h"
+#include "misc.h"
-#include "../learn/learn.h"
+#include "thread_win32_osx.h"
-#include "../thread_win32_osx.h"
 
 #include <atomic>
 #include <limits>
+#include <functional>
+#include <mutex>
+
 
 // Learning from a game record, when making yourself think and generating a fixed track, etc.
 // Helper class used when multiple threads want to call Search::think() individually.