kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Expose the lazy threshold for the feature transformer PSQT as a parameter.

Browse source 
Definition of the lazy threshold moved to evaluate.cpp where all others are.
Lazy threshold only used for real searches, not used for the "eval" call.
This preserves the purity of NNUE evaluation, which is useful to verify
consistency between the engine and the NNUE trainer.

closes https://github.com/official-stockfish/Stockfish/pull/3499

No functional change
This commit is contained in:
Tomasz Sobczyk 2021-05-25 13:09:40 +02:00 • committed by Joost VandeVondele
parent e044068b43
commit 9d53129075
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/evaluate.cpp
View file

@ -214,11 +214,12 @@ using namespace Trace;
namespace {
// Threshold for lazy and space evaluation
constexpr Value LazyThreshold1 = Value(1565);
constexpr Value LazyThreshold2 = Value(1102);
constexpr Value SpaceThreshold = Value(11551);
constexpr Value NNUEThreshold1 = Value(682);
constexpr Value NNUEThreshold2 = Value(176);
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 NNUEThreshold2 = Value(176);
// KingAttackWeights[PieceType] contains king attack weights by piece type
constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 81, 52, 44, 10 };
@ -1119,7 +1120,7 @@ Value Eval::evaluate(const Position& pos) {
int scale = 903 + 28 * pos.count<PAWN>() + 28 * pos.non_pawn_material() / 1024;
Value nnue = NNUE::evaluate(pos, true) * scale / 1024;
Value nnue = NNUE::evaluate(pos, true, LazyThresholdNNUE) * scale / 1024;
if (pos.is_chess960())
nnue += fix_FRC(pos);

2
src/evaluate.h
View file

@ -43,7 +43,7 @@ namespace Eval {
namespace NNUE {
Value evaluate(const Position& pos, bool adjusted = false);
Value evaluate(const Position& pos, bool adjusted = false, Value lazyThreshold = VALUE_INFINITE);
bool load_eval(std::string name, std::istream& stream);
bool save_eval(std::ostream& stream);
void init();

4
src/nnue/evaluate_nnue.cpp
View file

@ -134,7 +134,7 @@ namespace Stockfish::Eval::NNUE {
}
// Evaluation function. Perform differential calculation.
Value evaluate(const Position& pos, bool adjusted) {
Value evaluate(const Position& pos, bool adjusted, Value lazyThreshold) {
// We manually align the arrays on the stack because with gcc < 9.3
// overaligning stack variables with alignas() doesn't work correctly.
@ -158,7 +158,7 @@ namespace Stockfish::Eval::NNUE {
ASSERT_ALIGNED(buffer, alignment);
const std::size_t bucket = (pos.count<ALL_PIECES>() - 1) / 4;
const auto [psqt, lazy] = featureTransformer->transform(pos, transformedFeatures, bucket);
const auto [psqt, lazy] = featureTransformer->transform(pos, transformedFeatures, bucket, lazyThreshold);
if (lazy)
return static_cast<Value>(psqt / OutputScale);

6
src/nnue/nnue_feature_transformer.h
View file

@ -124,8 +124,6 @@ namespace Stockfish::Eval::NNUE {
// Number of output dimensions for one side
static constexpr IndexType HalfDimensions = TransformedFeatureDimensions;
static constexpr int LazyThreshold = 1400;
#ifdef VECTOR
static constexpr IndexType TileHeight = NumRegs * sizeof(vec_t) / 2;
static constexpr IndexType PsqtTileHeight = NumPsqtRegs * sizeof(psqt_vec_t) / 4;
@ -171,7 +169,7 @@ namespace Stockfish::Eval::NNUE {
}
// Convert input features
std::pair<std::int32_t, bool> transform(const Position& pos, OutputType* output, int bucket) const {
std::pair<std::int32_t, bool> transform(const Position& pos, OutputType* output, int bucket, Value lazyThreshold) const {
update_accumulator(pos, WHITE);
update_accumulator(pos, BLACK);
@ -184,7 +182,7 @@ namespace Stockfish::Eval::NNUE {
- psqtAccumulation[static_cast<int>(perspectives[1])][bucket]
) / 2;
if (abs(psqt) > LazyThreshold * OutputScale)
if (abs(psqt) > (int)lazyThreshold * OutputScale)
return { psqt, true };
#if defined(USE_AVX512)