Embed default net, and simplify using non-default nets

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index f2d268147a733152df38b090868fa12a7fb92c4c..f95db1c2f09379c5c940cca74f81c8a3723c4ff6 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,6 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
-  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2004-2020 The Stockfish developers (see AUTHORS file)
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,27 +19,36 @@
 #include <iostream>
 
 #include "bitboard.h"
-#include "evaluate.h"
+#include "endgame.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
 #include "tt.h"
-#include "ucioption.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
+
+namespace PSQT {
+  void init();
+}
 
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
+  CommandLine::init(argc, argv);
   UCI::init(Options);
+  Tune::init();
+  PSQT::init();
   Bitboards::init();
   Position::init();
-  Bitbases::init_kpk();
-  Search::init();
-  Eval::init();
-  Threads.init();
-  TT.resize(Options["Hash"]);
+  Bitbases::init();
+  Endgames::init();
+  Threads.set(size_t(Options["Threads"]));
+  Search::clear(); // After threads are up
+  Eval::init_NNUE();
 
   UCI::loop(argc, argv);
 
-  Threads.exit();
+  Threads.set(0);
+  return 0;
 }