mirror of
https://github.com/opelly27/Stockfish.git
synced 2026-05-20 03:57:45 +00:00
Refactor global variables
This aims to remove some of the annoying global structure which Stockfish has. Overall there is no major elo regression to be expected. Non regression SMP STC (paused, early version): https://tests.stockfishchess.org/tests/view/65983d7979aa8af82b9608f1 LLR: 0.23 (-2.94,2.94) <-1.75,0.25> Total: 76232 W: 19035 L: 19096 D: 38101 Ptnml(0-2): 92, 8735, 20515, 8690, 84 Non regression STC (early version): https://tests.stockfishchess.org/tests/view/6595b3a479aa8af82b95da7f LLR: 2.93 (-2.94,2.94) <-1.75,0.25> Total: 185344 W: 47027 L: 46972 D: 91345 Ptnml(0-2): 571, 21285, 48943, 21264, 609 Non regression SMP STC: https://tests.stockfishchess.org/tests/view/65a0715c79aa8af82b96b7e4 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 142936 W: 35761 L: 35662 D: 71513 Ptnml(0-2): 209, 16400, 38135, 16531, 193 These global structures/variables add hidden dependencies and allow data to be mutable from where it shouldn't it be (i.e. options). They also prevent Stockfish from internal selfplay, which would be a nice thing to be able to do, i.e. instantiate two Stockfish instances and let them play against each other. It will also allow us to make Stockfish a library, which can be easier used on other platforms. For consistency with the old search code, `thisThread` has been kept, even though it is not strictly necessary anymore. This the first major refactor of this kind (in recent time), and future changes are required, to achieve the previously described goals. This includes cleaning up the dependencies, transforming the network to be self contained and coming up with a plan to deal with proper tablebase memory management (see comments for more information on this). The removal of these global structures has been discussed in parts with Vondele and Sopel. closes https://github.com/official-stockfish/Stockfish/pull/4968 No functional change
This commit is contained in:
+22
-12
@@ -27,13 +27,18 @@
|
||||
namespace Stockfish {
|
||||
|
||||
class Position;
|
||||
class OptionsMap;
|
||||
|
||||
namespace Search {
|
||||
class Worker;
|
||||
}
|
||||
|
||||
namespace Eval {
|
||||
|
||||
std::string trace(Position& pos);
|
||||
std::string trace(Position& pos, Search::Worker& workerThread);
|
||||
|
||||
int simple_eval(const Position& pos, Color c);
|
||||
Value evaluate(const Position& pos);
|
||||
Value evaluate(const Position& pos, const Search::Worker& workerThread);
|
||||
|
||||
// The default net name MUST follow the format nn-[SHA256 first 12 digits].nnue
|
||||
// for the build process (profile-build and fishtest) to work. Do not change the
|
||||
@@ -41,23 +46,28 @@ Value evaluate(const Position& pos);
|
||||
#define EvalFileDefaultNameBig "nn-baff1edbea57.nnue"
|
||||
#define EvalFileDefaultNameSmall "nn-baff1ede1f90.nnue"
|
||||
|
||||
struct EvalFile {
|
||||
// UCI option name
|
||||
std::string optionName;
|
||||
// Default net name, will use one of the macros above
|
||||
std::string defaultName;
|
||||
// Selected net name, either via uci option or default
|
||||
std::string current;
|
||||
// Net description extracted from the net file
|
||||
std::string netDescription;
|
||||
};
|
||||
|
||||
namespace NNUE {
|
||||
|
||||
enum NetSize : int;
|
||||
|
||||
void init();
|
||||
void verify();
|
||||
using EvalFiles = std::unordered_map<Eval::NNUE::NetSize, EvalFile>;
|
||||
|
||||
EvalFiles load_networks(const std::string&, const OptionsMap&, EvalFiles);
|
||||
void verify(const OptionsMap&, const EvalFiles&);
|
||||
|
||||
} // namespace NNUE
|
||||
|
||||
struct EvalFile {
|
||||
std::string option_name;
|
||||
std::string default_name;
|
||||
std::string selected_name;
|
||||
};
|
||||
|
||||
extern std::unordered_map<NNUE::NetSize, EvalFile> EvalFiles;
|
||||
|
||||
} // namespace Eval
|
||||
|
||||
} // namespace Stockfish
|
||||
|
||||
Reference in New Issue
Block a user