X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=c396e0f757569bbf1674c3fb44bd2b303b1c40d0;hp=f0784e8f915e113f414ba85e2496c9e7eab66156;hb=58054fd0fa6294510fc8cf76b0ba9673d5094c10;hpb=d777ea79fff0f651bd948c881946cd06bebd9381 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index f0784e8f..c396e0f7 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -47,9 +47,7 @@ // Note that this does not work in Microsoft Visual Studio. #if !defined(_MSC_VER) && !defined(NNUE_EMBEDDING_OFF) INCBIN(EmbeddedNNUE, EvalFileDefaultName); - constexpr bool gHasEmbeddedNet = true; #else - constexpr bool gHasEmbeddedNet = false; const unsigned char gEmbeddedNNUEData[1] = {0x0}; const unsigned char *const gEmbeddedNNUEEnd = &gEmbeddedNNUEData[1]; const unsigned int gEmbeddedNNUESize = 1; @@ -116,12 +114,23 @@ namespace Eval { } } - void NNUE::export_net() { - if constexpr (gHasEmbeddedNet) { - ofstream stream(EvalFileDefaultName, std::ios_base::binary); - stream.write(reinterpret_cast(gEmbeddedNNUEData), gEmbeddedNNUESize); + void NNUE::export_net(const std::optional& filename) { + std::string actualFilename; + if (filename.has_value()) { + actualFilename = filename.value(); } else { - sync_cout << "No embedded network file." << sync_endl; + if (eval_file_loaded != EvalFileDefaultName) { + sync_cout << "Failed to export a net. A non-embedded net can only be saved if the filename is specified." << sync_endl; + return; + } + actualFilename = EvalFileDefaultName; + } + + ofstream stream(actualFilename, std::ios_base::binary); + if (save_eval(stream)) { + sync_cout << "Network saved successfully to " << actualFilename << "." << sync_endl; + } else { + sync_cout << "Failed to export a net." << sync_endl; } } @@ -1128,7 +1137,7 @@ Value Eval::evaluate(const Position& pos) { bool lowPieceEndgame = pos.non_pawn_material() == BishopValueMg || (pos.non_pawn_material() < 2 * RookValueMg && pos.count() < 2); - v = classical || lowPieceEndgame ? Evaluation(pos).value() + v = classical || lowPieceEndgame ? Evaluation(pos).value() : adjusted_NNUE(); // If the classical eval is small and imbalance large, use NNUE nevertheless.