Skip to content

Commit

Permalink
Fix fishtest related issue
Browse files Browse the repository at this point in the history
This is a workaround for server NNUE files related issues, to not await on Fishtest indefinitely we can flip the order of the lines to match Fishtest regexes such that the big net is considered the main net instead of the small net so the new big nets appear in the repo as tested. and we fix test_view.

No functional change
  • Loading branch information
peregrineshahin committed Feb 18, 2024
1 parent fc41f64 commit a39bca3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -971,10 +971,10 @@ endef

# evaluation network (nnue)
net:
$(call netvariables, EvalFileDefaultNameBig)
$(call fetch_network)
$(call netvariables, EvalFileDefaultNameSmall)
$(call fetch_network)
$(call netvariables, EvalFileDefaultNameBig)
$(call fetch_network)

format:
$(CLANG-FORMAT) -i $(SRCS) $(HEADERS) -style=file
Expand Down
2 changes: 1 addition & 1 deletion src/evaluate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
// const unsigned int gEmbeddedNNUESize; // the size of the embedded file
// Note that this does not work in Microsoft Visual Studio.
#if !defined(_MSC_VER) && !defined(NNUE_EMBEDDING_OFF)
INCBIN(EmbeddedNNUEBig, EvalFileDefaultNameBig);
INCBIN(EmbeddedNNUESmall, EvalFileDefaultNameSmall);
INCBIN(EmbeddedNNUEBig, EvalFileDefaultNameBig);
#else
const unsigned char gEmbeddedNNUEBigData[1] = {0x0};
const unsigned char* const gEmbeddedNNUEBigEnd = &gEmbeddedNNUEBigData[1];
Expand Down
2 changes: 1 addition & 1 deletion src/evaluate.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Value evaluate(const Position& pos, int optimism);
// 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
// name of the macro, as it is used in the Makefile.
#define EvalFileDefaultNameBig "nn-b1a57edbea57.nnue"
#define EvalFileDefaultNameSmall "nn-baff1ede1f90.nnue"
#define EvalFileDefaultNameBig "nn-b1a57edbea57.nnue"

struct EvalFile {
// UCI option name
Expand Down
4 changes: 2 additions & 2 deletions src/uci.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ constexpr int MaxHashMB = Is64Bit ? 33554432 : 2048;
UCI::UCI(int argc, char** argv) :
cli(argc, argv) {

evalFiles = {{Eval::NNUE::Big, {"EvalFile", EvalFileDefaultNameBig, "None", ""}},
{Eval::NNUE::Small, {"EvalFileSmall", EvalFileDefaultNameSmall, "None", ""}}};
evalFiles = {{Eval::NNUE::Small, {"EvalFileSmall", EvalFileDefaultNameSmall, "None", ""}},
{Eval::NNUE::Big, {"EvalFile", EvalFileDefaultNameBig, "None", ""}}};


options["Debug Log File"] << Option("", [](const Option& o) { start_logger(o); });
Expand Down

0 comments on commit a39bca3

Please sign in to comment.