From bf7d02578e94296667f159a46fe5fdc8e2f3b94b Mon Sep 17 00:00:00 2001 From: nodchip Date: Fri, 7 Aug 2020 22:47:45 +0900 Subject: [PATCH] Fixed build errors. --- src/evaluate.cpp | 2 +- src/learn/learner.cpp | 2 +- src/nnue/evaluate_nnue.cpp | 8 ++++---- src/nnue/evaluate_nnue_learner.cpp | 14 +++++++------- src/nnue/evaluate_nnue_learner.h | 2 +- src/nnue/features/castling_right.h | 2 +- src/nnue/features/enpassant.h | 2 +- src/nnue/features/features_common.h | 2 +- src/nnue/features/half_kp.h | 2 +- src/nnue/features/half_relative_kp.h | 2 +- src/nnue/features/index_list.h | 2 +- src/nnue/features/k.h | 2 +- src/nnue/features/p.h | 2 +- src/nnue/nnue_test_command.cpp | 4 ++-- src/nnue/trainer/trainer_affine_transform.h | 2 +- src/nnue/trainer/trainer_clipped_relu.h | 2 +- src/nnue/trainer/trainer_feature_transformer.h | 2 +- src/nnue/trainer/trainer_input_slice.h | 2 +- src/nnue/trainer/trainer_sum.h | 2 +- src/position.h | 2 +- src/uci.cpp | 2 +- 21 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 12ecff00b..384c081dd 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -30,7 +30,7 @@ #include "material.h" #include "pawns.h" #include "thread.h" -#include "eval/nnue/evaluate_nnue.h" +#include "nnue/evaluate_nnue.h" namespace Trace { diff --git a/src/learn/learner.cpp b/src/learn/learner.cpp index e343fde59..aff32ee8c 100644 --- a/src/learn/learner.cpp +++ b/src/learn/learner.cpp @@ -81,7 +81,7 @@ #include "multi_think.h" #if defined(EVAL_NNUE) -#include "../eval/nnue/evaluate_nnue_learner.h" +#include "../nnue/evaluate_nnue_learner.h" #include #endif diff --git a/src/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp index 55e627d08..6a6649074 100644 --- a/src/nnue/evaluate_nnue.cpp +++ b/src/nnue/evaluate_nnue.cpp @@ -5,10 +5,10 @@ #include #include -#include "../../evaluate.h" -#include "../../position.h" -#include "../../misc.h" -#include "../../uci.h" +#include "../evaluate.h" +#include "../position.h" +#include "../misc.h" +#include "../uci.h" #include "evaluate_nnue.h" diff --git a/src/nnue/evaluate_nnue_learner.cpp b/src/nnue/evaluate_nnue_learner.cpp index 3297037da..650f443e6 100644 --- a/src/nnue/evaluate_nnue_learner.cpp +++ b/src/nnue/evaluate_nnue_learner.cpp @@ -5,15 +5,15 @@ #include #include -#include "../../learn/learn.h" -#include "../../learn/learning_tools.h" +#include "../learn/learn.h" +#include "../learn/learning_tools.h" -#include "../../position.h" -#include "../../uci.h" -#include "../../misc.h" -#include "../../thread_win32_osx.h" +#include "../position.h" +#include "../uci.h" +#include "../misc.h" +#include "../thread_win32_osx.h" -#include "../evaluate_common.h" +#include "../eval/evaluate_common.h" #include "evaluate_nnue.h" #include "evaluate_nnue_learner.h" diff --git a/src/nnue/evaluate_nnue_learner.h b/src/nnue/evaluate_nnue_learner.h index ace665246..1e4a463ee 100644 --- a/src/nnue/evaluate_nnue_learner.h +++ b/src/nnue/evaluate_nnue_learner.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../learn/learn.h" +#include "../learn/learn.h" namespace Eval { diff --git a/src/nnue/features/castling_right.h b/src/nnue/features/castling_right.h index 709d46882..3af5b074f 100644 --- a/src/nnue/features/castling_right.h +++ b/src/nnue/features/castling_right.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/features/enpassant.h b/src/nnue/features/enpassant.h index 51880bb4b..f77f9c4ff 100644 --- a/src/nnue/features/enpassant.h +++ b/src/nnue/features/enpassant.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/features/features_common.h b/src/nnue/features/features_common.h index 8d2ca4a28..2fabbd4fa 100644 --- a/src/nnue/features/features_common.h +++ b/src/nnue/features/features_common.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "../nnue_common.h" namespace Eval { diff --git a/src/nnue/features/half_kp.h b/src/nnue/features/half_kp.h index cc9cd660c..d2e8e5213 100644 --- a/src/nnue/features/half_kp.h +++ b/src/nnue/features/half_kp.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/features/half_relative_kp.h b/src/nnue/features/half_relative_kp.h index 2f967745f..49b31499a 100644 --- a/src/nnue/features/half_relative_kp.h +++ b/src/nnue/features/half_relative_kp.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/features/index_list.h b/src/nnue/features/index_list.h index 39e66a093..0374b19df 100644 --- a/src/nnue/features/index_list.h +++ b/src/nnue/features/index_list.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../position.h" +#include "../../position.h" #include "../nnue_architecture.h" namespace Eval { diff --git a/src/nnue/features/k.h b/src/nnue/features/k.h index d7a6f4aab..284310103 100644 --- a/src/nnue/features/k.h +++ b/src/nnue/features/k.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/features/p.h b/src/nnue/features/p.h index 27a944fa8..d07acb590 100644 --- a/src/nnue/features/p.h +++ b/src/nnue/features/p.h @@ -5,7 +5,7 @@ #if defined(EVAL_NNUE) -#include "../../../evaluate.h" +#include "../../evaluate.h" #include "features_common.h" namespace Eval { diff --git a/src/nnue/nnue_test_command.cpp b/src/nnue/nnue_test_command.cpp index b0c57d4c9..311c5deda 100644 --- a/src/nnue/nnue_test_command.cpp +++ b/src/nnue/nnue_test_command.cpp @@ -2,8 +2,8 @@ #if defined(ENABLE_TEST_CMD) && defined(EVAL_NNUE) -#include "../../thread.h" -#include "../../uci.h" +#include "../thread.h" +#include "../uci.h" #include "evaluate_nnue.h" #include "nnue_test_command.h" diff --git a/src/nnue/trainer/trainer_affine_transform.h b/src/nnue/trainer/trainer_affine_transform.h index f5b208a37..db56c1c02 100644 --- a/src/nnue/trainer/trainer_affine_transform.h +++ b/src/nnue/trainer/trainer_affine_transform.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../../learn/learn.h" +#include "../../learn/learn.h" #include "../layers/affine_transform.h" #include "trainer.h" diff --git a/src/nnue/trainer/trainer_clipped_relu.h b/src/nnue/trainer/trainer_clipped_relu.h index 566ed7772..fd7b1a071 100644 --- a/src/nnue/trainer/trainer_clipped_relu.h +++ b/src/nnue/trainer/trainer_clipped_relu.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../../learn/learn.h" +#include "../../learn/learn.h" #include "../layers/clipped_relu.h" #include "trainer.h" diff --git a/src/nnue/trainer/trainer_feature_transformer.h b/src/nnue/trainer/trainer_feature_transformer.h index 0139d5346..97dbeff45 100644 --- a/src/nnue/trainer/trainer_feature_transformer.h +++ b/src/nnue/trainer/trainer_feature_transformer.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../../learn/learn.h" +#include "../../learn/learn.h" #include "../nnue_feature_transformer.h" #include "trainer.h" #include "features/factorizer_feature_set.h" diff --git a/src/nnue/trainer/trainer_input_slice.h b/src/nnue/trainer/trainer_input_slice.h index f5b263d3a..33e392446 100644 --- a/src/nnue/trainer/trainer_input_slice.h +++ b/src/nnue/trainer/trainer_input_slice.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../../learn/learn.h" +#include "../../learn/learn.h" #include "../layers/input_slice.h" #include "trainer.h" diff --git a/src/nnue/trainer/trainer_sum.h b/src/nnue/trainer/trainer_sum.h index 2efdff67b..fb5b15320 100644 --- a/src/nnue/trainer/trainer_sum.h +++ b/src/nnue/trainer/trainer_sum.h @@ -5,7 +5,7 @@ #if defined(EVAL_LEARN) && defined(EVAL_NNUE) -#include "../../../learn/learn.h" +#include "../../learn/learn.h" #include "../layers/sum.h" #include "trainer.h" diff --git a/src/position.h b/src/position.h index 725be527a..52cc0254b 100644 --- a/src/position.h +++ b/src/position.h @@ -32,7 +32,7 @@ #include "misc.h" #include "types.h" -#include "eval/nnue/nnue_accumulator.h" +#include "nnue/nnue_accumulator.h" /// StateInfo struct stores information needed to restore a Position object to diff --git a/src/uci.cpp b/src/uci.cpp index c775f3333..3b0a08a96 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -35,7 +35,7 @@ #include "syzygy/tbprobe.h" #if defined(EVAL_NNUE) && defined(ENABLE_TEST_CMD) -#include "eval/nnue/nnue_test_command.h" +#include "nnue/nnue_test_command.h" #endif using namespace std;