diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 04d41d5f..40c41a86 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -216,9 +216,8 @@ namespace { // Threshold for lazy and space evaluation constexpr Value LazyThreshold1 = Value(1565); constexpr Value LazyThreshold2 = Value(1102); - constexpr Value LazyThresholdNNUE = Value(1400); constexpr Value SpaceThreshold = Value(11551); - constexpr Value NNUEThreshold1 = Value(682); + constexpr Value NNUEThreshold1 = Value(800); constexpr Value NNUEThreshold2 = Value(176); // KingAttackWeights[PieceType] contains king attack weights by piece type @@ -1120,7 +1119,7 @@ Value Eval::evaluate(const Position& pos) { int scale = 903 + 28 * pos.count() + 28 * pos.non_pawn_material() / 1024; - Value nnue = NNUE::evaluate(pos, true, LazyThresholdNNUE) * scale / 1024; + Value nnue = NNUE::evaluate(pos, true) * scale / 1024; if (pos.is_chess960()) nnue += fix_FRC(pos); @@ -1133,15 +1132,14 @@ Value Eval::evaluate(const Position& pos) { Value psq = Value(abs(eg_value(pos.psq_score()))); int r50 = 16 + pos.rule50_count(); bool largePsq = psq * 16 > (NNUEThreshold1 + pos.non_pawn_material() / 64) * r50; - bool classical = largePsq; // Use classical evaluation for really low piece endgames. // One critical case is the draw for bishop + A/H file pawn vs naked king. bool lowPieceEndgame = pos.non_pawn_material() == BishopValueMg || (pos.non_pawn_material() < 2 * RookValueMg && pos.count() < 2); - v = classical || lowPieceEndgame ? Evaluation(pos).value() - : adjusted_NNUE(); + v = largePsq || lowPieceEndgame ? Evaluation(pos).value() // classical + : adjusted_NNUE(); // NNUE // If the classical eval is small and imbalance large, use NNUE nevertheless. // For the case of opposite colored bishops, switch to NNUE eval with small diff --git a/src/evaluate.h b/src/evaluate.h index 6bc1f0b3..41aace67 100644 --- a/src/evaluate.h +++ b/src/evaluate.h @@ -43,7 +43,7 @@ namespace Eval { namespace NNUE { - Value evaluate(const Position& pos, bool adjusted = false, Value lazyThreshold = VALUE_INFINITE); + Value evaluate(const Position& pos, bool adjusted = false); bool load_eval(std::string name, std::istream& stream); bool save_eval(std::ostream& stream); void init(); diff --git a/src/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp index 99711cd5..4a3c206b 100644 --- a/src/nnue/evaluate_nnue.cpp +++ b/src/nnue/evaluate_nnue.cpp @@ -134,7 +134,7 @@ namespace Stockfish::Eval::NNUE { } // Evaluation function. Perform differential calculation. - Value evaluate(const Position& pos, bool adjusted, Value lazyThreshold) { + Value evaluate(const Position& pos, bool adjusted) { // We manually align the arrays on the stack because with gcc < 9.3 // overaligning stack variables with alignas() doesn't work correctly. @@ -158,27 +158,21 @@ namespace Stockfish::Eval::NNUE { ASSERT_ALIGNED(buffer, alignment); const std::size_t bucket = (pos.count() - 1) / 4; - const auto [psqt, lazy] = featureTransformer->transform(pos, transformedFeatures, bucket, lazyThreshold); + const auto psqt = featureTransformer->transform(pos, transformedFeatures, bucket); + const auto output = network[bucket]->propagate(transformedFeatures, buffer); - if (lazy) - return static_cast(psqt / OutputScale); - else - { - const auto output = network[bucket]->propagate(transformedFeatures, buffer); + int materialist = psqt; + int positional = output[0]; - int materialist = psqt; - int positional = output[0]; + int delta_npm = abs(pos.non_pawn_material(WHITE) - pos.non_pawn_material(BLACK)); + int entertainment = (adjusted && delta_npm <= BishopValueMg - KnightValueMg ? 7 : 0); - int delta_npm = abs(pos.non_pawn_material(WHITE) - pos.non_pawn_material(BLACK)); - int entertainment = (adjusted && delta_npm <= BishopValueMg - KnightValueMg ? 7 : 0); + int A = 128 - entertainment; + int B = 128 + entertainment; - int A = 128 - entertainment; - int B = 128 + entertainment; + int sum = (A * materialist + B * positional) / 128; - int sum = (A * materialist + B * positional) / 128; - - return static_cast( sum / OutputScale ); - } + return static_cast( sum / OutputScale ); } // Load eval, from a file stream or a memory stream diff --git a/src/nnue/nnue_feature_transformer.h b/src/nnue/nnue_feature_transformer.h index e81f54fa..741d97cf 100644 --- a/src/nnue/nnue_feature_transformer.h +++ b/src/nnue/nnue_feature_transformer.h @@ -169,7 +169,7 @@ namespace Stockfish::Eval::NNUE { } // Convert input features - std::pair transform(const Position& pos, OutputType* output, int bucket, Value lazyThreshold) const { + std::int32_t transform(const Position& pos, OutputType* output, int bucket) const { update_accumulator(pos, WHITE); update_accumulator(pos, BLACK); @@ -182,9 +182,6 @@ namespace Stockfish::Eval::NNUE { - psqtAccumulation[static_cast(perspectives[1])][bucket] ) / 2; - if (abs(psqt) > (int)lazyThreshold * OutputScale) - return { psqt, true }; - #if defined(USE_AVX512) constexpr IndexType NumChunks = HalfDimensions / (SimdWidth * 2); static_assert(HalfDimensions % (SimdWidth * 2) == 0); @@ -291,7 +288,7 @@ namespace Stockfish::Eval::NNUE { _mm_empty(); #endif - return { psqt, false }; + return psqt; } private: