mirror of
https://github.com/opelly27/Stockfish.git
synced 2026-05-20 03:57:45 +00:00
1a26d698de
Continuing from PR #4968, this update improves how Stockfish handles network usage, making it easier to manage and modify networks in the future. With the introduction of a dedicated Network class, creating networks has become straightforward. See uci.cpp: ```cpp NN::NetworkBig({EvalFileDefaultNameBig, "None", ""}, NN::embeddedNNUEBig) ``` The new `Network` encapsulates all network-related logic, significantly reducing the complexity previously required to support multiple network types, such as the distinction between small and big networks #4915. Non-Regression STC: https://tests.stockfishchess.org/tests/view/65edd26c0ec64f0526c43584 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 33760 W: 8887 L: 8661 D: 16212 Ptnml(0-2): 143, 3795, 8808, 3961, 173 Non-Regression SMP STC: https://tests.stockfishchess.org/tests/view/65ed71970ec64f0526c42fdd LLR: 2.96 (-2.94,2.94) <-1.75,0.25> Total: 59088 W: 15121 L: 14931 D: 29036 Ptnml(0-2): 110, 6640, 15829, 6880, 85 Compiled with `make -j profile-build` ``` bash ./bench_parallel.sh ./stockfish ./stockfish-nnue 13 50 sf_base = 1568540 +/- 7637 (95%) sf_test = 1573129 +/- 7301 (95%) diff = 4589 +/- 8720 (95%) speedup = 0.29260% +/- 0.556% (95%) ``` Compiled with `make -j build` ``` bash ./bench_parallel.sh ./stockfish ./stockfish-nnue 13 50 sf_base = 1472653 +/- 7293 (95%) sf_test = 1491928 +/- 7661 (95%) diff = 19275 +/- 7154 (95%) speedup = 1.30886% +/- 0.486% (95%) ``` closes https://github.com/official-stockfish/Stockfish/pull/5100 No functional change
138 lines
5.8 KiB
C++
138 lines
5.8 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2024 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 <cstdint>
|
|
#include <cstring>
|
|
#include <iosfwd>
|
|
|
|
#include "features/half_ka_v2_hm.h"
|
|
#include "layers/affine_transform.h"
|
|
#include "layers/affine_transform_sparse_input.h"
|
|
#include "layers/clipped_relu.h"
|
|
#include "layers/sqr_clipped_relu.h"
|
|
#include "nnue_common.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 TransformedFeatureDimensionsBig = 2560;
|
|
constexpr int L2Big = 15;
|
|
constexpr int L3Big = 32;
|
|
|
|
constexpr IndexType TransformedFeatureDimensionsSmall = 128;
|
|
constexpr int L2Small = 15;
|
|
constexpr int L3Small = 32;
|
|
|
|
constexpr IndexType PSQTBuckets = 8;
|
|
constexpr IndexType LayerStacks = 8;
|
|
|
|
template<IndexType L1, int L2, int L3>
|
|
struct NetworkArchitecture {
|
|
static constexpr IndexType TransformedFeatureDimensions = L1;
|
|
static constexpr int FC_0_OUTPUTS = L2;
|
|
static constexpr int FC_1_OUTPUTS = L3;
|
|
|
|
Layers::AffineTransformSparseInput<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) {
|
|
return fc_0.read_parameters(stream) && ac_0.read_parameters(stream)
|
|
&& fc_1.read_parameters(stream) && ac_1.read_parameters(stream)
|
|
&& fc_2.read_parameters(stream);
|
|
}
|
|
|
|
// Write network parameters
|
|
bool write_parameters(std::ostream& stream) const {
|
|
return fc_0.write_parameters(stream) && ac_0.write_parameters(stream)
|
|
&& fc_1.write_parameters(stream) && ac_1.write_parameters(stream)
|
|
&& fc_2.write_parameters(stream);
|
|
}
|
|
|
|
std::int32_t propagate(const TransformedFeatureType* transformedFeatures) {
|
|
struct alignas(CacheLineSize) Buffer {
|
|
alignas(CacheLineSize) typename decltype(fc_0)::OutputBuffer fc_0_out;
|
|
alignas(CacheLineSize) typename decltype(ac_sqr_0)::OutputType
|
|
ac_sqr_0_out[ceil_to_multiple<IndexType>(FC_0_OUTPUTS * 2, 32)];
|
|
alignas(CacheLineSize) typename decltype(ac_0)::OutputBuffer ac_0_out;
|
|
alignas(CacheLineSize) typename decltype(fc_1)::OutputBuffer fc_1_out;
|
|
alignas(CacheLineSize) typename decltype(ac_1)::OutputBuffer ac_1_out;
|
|
alignas(CacheLineSize) typename 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(typename 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 =
|
|
(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
|