HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-25 03:26:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing whitespaces.

Browse Source
This commit is contained in:
Tomasz Sobczyk
2020-09-03 11:47:58 +02:00
committed by nodchip
parent 2688194d44
commit 327e92aefe
3 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/learn/convert.cpp
View File

@@ -59,16 +59,16 @@ namespace Learner
}
void convert_bin(
const vector<string>& filenames,
const string& output_file_name,
const int ply_minimum,
const int ply_maximum,
const int interpolate_eval,
const vector<string>& filenames,
const string& output_file_name,
const int ply_minimum,
const int ply_maximum,
const int interpolate_eval,
const int src_score_min_value,
const int src_score_max_value,
const int dest_score_min_value,
const int dest_score_max_value,
const bool check_invalid_fen,
const bool check_invalid_fen,
const bool check_illegal_move)
{
std::cout << "check_invalid_fen=" << check_invalid_fen << std::endl;
@@ -268,9 +268,9 @@ namespace Learner
}
void convert_bin_from_pgn_extract(
const vector<string>& filenames,
const string& output_file_name,
const bool pgn_eval_side_to_move,
const vector<string>& filenames,
const string& output_file_name,
const bool pgn_eval_side_to_move,
const bool convert_no_eval_fens_as_score_zero)
{
std::cout << "pgn_eval_side_to_move=" << pgn_eval_side_to_move << std::endl;
@@ -471,7 +471,7 @@ namespace Learner
}
void convert_plain(
const vector<string>& filenames,
const vector<string>& filenames,
const string& output_file_name)
{
Position tpos;

108
src/learn/gensfen.cpp
View File

@@ -46,7 +46,7 @@
#include <shared_mutex>
#endif
using namespace std;
using namespace std;
namespace Learner
{
@@ -54,7 +54,7 @@ namespace Learner
static bool detect_draw_by_consecutive_low_score = false;
static bool detect_draw_by_insufficient_mating_material = false;
// Use raw NNUE eval value in the Eval::evaluate().
// Use raw NNUE eval value in the Eval::evaluate().
// If hybrid eval is enabled, training data
// generation and training don't work well.
// https://discordapp.com/channels/435943710472011776/733545871911813221/748524079761326192
@@ -66,7 +66,7 @@ namespace Learner
// Amount of sfens required to flush the buffer.
static constexpr size_t SFEN_WRITE_SIZE = 5000;
// Current status is output after
// Current status is output after
// each (SFEN_WRITE_SIZE * STATUS_OUTPUT_PERIOD) sfens
static constexpr uint64_t STATUS_OUTPUT_PERIOD = 40;
@@ -106,7 +106,7 @@ namespace Learner
// This buffer is prepared for each thread.
auto& buf = sfen_buffers[thread_id];
// Secure since there is no buf at the first time
// Secure since there is no buf at the first time
// and immediately after writing the thread buffer.
if (!buf)
{
@@ -185,7 +185,7 @@ namespace Learner
sfen_write_count += buf->size();
#if 1
// Add the processed number here, and if it exceeds save_every,
// Add the processed number here, and if it exceeds save_every,
// change the file name and reset this counter.
sfen_write_count_current_file += buf->size();
if (sfen_write_count_current_file >= save_every)
@@ -197,8 +197,8 @@ namespace Learner
// Sequential number attached to the file
int n = (int)(sfen_write_count / save_every);
// Rename the file and open it again.
// Add ios::app in consideration of overwriting.
// Rename the file and open it again.
// Add ios::app in consideration of overwriting.
// (Depending on the operation, it may not be necessary.)
string new_filename = filename + "_" + std::to_string(n);
output_file_stream.open(new_filename, ios::out | ios::binary | ios::app);
@@ -208,13 +208,13 @@ namespace Learner
// Output '.' every time when writing a game record.
std::cout << ".";
// Output the number of phases processed
// Output the number of phases processed
// every STATUS_OUTPUT_PERIOD times
// Finally, the remainder of the teacher phase
// of each thread is written out,
// Finally, the remainder of the teacher phase
// of each thread is written out,
// so halfway numbers are displayed, but is it okay?
// If you overuse the threads to the maximum number
// of logical cores, the console will be clogged,
// If you overuse the threads to the maximum number
// of logical cores, the console will be clogged,
// so it may be beneficial to increase that value.
if ((++batch_counter % STATUS_OUTPUT_PERIOD) == 0)
{
@@ -255,7 +255,7 @@ namespace Learner
// buffer before writing to file
// sfen_buffers is the buffer for each thread
// sfen_buffers_pool is a buffer for writing.
// After loading the phase in the former buffer by SFEN_WRITE_SIZE,
// After loading the phase in the former buffer by SFEN_WRITE_SIZE,
// transfer it to the latter.
std::vector<std::unique_ptr<PSVector>> sfen_buffers;
std::vector<std::unique_ptr<PSVector>> sfen_buffers_pool;
@@ -263,7 +263,7 @@ namespace Learner
// Mutex required to access sfen_buffers_pool
std::mutex mutex;
// Number of sfens written in total, and the
// Number of sfens written in total, and the
// number of sfens written in the current file.
uint64_t sfen_write_count = 0;
uint64_t sfen_write_count_current_file = 0;
@@ -281,9 +281,9 @@ namespace Learner
// It must be 2**N because it will be used as the mask to calculate hash_index.
static_assert((GENSFEN_HASH_SIZE& (GENSFEN_HASH_SIZE - 1)) == 0);
MultiThinkGenSfen(int search_depth_min_, int search_depth_max_, SfenWriter& sw_) :
search_depth_min(search_depth_min_),
search_depth_max(search_depth_max_),
MultiThinkGenSfen(int search_depth_min_, int search_depth_max_, SfenWriter& sw_) :
search_depth_min(search_depth_min_),
search_depth_max(search_depth_max_),
sfen_writer(sw_)
{
hash.resize(GENSFEN_HASH_SIZE);
@@ -346,8 +346,8 @@ namespace Learner
// For when using multi pv instead of random move.
// random_multi_pv is the number of candidates for MultiPV.
// When adopting the move of the candidate move, the difference
// between the evaluation value of the move of the 1st place
// When adopting the move of the candidate move, the difference
// between the evaluation value of the move of the 1st place
// and the evaluation value of the move of the Nth place is.
// Must be in the range random_multi_pv_diff.
// random_multi_pv_depth is the search depth for MultiPV.
@@ -355,7 +355,7 @@ namespace Learner
int random_multi_pv_diff;
int random_multi_pv_depth;
// The minimum and maximum ply (number of steps from
// The minimum and maximum ply (number of steps from
// the initial phase) of the sfens to write out.
int write_minply;
int write_maxply;
@@ -382,7 +382,7 @@ namespace Learner
// move score in CP
constexpr int adj_draw_score = 0;
// For the time being, it will be treated as a
// For the time being, it will be treated as a
// draw at the maximum number of steps to write.
const int ply = move_hist_scores.size();
@@ -403,18 +403,18 @@ namespace Learner
{
Tablebases::rank_root_moves(pos, rootMoves);
}
else
else
{
// If there is no legal move
return pos.checkers()
? -1 /* mate */
return pos.checkers()
? -1 /* mate */
: 0 /* stalemate */;
}
// Adjudicate game to a draw if the last 4 scores of each engine is 0.
if (detect_draw_by_consecutive_low_score)
if (detect_draw_by_consecutive_low_score)
{
if (ply >= adj_draw_ply)
if (ply >= adj_draw_ply)
{
int num_cons_plies_within_draw_score = 0;
bool is_adj_draw = false;
@@ -432,14 +432,14 @@ namespace Learner
break;
}
if (num_cons_plies_within_draw_score >= adj_draw_cnt)
if (num_cons_plies_within_draw_score >= adj_draw_cnt)
{
is_adj_draw = true;
break;
}
}
if (is_adj_draw)
if (is_adj_draw)
{
return 0;
}
@@ -447,33 +447,33 @@ namespace Learner
}
// Draw by insufficient mating material
if (detect_draw_by_insufficient_mating_material)
if (detect_draw_by_insufficient_mating_material)
{
if (pos.count<ALL_PIECES>() <= 4)
if (pos.count<ALL_PIECES>() <= 4)
{
int num_pieces = pos.count<ALL_PIECES>();
// (1) KvK
if (num_pieces == 2)
if (num_pieces == 2)
{
return 0;
}
// (2) KvK + 1 minor piece
if (num_pieces == 3)
if (num_pieces == 3)
{
int minor_pc = pos.count<BISHOP>(WHITE) + pos.count<KNIGHT>(WHITE) +
pos.count<BISHOP>(BLACK) + pos.count<KNIGHT>(BLACK);
if (minor_pc == 1)
if (minor_pc == 1)
{
return 0;
}
}
// (3) KBvKB, bishops of the same color
else if (num_pieces == 4)
else if (num_pieces == 4)
{
if (pos.count<BISHOP>(WHITE) == 1 && pos.count<BISHOP>(BLACK) == 1)
if (pos.count<BISHOP>(WHITE) == 1 && pos.count<BISHOP>(BLACK) == 1)
{
// Color of bishops is black.
if ((pos.pieces(WHITE, BISHOP) & DarkSquares)
@@ -498,7 +498,7 @@ namespace Learner
// Write out the phases loaded in sfens to a file.
// lastTurnIsWin: win/loss in the next phase after the final phase in sfens
// 1 when winning. -1 when losing. Pass 0 for a draw.
// Return value: true if the specified number of
// Return value: true if the specified number of
// sfens has already been reached and the process ends.
bool MultiThinkGenSfen::commit_psv(PSVector& sfens, size_t thread_id, int8_t lastTurnIsWin)
{
@@ -570,7 +570,7 @@ namespace Learner
// Normally one move from legal move
random_move = list.at((size_t)prng.rand((uint64_t)list.size()));
}
else
else
{
// if you can move the king, move the king
Move moves[8]; // Near 8
@@ -589,7 +589,7 @@ namespace Learner
// move to move the king
random_move = moves[prng.rand(n)];
// In Apery method, at this time there is a 1/2 chance
// In Apery method, at this time there is a 1/2 chance
// that the opponent will also move randomly
if (prng.rand(2) == 0)
{
@@ -604,7 +604,7 @@ namespace Learner
}
}
}
else
else
{
Learner::search(pos, random_multi_pv_depth, random_multi_pv);
@@ -614,7 +614,7 @@ namespace Learner
uint64_t s = min((uint64_t)rm.size(), (uint64_t)random_multi_pv);
for (uint64_t i = 1; i < s; ++i)
{
// The difference from the evaluation value of rm[0] must
// The difference from the evaluation value of rm[0] must
// be within the range of random_multi_pv_diff.
// It can be assumed that rm[x].score is arranged in descending order.
if (rm[0].score > rm[i].score + random_multi_pv_diff)
@@ -641,7 +641,7 @@ namespace Learner
// Make an array like a[0] = 0 ,a[1] = 1, ...
// Fisher-Yates shuffle and take out the first N items.
// Actually, I only want N pieces, so I only need
// Actually, I only want N pieces, so I only need
// to shuffle the first N pieces with Fisher-Yates.
vector<int> a;
@@ -688,9 +688,9 @@ namespace Learner
#endif
pos.do_move(m, states[ply++]);
// Because the difference calculation of evaluate() cannot be
// Because the difference calculation of evaluate() cannot be
// performed unless each node evaluate() is called!
// If the depth is 8 or more, it seems
// If the depth is 8 or more, it seems
// faster not to calculate this difference.
#if defined(EVAL_NNUE)
if (depth < 8)
@@ -709,7 +709,7 @@ namespace Learner
// VALUE_NONE and let the caller assign a value to the position.
return VALUE_NONE;
}
else
else
{
v = Eval::evaluate(pos);
@@ -733,7 +733,7 @@ namespace Learner
// thread_id = 0..Threads.size()-1
void MultiThinkGenSfen::thread_worker(size_t thread_id)
{
// For the time being, it will be treated as a draw
// For the time being, it will be treated as a draw
// at the maximum number of steps to write.
// Maximum StateInfo + Search PV to advance to leaf buffer
std::vector<StateInfo, AlignedAllocator<StateInfo>> states(
@@ -768,7 +768,7 @@ namespace Learner
vector<uint8_t> random_move_flag = generate_random_move_flags();
// A counter that keeps track of the number of random moves
// When random_move_minply == -1, random moves are
// When random_move_minply == -1, random moves are
// performed continuously, so use it at this time.
// Used internally by choose_random_move.
int actual_random_move_count = 0;
@@ -804,19 +804,19 @@ namespace Learner
if (random_move_minply != -1)
{
// Random move is performed with a certain
// Random move is performed with a certain
// probability even in the constant phase.
goto RANDOM_MOVE;
}
else
{
// When -1 is specified as random_move_minply,
// it points according to the standard until
// When -1 is specified as random_move_minply,
// it points according to the standard until
// it goes out of the standard.
// Prepare an innumerable number of situations
// that have left the constant as
// Prepare an innumerable number of situations
// that have left the constant as
// ConsiderationBookMoveCount true using a huge constant
// Used for purposes such as performing
// Used for purposes such as performing
// a random move 5 times from there.
goto DO_MOVE;
}
@@ -931,7 +931,7 @@ namespace Learner
SKIP_SAVE:;
// For some reason, We could not get PV (hit the substitution table etc. and got stuck?)
// For some reason, We could not get PV (hit the substitution table etc. and got stuck?)
// so go to the next game. It's a rare case, so you can ignore it.
if (search_pv.size() == 0)
{
@@ -949,7 +949,7 @@ namespace Learner
{
next_move = random_move.value();
// We don't have the whole game yet, but it ended,
// We don't have the whole game yet, but it ended,
// so the writing process ends and the next game starts.
if (!is_ok(next_move))
{

34
src/learn/learner.cpp
View File

@@ -421,7 +421,7 @@ namespace Learner
continue;
sfen_for_mse.push_back(p);
}
else
else
{
break;
}
@@ -815,17 +815,17 @@ namespace Learner
// Assign work to each thread using TaskDispatcher.
// A task definition for that.
// It is not possible to capture pos used in ↑, so specify the variables you want to capture one by one.
auto task =
auto task =
[
&ps,
&test_sum_cross_entropy_eval,
&test_sum_cross_entropy_win,
&test_sum_cross_entropy,
&test_sum_entropy_eval,
&test_sum_entropy_win,
&test_sum_entropy,
&sum_norm,
&task_count,
&ps,
&test_sum_cross_entropy_eval,
&test_sum_cross_entropy_win,
&test_sum_cross_entropy,
&test_sum_entropy_eval,
&test_sum_entropy_win,
&test_sum_entropy,
&sum_norm,
&task_count,
&move_accord_count
](size_t task_thread_id)
{
@@ -1906,16 +1906,16 @@ namespace Learner
Eval::init_NNUE();
cout << "convert_bin.." << endl;
convert_bin(
filenames,
output_file_name,
ply_minimum,
ply_maximum,
interpolate_eval,
filenames,
output_file_name,
ply_minimum,
ply_maximum,
interpolate_eval,
src_score_min_value,
src_score_max_value,
dest_score_min_value,
dest_score_max_value,
check_invalid_fen,
check_invalid_fen,
check_illegal_move);
return;