mirror of
https://github.com/sockspls/badfish
synced 2025-05-03 01:59:36 +00:00

Architecture changes: Duplicated activation after the 1024->15 layer with squared crelu (so 15->15*2). As proposed by vondele. Trainer changes: Added bias to L1 factorization, which was previously missing (no measurable improvement but at least neutral in principle) For retraining linearly reduce lambda parameter from 1.0 at epoch 0 to 0.75 at epoch 800. reduce max_skipping_rate from 15 to 10 (compared to vondele's outstanding PR) Note: This network was trained with a ~0.8% error in quantization regarding the newly added activation function. This will be fixed in the released trainer version. Expect a trainer PR tomorrow. Note: The inference implementation cuts a corner to merge results from two activation functions. This could possibly be resolved nicer in the future. AVX2 implementation likely not necessary, but NEON is missing. First training session invocation: python3 train.py \ ../nnue-pytorch-training/data/nodes5000pv2_UHO.binpack \ ../nnue-pytorch-training/data/nodes5000pv2_UHO.binpack \ --gpus "$3," \ --threads 4 \ --num-workers 8 \ --batch-size 16384 \ --progress_bar_refresh_rate 20 \ --random-fen-skipping 3 \ --features=HalfKAv2_hm^ \ --lambda=1.0 \ --max_epochs=400 \ --default_root_dir ../nnue-pytorch-training/experiment_$1/run_$2 Second training session invocation: python3 train.py \ ../nnue-pytorch-training/data/T60T70wIsRightFarseerT60T74T75T76.binpack \ ../nnue-pytorch-training/data/T60T70wIsRightFarseerT60T74T75T76.binpack \ --gpus "$3," \ --threads 4 \ --num-workers 8 \ --batch-size 16384 \ --progress_bar_refresh_rate 20 \ --random-fen-skipping 3 \ --features=HalfKAv2_hm^ \ --start-lambda=1.0 \ --end-lambda=0.75 \ --gamma=0.995 \ --lr=4.375e-4 \ --max_epochs=800 \ --resume-from-model /data/sopel/nnue/nnue-pytorch-training/data/exp367/nn-exp367-run3-epoch399.pt \ --default_root_dir ../nnue-pytorch-training/experiment_$1/run_$2 Passed STC: LLR: 2.95 (-2.94,2.94) <0.00,2.50> Total: 27288 W: 7445 L: 7178 D: 12665 Ptnml(0-2): 159, 3002, 7054, 3271, 158 https://tests.stockfishchess.org/tests/view/627e8c001919125939623644 Passed LTC: LLR: 2.95 (-2.94,2.94) <0.50,3.00> Total: 21792 W: 5969 L: 5727 D: 10096 Ptnml(0-2): 25, 2152, 6294, 2406, 19 https://tests.stockfishchess.org/tests/view/627f2a855734b18b2e2ece47 closes https://github.com/official-stockfish/Stockfish/pull/4020 Bench: 6481017
138 lines
4.9 KiB
C++
138 lines
4.9 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2022 The Stockfish developers (see AUTHORS file)
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
// Input features and network structure used in NNUE evaluation function
|
|
|
|
#ifndef NNUE_ARCHITECTURE_H_INCLUDED
|
|
#define NNUE_ARCHITECTURE_H_INCLUDED
|
|
|
|
#include <memory>
|
|
|
|
#include "nnue_common.h"
|
|
|
|
#include "features/half_ka_v2_hm.h"
|
|
|
|
#include "layers/affine_transform.h"
|
|
#include "layers/clipped_relu.h"
|
|
#include "layers/sqr_clipped_relu.h"
|
|
|
|
#include "../misc.h"
|
|
|
|
namespace Stockfish::Eval::NNUE {
|
|
|
|
// Input features used in evaluation function
|
|
using FeatureSet = Features::HalfKAv2_hm;
|
|
|
|
// Number of input feature dimensions after conversion
|
|
constexpr IndexType TransformedFeatureDimensions = 1024;
|
|
constexpr IndexType PSQTBuckets = 8;
|
|
constexpr IndexType LayerStacks = 8;
|
|
|
|
struct Network
|
|
{
|
|
static constexpr int FC_0_OUTPUTS = 15;
|
|
static constexpr int FC_1_OUTPUTS = 32;
|
|
|
|
Layers::AffineTransform<TransformedFeatureDimensions, FC_0_OUTPUTS + 1> fc_0;
|
|
Layers::SqrClippedReLU<FC_0_OUTPUTS + 1> ac_sqr_0;
|
|
Layers::ClippedReLU<FC_0_OUTPUTS + 1> ac_0;
|
|
Layers::AffineTransform<FC_0_OUTPUTS * 2, FC_1_OUTPUTS> fc_1;
|
|
Layers::ClippedReLU<FC_1_OUTPUTS> ac_1;
|
|
Layers::AffineTransform<FC_1_OUTPUTS, 1> fc_2;
|
|
|
|
// Hash value embedded in the evaluation file
|
|
static constexpr std::uint32_t get_hash_value() {
|
|
// input slice hash
|
|
std::uint32_t hashValue = 0xEC42E90Du;
|
|
hashValue ^= TransformedFeatureDimensions * 2;
|
|
|
|
hashValue = decltype(fc_0)::get_hash_value(hashValue);
|
|
hashValue = decltype(ac_0)::get_hash_value(hashValue);
|
|
hashValue = decltype(fc_1)::get_hash_value(hashValue);
|
|
hashValue = decltype(ac_1)::get_hash_value(hashValue);
|
|
hashValue = decltype(fc_2)::get_hash_value(hashValue);
|
|
|
|
return hashValue;
|
|
}
|
|
|
|
// Read network parameters
|
|
bool read_parameters(std::istream& stream) {
|
|
if (!fc_0.read_parameters(stream)) return false;
|
|
if (!ac_0.read_parameters(stream)) return false;
|
|
if (!fc_1.read_parameters(stream)) return false;
|
|
if (!ac_1.read_parameters(stream)) return false;
|
|
if (!fc_2.read_parameters(stream)) return false;
|
|
return true;
|
|
}
|
|
|
|
// Read network parameters
|
|
bool write_parameters(std::ostream& stream) const {
|
|
if (!fc_0.write_parameters(stream)) return false;
|
|
if (!ac_0.write_parameters(stream)) return false;
|
|
if (!fc_1.write_parameters(stream)) return false;
|
|
if (!ac_1.write_parameters(stream)) return false;
|
|
if (!fc_2.write_parameters(stream)) return false;
|
|
return true;
|
|
}
|
|
|
|
std::int32_t propagate(const TransformedFeatureType* transformedFeatures)
|
|
{
|
|
struct alignas(CacheLineSize) Buffer
|
|
{
|
|
alignas(CacheLineSize) decltype(fc_0)::OutputBuffer fc_0_out;
|
|
alignas(CacheLineSize) decltype(ac_sqr_0)::OutputType ac_sqr_0_out[ceil_to_multiple<IndexType>(FC_0_OUTPUTS * 2, 32)];
|
|
alignas(CacheLineSize) decltype(ac_0)::OutputBuffer ac_0_out;
|
|
alignas(CacheLineSize) decltype(fc_1)::OutputBuffer fc_1_out;
|
|
alignas(CacheLineSize) decltype(ac_1)::OutputBuffer ac_1_out;
|
|
alignas(CacheLineSize) decltype(fc_2)::OutputBuffer fc_2_out;
|
|
|
|
Buffer()
|
|
{
|
|
std::memset(this, 0, sizeof(*this));
|
|
}
|
|
};
|
|
|
|
#if defined(__clang__) && (__APPLE__)
|
|
// workaround for a bug reported with xcode 12
|
|
static thread_local auto tlsBuffer = std::make_unique<Buffer>();
|
|
// Access TLS only once, cache result.
|
|
Buffer& buffer = *tlsBuffer;
|
|
#else
|
|
alignas(CacheLineSize) static thread_local Buffer buffer;
|
|
#endif
|
|
|
|
fc_0.propagate(transformedFeatures, buffer.fc_0_out);
|
|
ac_sqr_0.propagate(buffer.fc_0_out, buffer.ac_sqr_0_out);
|
|
ac_0.propagate(buffer.fc_0_out, buffer.ac_0_out);
|
|
std::memcpy(buffer.ac_sqr_0_out + FC_0_OUTPUTS, buffer.ac_0_out, FC_0_OUTPUTS * sizeof(decltype(ac_0)::OutputType));
|
|
fc_1.propagate(buffer.ac_sqr_0_out, buffer.fc_1_out);
|
|
ac_1.propagate(buffer.fc_1_out, buffer.ac_1_out);
|
|
fc_2.propagate(buffer.ac_1_out, buffer.fc_2_out);
|
|
|
|
// buffer.fc_0_out[FC_0_OUTPUTS] is such that 1.0 is equal to 127*(1<<WeightScaleBits) in quantized form
|
|
// but we want 1.0 to be equal to 600*OutputScale
|
|
std::int32_t fwdOut = int(buffer.fc_0_out[FC_0_OUTPUTS]) * (600*OutputScale) / (127*(1<<WeightScaleBits));
|
|
std::int32_t outputValue = buffer.fc_2_out[0] + fwdOut;
|
|
|
|
return outputValue;
|
|
}
|
|
};
|
|
|
|
} // namespace Stockfish::Eval::NNUE
|
|
|
|
#endif // #ifndef NNUE_ARCHITECTURE_H_INCLUDED
|