mirror of
https://github.com/sockspls/badfish
synced 2025-05-02 01:29:36 +00:00
Added #ifdef statements to switch the legacy evaluation function and NNUE evaluation function.
This commit is contained in:
Hisayori Noda
parent
48bfe86d27
commit
87445881ec
7 changed files with 68 additions and 1 deletions
|
|
@ -1,5 +1,7 @@
|
|||
// NNUE評価関数の計算に関するコード
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
|
||||
|
|
@ -316,3 +318,5 @@ void print_eval_stat(Position& /*pos*/) {
|
|||
}
|
||||
|
||||
} // namespace Eval
|
||||
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
|
|
|||
|
|
@ -865,8 +865,11 @@ namespace {
|
|||
/// evaluation of the position from the point of view of the side to move.
|
||||
|
||||
Value Eval::evaluate(const Position& pos) {
|
||||
//return Evaluation<NO_TRACE>(pos).value();
|
||||
#if defined(EVAL_NNUE)
|
||||
return Eval::NNUE::evaluate(pos);
|
||||
#else
|
||||
return Evaluation<NO_TRACE>(pos).value();
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -910,6 +913,7 @@ std::string Eval::trace(const Position& pos) {
|
|||
return ss.str();
|
||||
}
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
namespace Eval {
|
||||
ExtBonaPiece kpp_board_index[PIECE_NB] = {
|
||||
{ BONA_PIECE_ZERO, BONA_PIECE_ZERO },
|
||||
|
|
@ -978,3 +982,4 @@ bool EvalList::is_valid(const Position& pos)
|
|||
return true;
|
||||
}
|
||||
}
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ std::string trace(const Position& pos);
|
|||
|
||||
Value evaluate(const Position& pos);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// 評価関数ファイルを読み込む。
|
||||
// これは、"is_ready"コマンドの応答時に1度だけ呼び出される。2度呼び出すことは想定していない。
|
||||
// (ただし、EvalDir(評価関数フォルダ)が変更になったあと、isreadyが再度送られてきたら読みなおす。)
|
||||
|
|
@ -206,6 +207,7 @@ struct DirtyPiece
|
|||
int dirty_num;
|
||||
|
||||
};
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
#endif // #ifndef EVALUATE_H_INCLUDED
|
||||
|
|
|
|||
|
|
@ -243,6 +243,7 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
|
|||
std::fill_n(&pieceList[0][0], sizeof(pieceList) / sizeof(Square), SQ_NONE);
|
||||
st = si;
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// evalListのclear。上でmemsetでゼロクリアしたときにクリアされているが…。
|
||||
evalList.clear();
|
||||
|
||||
|
|
@ -256,6 +257,7 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
|
|||
PIECE_NUMBER_ROOK,
|
||||
PIECE_NUMBER_QUEEN
|
||||
};
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
ss >> std::noskipws;
|
||||
|
||||
|
|
@ -273,11 +275,13 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
|
|||
auto pc = Piece(idx);
|
||||
put_piece(pc, sq);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no =
|
||||
(idx == W_KING) ? PIECE_NUMBER_WKING : // 先手玉
|
||||
(idx == B_KING) ? PIECE_NUMBER_BKING : // 後手玉
|
||||
piece_no_count[type_of(Piece(idx))]++; // それ以外
|
||||
evalList.put_piece(piece_no, sq, pc); // sqの升にpcの駒を配置する
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
++sq;
|
||||
}
|
||||
|
|
@ -341,7 +345,9 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
|
|||
set_state(st);
|
||||
|
||||
assert(pos_is_ok());
|
||||
#if defined(EVAL_NNUE)
|
||||
assert(evalList.is_valid(*this));
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
|
@ -762,8 +768,10 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
++st->rule50;
|
||||
++st->pliesFromNull;
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
st->accumulator.computed_accumulation = false;
|
||||
st->accumulator.computed_score = false;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
Color us = sideToMove;
|
||||
Color them = ~us;
|
||||
|
|
@ -776,8 +784,10 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
assert(captured == NO_PIECE || color_of(captured) == (type_of(m) != CASTLING ? them : us));
|
||||
assert(type_of(captured) != KING);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
auto& dp = st->dirtyPiece;
|
||||
dp.dirty_num = 1;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
if (type_of(m) == CASTLING)
|
||||
{
|
||||
|
|
@ -795,7 +805,9 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
{
|
||||
Square capsq = to;
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no1;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
// If the captured piece is a pawn, update pawn hash key, otherwise
|
||||
// update non-pawn material.
|
||||
|
|
@ -811,12 +823,16 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
assert(piece_on(to) == NO_PIECE);
|
||||
assert(piece_on(capsq) == make_piece(them, PAWN));
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
piece_no1 = piece_no_of(capsq);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
board[capsq] = NO_PIECE; // Not done by remove_piece()
|
||||
}
|
||||
else {
|
||||
#if defined(EVAL_NNUE)
|
||||
piece_no1 = piece_no_of(capsq);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
st->pawnKey ^= Zobrist::psq[captured][capsq];
|
||||
|
|
@ -824,7 +840,9 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
else {
|
||||
st->nonPawnMaterial[them] -= PieceValue[MG][captured];
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
piece_no1 = piece_no_of(capsq);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
// Update board and piece lists
|
||||
|
|
@ -838,6 +856,7 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
// Reset rule 50 counter
|
||||
st->rule50 = 0;
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
dp.dirty_num = 2; // 動いた駒は2個
|
||||
|
||||
dp.pieceNo[1] = piece_no1;
|
||||
|
|
@ -850,6 +869,7 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
// will not be overritten to pc if the move type is enpassant.
|
||||
evalList.piece_no_list_board[capsq] = PIECE_NUMBER_NB;
|
||||
dp.changed_piece[1].new_piece = evalList.bona_piece(piece_no1);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
// Update hash key
|
||||
|
|
@ -872,14 +892,18 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
|
||||
// Move the piece. The tricky Chess960 castling is handled earlier
|
||||
if (type_of(m) != CASTLING) {
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no0 = piece_no_of(from);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
move_piece(pc, from, to);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
dp.pieceNo[0] = piece_no0;
|
||||
dp.changed_piece[0].old_piece = evalList.bona_piece(piece_no0);
|
||||
evalList.put_piece(piece_no0, to, pc);
|
||||
dp.changed_piece[0].new_piece = evalList.bona_piece(piece_no0);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
// If the moving piece is a pawn do some special extra work
|
||||
|
|
@ -903,11 +927,13 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
remove_piece(pc, to);
|
||||
put_piece(promotion, to);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no0 = piece_no_of(to);
|
||||
dp.pieceNo[0] = piece_no0;
|
||||
dp.changed_piece[0].old_piece = evalList.bona_piece(piece_no0);
|
||||
evalList.put_piece(piece_no0, to, promotion);
|
||||
dp.changed_piece[0].new_piece = evalList.bona_piece(piece_no0);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
// Update hash keys
|
||||
k ^= Zobrist::psq[pc][to] ^ Zobrist::psq[promotion][to];
|
||||
|
|
@ -960,7 +986,9 @@ void Position::do_move(Move m, StateInfo& newSt, bool givesCheck) {
|
|||
}
|
||||
|
||||
assert(pos_is_ok());
|
||||
#if defined(EVAL_NNUE)
|
||||
assert(evalList.is_valid(*this));
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -991,8 +1019,10 @@ void Position::undo_move(Move m) {
|
|||
pc = make_piece(us, PAWN);
|
||||
put_piece(pc, to);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no0 = st->dirtyPiece.pieceNo[0];
|
||||
evalList.put_piece(piece_no0, to, pc);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
if (type_of(m) == CASTLING)
|
||||
|
|
@ -1005,8 +1035,10 @@ void Position::undo_move(Move m) {
|
|||
|
||||
move_piece(pc, to, from); // Put the piece back at the source square
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no0 = st->dirtyPiece.pieceNo[0];
|
||||
evalList.put_piece(piece_no0, from, pc);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
if (st->capturedPiece)
|
||||
{
|
||||
|
|
@ -1025,10 +1057,12 @@ void Position::undo_move(Move m) {
|
|||
|
||||
put_piece(st->capturedPiece, capsq); // Restore the captured piece
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber piece_no1 = st->dirtyPiece.pieceNo[1];
|
||||
assert(evalList.bona_piece(piece_no1).fw == Eval::BONA_PIECE_ZERO);
|
||||
assert(evalList.bona_piece(piece_no1).fb == Eval::BONA_PIECE_ZERO);
|
||||
evalList.put_piece(piece_no1, capsq, st->capturedPiece);
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1037,7 +1071,9 @@ void Position::undo_move(Move m) {
|
|||
--gamePly;
|
||||
|
||||
assert(pos_is_ok());
|
||||
#if defined(EVAL_NNUE)
|
||||
assert(evalList.is_valid(*this));
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1045,6 +1081,7 @@ void Position::undo_move(Move m) {
|
|||
/// is a bit tricky in Chess960 where from/to squares can overlap.
|
||||
template<bool Do>
|
||||
void Position::do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto) {
|
||||
#if defined(EVAL_NNUE)
|
||||
auto& dp = st->dirtyPiece;
|
||||
// 差分計算のために移動した駒をStateInfoに記録しておく。
|
||||
dp.dirty_num = 2; // 動いた駒は2個
|
||||
|
|
@ -1056,16 +1093,19 @@ void Position::do_castling(Color us, Square from, Square& to, Square& rfrom, Squ
|
|||
piece_no0 = piece_no_of(from);
|
||||
piece_no1 = piece_no_of(to);
|
||||
}
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
bool kingSide = to > from;
|
||||
rfrom = to; // Castling is encoded as "king captures friendly rook"
|
||||
rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1);
|
||||
to = relative_square(us, kingSide ? SQ_G1 : SQ_C1);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
if (!Do) {
|
||||
piece_no0 = piece_no_of(to);
|
||||
piece_no1 = piece_no_of(rto);
|
||||
}
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
// Remove both pieces first since squares could overlap in Chess960
|
||||
remove_piece(make_piece(us, KING), Do ? from : to);
|
||||
|
|
@ -1074,6 +1114,7 @@ void Position::do_castling(Color us, Square from, Square& to, Square& rfrom, Squ
|
|||
put_piece(make_piece(us, KING), Do ? to : from);
|
||||
put_piece(make_piece(us, ROOK), Do ? rto : rfrom);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
if (Do) {
|
||||
dp.pieceNo[0] = piece_no0;
|
||||
dp.changed_piece[0].old_piece = evalList.bona_piece(piece_no0);
|
||||
|
|
@ -1089,6 +1130,7 @@ void Position::do_castling(Color us, Square from, Square& to, Square& rfrom, Squ
|
|||
evalList.put_piece(piece_no0, from, make_piece(us, KING));
|
||||
evalList.put_piece(piece_no1, rfrom, make_piece(us, ROOK));
|
||||
}
|
||||
#endif // defined(EVAL_NNUE)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1426,6 +1468,7 @@ bool Position::pos_is_ok() const {
|
|||
return true;
|
||||
}
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
PieceNumber Position::piece_no_of(Square sq) const
|
||||
{
|
||||
if (piece_on(sq) == NO_PIECE) {
|
||||
|
|
@ -1436,3 +1479,4 @@ PieceNumber Position::piece_no_of(Square sq) const
|
|||
assert(is_ok(n));
|
||||
return n;
|
||||
}
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
|
|
|||
|
|
@ -59,10 +59,12 @@ struct StateInfo {
|
|||
Bitboard pinners[COLOR_NB];
|
||||
Bitboard checkSquares[PIECE_TYPE_NB];
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
Eval::NNUE::Accumulator accumulator;
|
||||
|
||||
// 評価値の差分計算の管理用
|
||||
Eval::DirtyPiece dirtyPiece;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
};
|
||||
|
||||
/// A list to keep track of the position states along the setup moves (from the
|
||||
|
|
@ -174,6 +176,7 @@ public:
|
|||
bool pos_is_ok() const;
|
||||
void flip();
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// --- StateInfo
|
||||
|
||||
// 現在の局面に対応するStateInfoを返す。
|
||||
|
|
@ -182,6 +185,7 @@ public:
|
|||
|
||||
// 評価関数で使うための、どの駒番号の駒がどこにあるかなどの情報。
|
||||
const Eval::EvalList* eval_list() const { return &evalList; }
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
private:
|
||||
// Initialization helpers (used while setting up a position)
|
||||
|
|
@ -196,8 +200,10 @@ private:
|
|||
template<bool Do>
|
||||
void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto);
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// 盤上のsqの升にある駒のPieceNumberを返す。
|
||||
PieceNumber piece_no_of(Square sq) const;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
// Data members
|
||||
Piece board[SQUARE_NB];
|
||||
|
|
@ -216,8 +222,10 @@ private:
|
|||
StateInfo* st;
|
||||
bool chess960;
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// 評価関数で用いる駒のリスト
|
||||
Eval::EvalList evalList;
|
||||
#endif // defined(EVAL_NNUE)
|
||||
};
|
||||
|
||||
namespace PSQT {
|
||||
|
|
|
|||
|
|
@ -464,6 +464,7 @@ constexpr bool is_ok(Move m) {
|
|||
return from_sq(m) != to_sq(m); // Catch MOVE_NULL and MOVE_NONE
|
||||
}
|
||||
|
||||
#if defined(EVAL_NNUE)
|
||||
// --------------------
|
||||
// 駒箱
|
||||
// --------------------
|
||||
|
|
@ -493,5 +494,6 @@ inline PieceNumber& operator--(PieceNumber& d) { return d = PieceNumber(int8_t(d
|
|||
|
||||
// PieceNumberの整合性の検査。assert用。
|
||||
constexpr bool is_ok(PieceNumber pn) { return pn < PIECE_NUMBER_NB; }
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
#endif // #ifndef TYPES_H_INCLUDED
|
||||
|
|
|
|||
|
|
@ -184,6 +184,7 @@ namespace {
|
|||
// 局面は初期化されないので注意。
|
||||
void is_ready(Position& pos, istringstream& is, StateListPtr& states)
|
||||
{
|
||||
#if defined(EVAL_NNUE)
|
||||
// "isready"を受け取ったあと、"readyok"を返すまで5秒ごとに改行を送るように修正する。(keep alive的な処理)
|
||||
// USI2.0の仕様より。
|
||||
// -"isready"のあとのtime out時間は、30秒程度とする。これを超えて、評価関数の初期化、hashテーブルの確保をしたい場合、
|
||||
|
|
@ -241,6 +242,7 @@ namespace {
|
|||
// keep aliveを送信するために生成したスレッドを終了させ、待機する。
|
||||
ended = true;
|
||||
th.join();
|
||||
#endif // defined(EVAL_NNUE)
|
||||
|
||||
sync_cout << "readyok" << sync_endl;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue