Add Stockfish namespace.

fixes #3350 and is a small cleanup that might make it easier to use SF
in separate projects, like a NNUE trainer or similar.

closes https://github.com/official-stockfish/Stockfish/pull/3370

No functional change.

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 7cb04382e1231192049556d3cdf2ae724857bc08..7945a4535ca4eb82dfc65ae4d4a3834839ca5801 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -92,6 +92,8 @@ const vector<string> Defaults = {
 
 } // namespace
 
+namespace Stockfish {
+
 /// setup_bench() builds a list of UCI commands to be run by bench. There
 /// are five parameters: TT size in MB, number of search threads that
 /// should be used, the limit value spent for each position, a file name
@@ -168,3 +170,5 @@ vector<string> setup_bench(const Position& current, istream& is) {
 
   return list;
 }
+
+} // namespace Stockfish

diff --git a/src/bitbase.cpp b/src/bitbase.cpp
index b640eabb6d1f256231cbb6f31239d5b923f83c02..ece9ec72b23968605cc535c1beb22203650e9762 100644 (file)
--- a/src/bitbase.cpp
+++ b/src/bitbase.cpp
@@ -23,6 +23,8 @@
 #include "bitboard.h"
 #include "types.h"
 
+namespace Stockfish {
+
 namespace {
 
   // There are 24 possible pawn squares: files A to D and ranks from 2 to 7.
@@ -66,7 +68,6 @@ namespace {
 
 } // namespace
 
-
 bool Bitbases::probe(Square wksq, Square wpsq, Square bksq, Color stm) {
 
   assert(file_of(wpsq) <= FILE_D);
@@ -96,7 +97,6 @@ void Bitbases::init() {
           KPKBitbase.set(idx);
 }
 
-
 namespace {
 
   KPKPosition::KPKPosition(unsigned idx) {
@@ -168,3 +168,5 @@ namespace {
   }
 
 } // namespace
+
+} // namespace Stockfish

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 8146ce9722843eafc7ff9370cf161f96edeb933b..a202144912390bf316e0b9ea0e1e4cab45367e67 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -22,6 +22,8 @@
 #include "bitboard.h"
 #include "misc.h"
 
+namespace Stockfish {
+
 uint8_t PopCnt16[1 << 16];
 uint8_t SquareDistance[SQUARE_NB][SQUARE_NB];
 
@@ -42,7 +44,6 @@ namespace {
 
 }
 
-
 /// safe_destination() returns the bitboard of target square for the given step
 /// from the given square. If the step is off the board, returns empty bitboard.
 
@@ -111,7 +112,6 @@ void Bitboards::init() {
   }
 }
 
-
 namespace {
 
   Bitboard sliding_attack(PieceType pt, Square sq, Bitboard occupied) {
@@ -211,3 +211,5 @@ namespace {
     }
   }
 }
+
+} // namespace Stockfish

diff --git a/src/bitboard.h b/src/bitboard.h
index c9555b6bf7214de2c5092559905872fc236fad15..e14fe0df7d30c2d3bec0d6d83e2ee833fa61c0c9 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -23,19 +23,21 @@
 
 #include "types.h"
 
+namespace Stockfish {
+
 namespace Bitbases {
 
 void init();
 bool probe(Square wksq, Square wpsq, Square bksq, Color us);
 
-}
+} // namespace Stockfish::Bitbases
 
 namespace Bitboards {
 
 void init();
 std::string pretty(Bitboard b);
 
-}
+} // namespace Stockfish::Bitboards
 
 constexpr Bitboard AllSquares = ~Bitboard(0);
 constexpr Bitboard DarkSquares = 0xAA55AA55AA55AA55ULL;
@@ -430,4 +432,6 @@ inline Square frontmost_sq(Color c, Bitboard b) {
   return c == WHITE ? msb(b) : lsb(b);
 }
 
+} // namespace Stockfish
+
 #endif // #ifndef BITBOARD_H_INCLUDED

diff --git a/src/endgame.cpp b/src/endgame.cpp
index 1489a36bd4f1d3b86696934d5d8df7e4e332190e..a44d3a1c5e66f3c10a1f40853c41794f80dc81dc 100644 (file)
--- a/src/endgame.cpp
+++ b/src/endgame.cpp
@@ -22,6 +22,8 @@
 #include "endgame.h"
 #include "movegen.h"
 
+namespace Stockfish {
+
 namespace {
 
   // Used to drive the king towards the edge of the board
@@ -741,3 +743,5 @@ ScaleFactor Endgame<KPKP>::operator()(const Position& pos) const {
   // it's probably at least a draw even with the pawn.
   return Bitbases::probe(strongKing, strongPawn, weakKing, us) ? SCALE_FACTOR_NONE : SCALE_FACTOR_DRAW;
 }
+
+} // namespace Stockfish

diff --git a/src/endgame.h b/src/endgame.h
index 860cc8634b4b39f4f20bf4392b19941ead0ced56..146111b95791511a361a9af8ff96e24aca81fe46 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -28,6 +28,7 @@
 #include "position.h"
 #include "types.h"
 
+namespace Stockfish {
 
 /// EndgameCode lists all supported endgame functions by corresponding codes
 
@@ -120,4 +121,6 @@ namespace Endgames {
   }
 }
 
+} // namespace Stockfish
+
 #endif // #ifndef ENDGAME_H_INCLUDED

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index d55ef695b75f45e51f91eeed22990adecbd2d669..d43b8fa76c59a1a40a1aa37ce135a39d889e52e1 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -54,7 +54,9 @@
 
 
 using namespace std;
-using namespace Eval::NNUE;
+using namespace Stockfish::Eval::NNUE;
+
+namespace Stockfish {
 
 namespace Eval {
 
@@ -1146,3 +1148,5 @@ std::string Eval::trace(const Position& pos) {
 
   return ss.str();
 }
+
+} // namespace Stockfish

diff --git a/src/evaluate.h b/src/evaluate.h
index 8beca2d0a2bb397b03a37249cc9a6ea5c1c42a66..6210bd5816b8be77b7223f0c1b1b4eaab715b411 100644 (file)
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -23,6 +23,8 @@
 
 #include "types.h"
 
+namespace Stockfish {
+
 class Position;
 
 namespace Eval {
@@ -49,4 +51,6 @@ namespace Eval {
 
 } // namespace Eval
 
+} // namespace Stockfish
+
 #endif // #ifndef EVALUATE_H_INCLUDED

diff --git a/src/main.cpp b/src/main.cpp
index ef662468ff4d5d60b79c6eefa477cf695b62e6e4..62e0ed525d709c0cb3e6a21d44571684e702467a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,8 @@
 #include "tt.h"
 #include "uci.h"
 
+using namespace Stockfish;
+
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;

diff --git a/src/material.cpp b/src/material.cpp
index e76641d1a0aa7c784bcfa6be7b34450fa69fd25b..84d7a4bd0a6331327e96735af16a981ea6ac25c8 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -24,6 +24,8 @@
 
 using namespace std;
 
+namespace Stockfish {
+
 namespace {
   #define S(mg, eg) make_score(mg, eg)
 
@@ -223,3 +225,5 @@ Entry* probe(const Position& pos) {
 }
 
 } // namespace Material
+
+} // namespace Stockfish

diff --git a/src/material.h b/src/material.h
index be26425f32b7df859873c137e00bf38c80f25426..26535a535afb295bdcbcfe6bfe66664ff4b2a6e6 100644 (file)
--- a/src/material.h
+++ b/src/material.h
@@ -24,7 +24,7 @@
 #include "position.h"
 #include "types.h"
 
-namespace Material {
+namespace Stockfish::Material {
 
 /// Material::Entry contains various information about a material configuration.
 /// It contains a material imbalance evaluation, a function pointer to a special
@@ -66,6 +66,6 @@ typedef HashTable<Entry, 8192> Table;
 
 Entry* probe(const Position& pos);
 
-} // namespace Material
+} // namespace Stockfish::Material
 
 #endif // #ifndef MATERIAL_H_INCLUDED

diff --git a/src/misc.cpp b/src/misc.cpp
index fe920140dbaf3ca4aaab00e1469ce68d8bda32eb..834e909b981b381bf5434cd611b266d6406ecdde 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -61,6 +61,8 @@ typedef bool(*fun3_t)(HANDLE, CONST GROUP_AFFINITY*, PGROUP_AFFINITY);
 
 using namespace std;
 
+namespace Stockfish {
+
 namespace {
 
 /// Version number. If Version is left empty, then compile date in the format
@@ -626,3 +628,5 @@ void init(int argc, char* argv[]) {
 
 
 } // namespace CommandLine
+
+} // namespace Stockfish

diff --git a/src/misc.h b/src/misc.h
index 7eb75bc70ec6eac101c52c5f6a52f04cb5211ad8..f834e470cbf8799b49915196e8c805a3dd24139d 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -28,6 +28,8 @@
 
 #include "types.h"
 
+namespace Stockfish {
+
 std::string engine_info(bool to_uci = false);
 std::string compiler_info();
 void prefetch(void* addr);
@@ -143,4 +145,6 @@ namespace CommandLine {
   extern std::string workingDirectory; // path of the working directory
 }
 
+} // namespace Stockfish
+
 #endif // #ifndef MISC_H_INCLUDED

diff --git a/src/movegen.cpp b/src/movegen.cpp
index c9d6a90d7d00c191db4080c63af14a9ea6ec4e68..51df6d07e67edac231a86ec8180c54d9100395e9 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -21,6 +21,8 @@
 #include "movegen.h"
 #include "position.h"
 
+namespace Stockfish {
+
 namespace {
 
   template<GenType Type, Direction D>
@@ -362,3 +364,5 @@ ExtMove* generate<LEGAL>(const Position& pos, ExtMove* moveList) {
 
   return moveList;
 }
+
+} // namespace Stockfish

diff --git a/src/movegen.h b/src/movegen.h
index 85887a64bb406ca7b65adfb9f9b63fa3b2e3ff9e..3f895f05ad481bdf9e092bfdd7ff814de906ad51 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -23,6 +23,8 @@
 
 #include "types.h"
 
+namespace Stockfish {
+
 class Position;
 
 enum GenType {
@@ -70,4 +72,6 @@ private:
   ExtMove moveList[MAX_MOVES], *last;
 };
 
+} // namespace Stockfish
+
 #endif // #ifndef MOVEGEN_H_INCLUDED

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 0ceeb8eaf60794bfc2df804468955131ef2a9a76..4ff4cff44b448f518a534a776b1321eef83387ba 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -20,6 +20,8 @@
 
 #include "movepick.h"
 
+namespace Stockfish {
+
 namespace {
 
   enum Stages {
@@ -263,3 +265,5 @@ top:
   assert(false);
   return MOVE_NONE; // Silence warning
 }
+
+} // namespace Stockfish

diff --git a/src/movepick.h b/src/movepick.h
index ea599cda1afbe10a04f8a2f9f77ffc4becc237b8..c76d49572b8af63f5c6bd8240e8bf909c0856ccd 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -27,6 +27,8 @@
 #include "position.h"
 #include "types.h"
 
+namespace Stockfish {
+
 /// StatsEntry stores the stat table value. It is usually a number but could
 /// be a move or even a nested history. We use a class instead of naked value
 /// to directly call history update operator<<() on the entry so to use stats
@@ -156,4 +158,6 @@ private:
   ExtMove moves[MAX_MOVES];
 };
 
+} // namespace Stockfish
+
 #endif // #ifndef MOVEPICK_H_INCLUDED

diff --git a/src/nnue/architectures/halfkp_256x2-32-32.h b/src/nnue/architectures/halfkp_256x2-32-32.h
index a0fe2e0ad8349dfd2d5060f291351c41ab5921a5..a6768204649f2a9e10f7cf4fa1974cd9c3ba1bd0 100644 (file)
--- a/src/nnue/architectures/halfkp_256x2-32-32.h
+++ b/src/nnue/architectures/halfkp_256x2-32-32.h
@@ -28,7 +28,7 @@
 #include "../layers/affine_transform.h"
 #include "../layers/clipped_relu.h"
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
 // Input features used in evaluation function
 using RawFeatures = Features::FeatureSet<
@@ -49,6 +49,6 @@ using OutputLayer = AffineTransform<HiddenLayer2, 1>;
 
 using Network = Layers::OutputLayer;
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_HALFKP_256X2_32_32_H_INCLUDED

diff --git a/src/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp
index fb4a502197a9160dec3601de46ba1a21c71eded4..5416f13e1f77b502c255a22792072605832a32e3 100644 (file)
--- a/src/nnue/evaluate_nnue.cpp
+++ b/src/nnue/evaluate_nnue.cpp
@@ -29,7 +29,7 @@
 
 #include "evaluate_nnue.h"
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   // Input feature converter
   LargePagePtr<FeatureTransformer> feature_transformer;
@@ -141,4 +141,4 @@ namespace Eval::NNUE {
     return ReadParameters(stream);
   }
 
-} // namespace Eval::NNUE
+} // namespace Stockfish::Eval::NNUE

diff --git a/src/nnue/evaluate_nnue.h b/src/nnue/evaluate_nnue.h
index c30d7c01fbb9925f22087e5f360b1afde4d482e7..24aa6cc0051e4e2a068c7459f02ed0477f24c5ce 100644 (file)
--- a/src/nnue/evaluate_nnue.h
+++ b/src/nnue/evaluate_nnue.h
@@ -25,7 +25,7 @@
 
 #include <memory>
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   // Hash value of evaluation function structure
   constexpr std::uint32_t kHashValue =
@@ -54,6 +54,6 @@ namespace Eval::NNUE {
   template <typename T>
   using LargePagePtr = std::unique_ptr<T, LargePageDeleter<T>>;
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_EVALUATE_NNUE_H_INCLUDED

diff --git a/src/nnue/features/feature_set.h b/src/nnue/features/feature_set.h
index 77d2220fcf8970346ed3895ffdbf47e2a58cb7f7..a3fea9c0b2c30c2b340e101145cf5d05a2633d16 100644 (file)
--- a/src/nnue/features/feature_set.h
+++ b/src/nnue/features/feature_set.h
@@ -24,7 +24,7 @@
 #include "features_common.h"
 #include <array>
 
-namespace Eval::NNUE::Features {
+namespace Stockfish::Eval::NNUE::Features {
 
   // Class template that represents a list of values
   template <typename T, T... Values>
@@ -64,6 +64,6 @@ namespace Eval::NNUE::Features {
 
   };
 
-}  // namespace Eval::NNUE::Features
+}  // namespace Stockfish::Eval::NNUE::Features
 
 #endif // #ifndef NNUE_FEATURE_SET_H_INCLUDED

diff --git a/src/nnue/features/features_common.h b/src/nnue/features/features_common.h
index b0073b8b6ed998dfe85d4eb0178bdccb0d49a5f9..118ec9532a1b7de8278d8bc32c47a00dd91be08d 100644 (file)
--- a/src/nnue/features/features_common.h
+++ b/src/nnue/features/features_common.h
@@ -24,7 +24,7 @@
 #include "../../evaluate.h"
 #include "../nnue_common.h"
 
-namespace Eval::NNUE::Features {
+namespace Stockfish::Eval::NNUE::Features {
 
   class IndexList;
 
@@ -40,6 +40,6 @@ namespace Eval::NNUE::Features {
     kFriend // side to move
   };
 
-}  // namespace Eval::NNUE::Features
+}  // namespace Stockfish::Eval::NNUE::Features
 
 #endif // #ifndef NNUE_FEATURES_COMMON_H_INCLUDED

diff --git a/src/nnue/features/half_kp.cpp b/src/nnue/features/half_kp.cpp
index b52a45f25233bd6866e1faf93ea0823408b7edb7..ac6317e7da66d4c424f523e39a993e9aa6ecfe51 100644 (file)
--- a/src/nnue/features/half_kp.cpp
+++ b/src/nnue/features/half_kp.cpp
@@ -21,7 +21,7 @@
 #include "half_kp.h"
 #include "index_list.h"
 
-namespace Eval::NNUE::Features {
+namespace Stockfish::Eval::NNUE::Features {
 
   // Orient a square according to perspective (rotates by 180 for black)
   inline Square orient(Color perspective, Square s) {
@@ -65,4 +65,4 @@ namespace Eval::NNUE::Features {
 
   template class HalfKP<Side::kFriend>;
 
-}  // namespace Eval::NNUE::Features
+}  // namespace Stockfish::Eval::NNUE::Features

diff --git a/src/nnue/features/half_kp.h b/src/nnue/features/half_kp.h
index d203dc22abbdacaf1cc92bf0feccdf28dc2416c8..2461acb725a2a5899ecc45368a1747e5fc901e32 100644 (file)
--- a/src/nnue/features/half_kp.h
+++ b/src/nnue/features/half_kp.h
@@ -24,7 +24,7 @@
 #include "../../evaluate.h"
 #include "features_common.h"
 
-namespace Eval::NNUE::Features {
+namespace Stockfish::Eval::NNUE::Features {
 
   // Feature HalfKP: Combination of the position of own king
   // and the position of pieces other than kings
@@ -54,6 +54,6 @@ namespace Eval::NNUE::Features {
                                      IndexList* removed, IndexList* added);
   };
 
-}  // namespace Eval::NNUE::Features
+}  // namespace Stockfish::Eval::NNUE::Features
 
 #endif // #ifndef NNUE_FEATURES_HALF_KP_H_INCLUDED

diff --git a/src/nnue/features/index_list.h b/src/nnue/features/index_list.h
index ca3ebee56176c0a90200eb670d84f6e769b8db56..9f03993bedecae37cbdda8318c550625995302bb 100644 (file)
--- a/src/nnue/features/index_list.h
+++ b/src/nnue/features/index_list.h
@@ -24,7 +24,7 @@
 #include "../../position.h"
 #include "../nnue_architecture.h"
 
-namespace Eval::NNUE::Features {
+namespace Stockfish::Eval::NNUE::Features {
 
   // Class template used for feature index list
   template <typename T, std::size_t MaxSize>
@@ -59,6 +59,6 @@ namespace Eval::NNUE::Features {
       : public ValueList<IndexType, RawFeatures::kMaxActiveDimensions> {
   };
 
-}  // namespace Eval::NNUE::Features
+}  // namespace Stockfish::Eval::NNUE::Features
 
 #endif // NNUE_FEATURES_INDEX_LIST_H_INCLUDED

diff --git a/src/nnue/layers/affine_transform.h b/src/nnue/layers/affine_transform.h
index adf152eea5b8894fcdf26cdfebffcdbd602b5d7f..d2713c5aaf6078a556cb0b953fa819f37968f87d 100644 (file)
--- a/src/nnue/layers/affine_transform.h
+++ b/src/nnue/layers/affine_transform.h
@@ -24,7 +24,7 @@
 #include <iostream>
 #include "../nnue_common.h"
 
-namespace Eval::NNUE::Layers {
+namespace Stockfish::Eval::NNUE::Layers {
 
   // Affine transformation layer
   template <typename PreviousLayer, IndexType OutputDimensions>
@@ -459,6 +459,6 @@ namespace Eval::NNUE::Layers {
 #endif
   };
 
-}  // namespace Eval::NNUE::Layers
+}  // namespace Stockfish::Eval::NNUE::Layers
 
 #endif // #ifndef NNUE_LAYERS_AFFINE_TRANSFORM_H_INCLUDED

diff --git a/src/nnue/layers/clipped_relu.h b/src/nnue/layers/clipped_relu.h
index 3ed41ee5633099565e6b21b16244c70e9520deca..a10e3e482b722e919f2d0b9740090792a3c1e30b 100644 (file)
--- a/src/nnue/layers/clipped_relu.h
+++ b/src/nnue/layers/clipped_relu.h
@@ -23,7 +23,7 @@
 
 #include "../nnue_common.h"
 
-namespace Eval::NNUE::Layers {
+namespace Stockfish::Eval::NNUE::Layers {
 
   // Clipped ReLU
   template <typename PreviousLayer>
@@ -161,6 +161,6 @@ namespace Eval::NNUE::Layers {
     PreviousLayer previous_layer_;
   };
 
-}  // namespace Eval::NNUE::Layers
+}  // namespace Stockfish::Eval::NNUE::Layers
 
 #endif // NNUE_LAYERS_CLIPPED_RELU_H_INCLUDED

diff --git a/src/nnue/layers/input_slice.h b/src/nnue/layers/input_slice.h
index efdf07250a043ff5f4e366c80aef25e86c296cf4..43b06eec5a943066b2b686b6ff27657605321e98 100644 (file)
--- a/src/nnue/layers/input_slice.h
+++ b/src/nnue/layers/input_slice.h
@@ -23,7 +23,7 @@
 
 #include "../nnue_common.h"
 
-namespace Eval::NNUE::Layers {
+namespace Stockfish::Eval::NNUE::Layers {
 
 // Input layer
 template <IndexType OutputDimensions, IndexType Offset = 0>
@@ -63,6 +63,6 @@ class InputSlice {
  private:
 };
 
-}  // namespace Layers
+}  // namespace Stockfish::Eval::NNUE::Layers
 
 #endif // #ifndef NNUE_LAYERS_INPUT_SLICE_H_INCLUDED

diff --git a/src/nnue/nnue_accumulator.h b/src/nnue/nnue_accumulator.h
index 6b4390f9216aec1005a3569ff0c96abae1474c86..55fafa138fc77203b4612f2b7162ccc25a6d047b 100644 (file)
--- a/src/nnue/nnue_accumulator.h
+++ b/src/nnue/nnue_accumulator.h
@@ -23,7 +23,7 @@
 
 #include "nnue_architecture.h"
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   // The accumulator of a StateInfo without parent is set to the INIT state
   enum AccumulatorState { EMPTY, COMPUTED, INIT };
@@ -35,6 +35,6 @@ namespace Eval::NNUE {
     AccumulatorState state[2];
   };
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // NNUE_ACCUMULATOR_H_INCLUDED

diff --git a/src/nnue/nnue_architecture.h b/src/nnue/nnue_architecture.h
index ad5be0064db58b197eb203fa13751d62e71075c7..1680368edb51b288f07630f1c15d24dc1d49e65a 100644 (file)
--- a/src/nnue/nnue_architecture.h
+++ b/src/nnue/nnue_architecture.h
@@ -24,7 +24,7 @@
 // Defines the network structure
 #include "architectures/halfkp_256x2-32-32.h"
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   static_assert(kTransformedFeatureDimensions % kMaxSimdWidth == 0, "");
   static_assert(Network::kOutputDimensions == 1, "");
@@ -33,6 +33,6 @@ namespace Eval::NNUE {
   // Trigger for full calculation instead of difference calculation
   constexpr auto kRefreshTriggers = RawFeatures::kRefreshTriggers;
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_ARCHITECTURE_H_INCLUDED

diff --git a/src/nnue/nnue_common.h b/src/nnue/nnue_common.h
index 33e58745e7f0b549f7029feeb8297470b3a44fa4..09a152a53c90197f2c85191f169a5e13b658be2d 100644 (file)
--- a/src/nnue/nnue_common.h
+++ b/src/nnue/nnue_common.h
@@ -43,7 +43,7 @@
 #include <arm_neon.h>
 #endif
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   // Version of the evaluation file
   constexpr std::uint32_t kVersion = 0x7AF32F16u;
@@ -127,6 +127,6 @@ namespace Eval::NNUE {
       return result;
   }
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_COMMON_H_INCLUDED

diff --git a/src/nnue/nnue_feature_transformer.h b/src/nnue/nnue_feature_transformer.h
index 2641321e6cbe0c6247c194630384826926d7c3b1..1e0b0e6da55112dbcddf78bddeb31668564f5e66 100644 (file)
--- a/src/nnue/nnue_feature_transformer.h
+++ b/src/nnue/nnue_feature_transformer.h
@@ -27,7 +27,7 @@
 
 #include <cstring> // std::memset()
 
-namespace Eval::NNUE {
+namespace Stockfish::Eval::NNUE {
 
   // If vector instructions are enabled, we update and refresh the
   // accumulator tile by tile such that each tile fits in the CPU's
@@ -412,6 +412,6 @@ namespace Eval::NNUE {
         WeightType weights_[kHalfDimensions * kInputDimensions];
   };
 
-}  // namespace Eval::NNUE
+}  // namespace Stockfish::Eval::NNUE
 
 #endif // #ifndef NNUE_FEATURE_TRANSFORMER_H_INCLUDED

diff --git a/src/pawns.cpp b/src/pawns.cpp
index cd4d4e45212568ec7e8cefeffd6a4a420dbefc06..9a0610a0f53f08dcaf8a460cea629f5a7ed05300 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -24,6 +24,8 @@
 #include "position.h"
 #include "thread.h"
 
+namespace Stockfish {
+
 namespace {
 
   #define V Value
@@ -298,3 +300,5 @@ template Score Entry::do_king_safety<WHITE>(const Position& pos);
 template Score Entry::do_king_safety<BLACK>(const Position& pos);
 
 } // namespace Pawns
+
+} // namespace Stockfish

diff --git a/src/pawns.h b/src/pawns.h
index 888bf9900f42e2cbceb00342525a8b97cc5e03dc..124619d66a0c20805fa5d5d3f328f6167d0b6943 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -23,7 +23,7 @@
 #include "position.h"
 #include "types.h"
 
-namespace Pawns {
+namespace Stockfish::Pawns {
 
 /// Pawns::Entry contains various information about a pawn structure. A lookup
 /// to the pawn hash table (performed by calling the probe function) returns a
@@ -65,6 +65,6 @@ typedef HashTable<Entry, 131072> Table;
 
 Entry* probe(const Position& pos);
 
-} // namespace Pawns
+} // namespace Stockfish::Pawns
 
 #endif // #ifndef PAWNS_H_INCLUDED

diff --git a/src/position.cpp b/src/position.cpp
index 8f9b7eee89e266bc00e4ca29c0cf50532929d7c1..17b165b9afb6f9a4115afc03d0762e98076993b4 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -34,6 +34,8 @@
 
 using std::string;
 
+namespace Stockfish {
+
 namespace Zobrist {
 
   Key psq[PIECE_NB][SQUARE_NB];
@@ -1338,3 +1340,5 @@ bool Position::pos_is_ok() const {
 
   return true;
 }
+
+} // namespace Stockfish

diff --git a/src/position.h b/src/position.h
index e9803756609c1da2df164897deb14af7391491a4..4ab3761fd4a8b824bafe9301db638290cefd379e 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -31,6 +31,7 @@
 
 #include "nnue/nnue_accumulator.h"
 
+namespace Stockfish {
 
 /// StateInfo struct stores information needed to restore a Position object to
 /// its previous state when we retract a move. Whenever a move is made on the
@@ -423,4 +424,6 @@ inline StateInfo* Position::state() const {
   return st;
 }
 
+} // namespace Stockfish
+
 #endif // #ifndef POSITION_H_INCLUDED

diff --git a/src/psqt.cpp b/src/psqt.cpp
index cfade2951ff9b5d53aa7a4b8b681433f9401a973..33a3e00c91da45d96c9885f2a06d9beca3a15ae7 100644 (file)
--- a/src/psqt.cpp
+++ b/src/psqt.cpp
@@ -24,6 +24,7 @@
 #include "bitboard.h"
 #include "types.h"
 
+namespace Stockfish {
 
 namespace
 {
@@ -126,3 +127,5 @@ void init() {
 }
 
 } // namespace PSQT
+
+} // namespace Stockfish

diff --git a/src/psqt.h b/src/psqt.h
index 8b4fd6eb8c2bae10e00e16882de740d2c2327cf8..7abb14830c105af774779f4e9ac54af7fcaae57b 100644 (file)
--- a/src/psqt.h
+++ b/src/psqt.h
@@ -24,7 +24,7 @@
 #include "types.h"
 
 
-namespace PSQT
+namespace Stockfish::PSQT
 {
 
 extern Score psq[PIECE_NB][SQUARE_NB];
@@ -32,7 +32,7 @@ extern Score psq[PIECE_NB][SQUARE_NB];
 // Fill psqt array from a set of internally linked parameters
 extern void init();
 
-} // namespace PSQT
+} // namespace Stockfish::PSQT
 
 
 #endif // PSQT_H_INCLUDED

diff --git a/src/search.cpp b/src/search.cpp
index b3bd2f0371f393767cc52a948c26cf79beddfa83..4e2ec095cb3c0912a2e2627c97337473f550c8c3 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -35,6 +35,8 @@
 #include "uci.h"
 #include "syzygy/tbprobe.h"
 
+namespace Stockfish {
+
 namespace Search {
 
   LimitsType Limits;
@@ -422,7 +424,7 @@ void Thread::search() {
           while (true)
           {
               Depth adjustedDepth = std::max(1, rootDepth - failedHighCnt - searchAgainCounter);
-              bestValue = ::search<PV>(rootPos, ss, alpha, beta, adjustedDepth, false);
+              bestValue = Stockfish::search<PV>(rootPos, ss, alpha, beta, adjustedDepth, false);
 
               // Bring the best move to the front. It is critical that sorting
               // is done with a stable algorithm because all the values but the
@@ -2034,3 +2036,5 @@ void Tablebases::rank_root_moves(Position& pos, Search::RootMoves& rootMoves) {
             m.tbRank = 0;
     }
 }
+
+} // namespace Stockfish

diff --git a/src/search.h b/src/search.h
index 5e51c18e043398fe44e5cee7e3125a39114e1b9d..6f9fbd0527702516daf0c39ee30224b57a87d295 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -25,6 +25,8 @@
 #include "movepick.h"
 #include "types.h"
 
+namespace Stockfish {
+
 class Position;
 
 namespace Search {
@@ -107,4 +109,6 @@ void clear();
 
 } // namespace Search
 
+} // namespace Stockfish
+
 #endif // #ifndef SEARCH_H_INCLUDED

diff --git a/src/syzygy/tbprobe.cpp b/src/syzygy/tbprobe.cpp
index 115815e121abbe57114e9ae00527c4e8cb0c8078..5cfd38e5577feb8087eb37eff4d3458b92dee1de 100644 (file)
--- a/src/syzygy/tbprobe.cpp
+++ b/src/syzygy/tbprobe.cpp
@@ -50,9 +50,11 @@
 #include <windows.h>
 #endif
 
-using namespace Tablebases;
+using namespace Stockfish::Tablebases;
 
-int Tablebases::MaxCardinality;
+int Stockfish::Tablebases::MaxCardinality;
+
+namespace Stockfish {
 
 namespace {
 
@@ -1610,3 +1612,5 @@ bool Tablebases::root_probe_wdl(Position& pos, Search::RootMoves& rootMoves) {
 
     return true;
 }
+
+} // namespace Stockfish

diff --git a/src/syzygy/tbprobe.h b/src/syzygy/tbprobe.h
index cefd39ce8de3ee775fe4e01eb94965ff37c0201f..56734af9bdc6227d0bb68a7804d10b54ebb82003 100644 (file)
--- a/src/syzygy/tbprobe.h
+++ b/src/syzygy/tbprobe.h
@@ -23,7 +23,7 @@
 
 #include "../search.h"
 
-namespace Tablebases {
+namespace Stockfish::Tablebases {
 
 enum WDLScore {
     WDLLoss        = -2, // Loss
@@ -73,6 +73,6 @@ inline std::ostream& operator<<(std::ostream& os, const ProbeState v) {
     return os;
 }
 
-}
+} // namespace Stockfish::Tablebases
 
 #endif

diff --git a/src/thread.cpp b/src/thread.cpp
index a12c0bccc1122f2c84eb6bb32aaa5902f7d2b7a9..3ef73dfa322ba39250d01b784308f1d68f842b0e 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -26,6 +26,8 @@
 #include "syzygy/tbprobe.h"
 #include "tt.h"
 
+namespace Stockfish {
+
 ThreadPool Threads; // Global object
 
 
@@ -258,3 +260,5 @@ void ThreadPool::wait_for_search_finished() const {
         if (th != front())
             th->wait_for_search_finished();
 }
+
+} // namespace Stockfish

diff --git a/src/thread.h b/src/thread.h
index 585f208813a2134c091e0b8de43fc45db5820bae..2b3dea0d7cccdc05eb42f8c6f57476257a1032b8 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -32,6 +32,7 @@
 #include "search.h"
 #include "thread_win32_osx.h"
 
+namespace Stockfish {
 
 /// Thread class keeps together all the thread-related stuff. We use
 /// per-thread pawn and material hash tables so that once we get a
@@ -128,4 +129,6 @@ private:
 
 extern ThreadPool Threads;
 
+} // namespace Stockfish
+
 #endif // #ifndef THREAD_H_INCLUDED

diff --git a/src/thread_win32_osx.h b/src/thread_win32_osx.h
index a0e4d1994f8af4324a0178cfa8943065c21812d0..a21674cc68f0ddbefef117e2884ddf83a027a884 100644 (file)
--- a/src/thread_win32_osx.h
+++ b/src/thread_win32_osx.h
@@ -31,6 +31,8 @@
 
 #include <pthread.h>
 
+namespace Stockfish {
+
 static const size_t TH_STACK_SIZE = 8 * 1024 * 1024;
 
 template <class T, class P = std::pair<T*, void(T::*)()>>
@@ -57,10 +59,16 @@ public:
   void join() { pthread_join(thread, NULL); }
 };
 
+} // namespace Stockfish
+
 #else // Default case: use STL classes
 
+namespace Stockfish {
+
 typedef std::thread NativeThread;
 
+} // namespace Stockfish
+
 #endif
 
 #endif // #ifndef THREAD_WIN32_OSX_H_INCLUDED

diff --git a/src/timeman.cpp b/src/timeman.cpp
index fc4fbaacd46ea894eb3661fed4389bc6f0fda890..f742d1e44221cd831022774a1163211812a81c56 100644 (file)
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -24,6 +24,8 @@
 #include "timeman.h"
 #include "uci.h"
 
+namespace Stockfish {
+
 TimeManagement Time; // Our global time management object
 
 
@@ -95,3 +97,5 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) {
   if (Options["Ponder"])
       optimumTime += optimumTime / 4;
 }
+
+} // namespace Stockfish

diff --git a/src/timeman.h b/src/timeman.h
index 55a68de4771d976acdd13bca7f6503672bf93a14..b1878d65f25fca5e77fade3c3765966296ac4e81 100644 (file)
--- a/src/timeman.h
+++ b/src/timeman.h
@@ -23,6 +23,8 @@
 #include "search.h"
 #include "thread.h"
 
+namespace Stockfish {
+
 /// The TimeManagement class computes the optimal time to think depending on
 /// the maximum available time, the game move number and other parameters.
 
@@ -44,4 +46,6 @@ private:
 
 extern TimeManagement Time;
 
+} // namespace Stockfish
+
 #endif // #ifndef TIMEMAN_H_INCLUDED

diff --git a/src/tt.cpp b/src/tt.cpp
index cb5af5c85905620a1537d06a7339ce6bca17176f..1f495ca9d12be229aaef9a8171690c5ae5d3ad73 100644 (file)
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -26,6 +26,8 @@
 #include "tt.h"
 #include "uci.h"
 
+namespace Stockfish {
+
 TranspositionTable TT; // Our global transposition table
 
 /// TTEntry::save() populates the TTEntry with a new node's data, possibly
@@ -156,3 +158,5 @@ int TranspositionTable::hashfull() const {
 
   return cnt / ClusterSize;
 }
+
+} // namespace Stockfish

diff --git a/src/tt.h b/src/tt.h
index a750b6c465706c1daa22947b082b42a8decbf641..d915d92e43f545da1826e8408e148e952c90316a 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -22,6 +22,8 @@
 #include "misc.h"
 #include "types.h"
 
+namespace Stockfish {
+
 /// TTEntry struct is the 10 bytes transposition table entry, defined as below:
 ///
 /// key        16 bit
@@ -100,4 +102,6 @@ private:
 
 extern TranspositionTable TT;
 
+} // namespace Stockfish
+
 #endif // #ifndef TT_H_INCLUDED

diff --git a/src/tune.cpp b/src/tune.cpp
index 424bdac85dcfef5d0f0fcdfce4e6c196d2b38343..d9618efc9c7d94f6e27dcd510d214829ce300ab4 100644 (file)
--- a/src/tune.cpp
+++ b/src/tune.cpp
@@ -26,6 +26,8 @@
 
 using std::string;
 
+namespace Stockfish {
+
 bool Tune::update_on_last;
 const UCI::Option* LastOption = nullptr;
 BoolConditions Conditions;
@@ -126,6 +128,8 @@ void BoolConditions::set() {
       sync_cout << binary[i] << sync_endl;
 }
 
+} // namespace Stockfish
+
 
 // Init options with tuning session results instead of default values. Useful to
 // get correct bench signature after a tuning session or to test tuned values.
@@ -138,7 +142,11 @@ void BoolConditions::set() {
 
 #include <cmath>
 
+namespace Stockfish {
+
 void Tune::read_results() {
 
   /* ...insert your values here... */
 }
+
+} // namespace Stockfish

diff --git a/src/tune.h b/src/tune.h
index c2cd0c97e392361c0fcbde021de001fb1246d872..c904c09dc9442b294004c4364d233347667ab3d6 100644 (file)
--- a/src/tune.h
+++ b/src/tune.h
@@ -24,6 +24,8 @@
 #include <type_traits>
 #include <vector>
 
+namespace Stockfish {
+
 typedef std::pair<int, int> Range; // Option's min-max values
 typedef Range (RangeFun) (int);
 
@@ -190,4 +192,6 @@ public:
 #define TUNE_CONDITIONS() int UNIQUE(c, __LINE__) = (Conditions.init(__COUNTER__), 0); \
                           TUNE(Conditions, set_conditions)
 
+} // namespace Stockfish
+
 #endif // #ifndef TUNE_H_INCLUDED

diff --git a/src/types.h b/src/types.h
index d270384eb998c6b7cd773c44f3f8c789a5ea07aa..efebce1a7b6f730f2b77c111bb66c6efed73fc79 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -83,6 +83,8 @@
 #  define pext(b, m) 0
 #endif
 
+namespace Stockfish {
+
 #ifdef USE_POPCNT
 constexpr bool HasPopCnt = true;
 #else
@@ -482,6 +484,8 @@ constexpr Key make_key(uint64_t seed) {
   return seed * 6364136223846793005ULL + 1442695040888963407ULL;
 }
 
+} // namespace Stockfish
+
 #endif // #ifndef TYPES_H_INCLUDED
 
 #include "tune.h" // Global visibility to tuning setup

diff --git a/src/uci.cpp b/src/uci.cpp
index b3017e910696860b0bd7da46756ed97f9dfc61bf..47a8824e8035294ca11fc23a6a728ba4f85656bc 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -34,6 +34,8 @@
 
 using namespace std;
 
+namespace Stockfish {
+
 extern vector<string> setup_bench(const Position&, istream&);
 
 namespace {
@@ -369,3 +371,5 @@ Move UCI::to_move(const Position& pos, string& str) {
 
   return MOVE_NONE;
 }
+
+} // namespace Stockfish

diff --git a/src/uci.h b/src/uci.h
index edcfcadece5fb1c0afcd66fa85d08263722925d2..d3160109d6e540e7f527976ff3cbb76613e39b46 100644 (file)
--- a/src/uci.h
+++ b/src/uci.h
@@ -24,6 +24,8 @@
 
 #include "types.h"
 
+namespace Stockfish {
+
 class Position;
 
 namespace UCI {
@@ -78,4 +80,6 @@ Move to_move(const Position& pos, std::string& str);
 
 extern UCI::OptionsMap Options;
 
+} // namespace Stockfish
+
 #endif // #ifndef UCI_H_INCLUDED

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 03f377b3994b55d1aa8533371763f05b090ccd29..d59c010017eee517dfa5f56dac1c2dbcebdcb423 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -31,6 +31,8 @@
 
 using std::string;
 
+namespace Stockfish {
+
 UCI::OptionsMap Options; // Global object
 
 namespace UCI {
@@ -190,3 +192,5 @@ Option& Option::operator=(const string& v) {
 }
 
 } // namespace UCI
+
+} // namespace Stockfish

diff --git a/tests/instrumented.sh b/tests/instrumented.sh
index 03e9c9de093ca37fea339f144569d00bfcb01945..bfb50e94c196710680ec999f0a079e334c5f686c 100755 (executable)
--- a/tests/instrumented.sh
+++ b/tests/instrumented.sh
@@ -39,16 +39,16 @@ case $1 in
     threads="2"
 
 cat << EOF > tsan.supp
-race:TTEntry::move
-race:TTEntry::depth
-race:TTEntry::bound
-race:TTEntry::save
-race:TTEntry::value
-race:TTEntry::eval
-race:TTEntry::is_pv
-
-race:TranspositionTable::probe
-race:TranspositionTable::hashfull
+race:Stockfish::TTEntry::move
+race:Stockfish::TTEntry::depth
+race:Stockfish::TTEntry::bound
+race:Stockfish::TTEntry::save
+race:Stockfish::TTEntry::value
+race:Stockfish::TTEntry::eval
+race:Stockfish::TTEntry::is_pv
+
+race:Stockfish::TranspositionTable::probe
+race:Stockfish::TranspositionTable::hashfull
 
 EOF