Hex

.github/workflows/variants.yml

@@ -1,4 +1,3 @@
-
 name: variants
 
 on: [ pull_request, workflow_dispatch ]
@@ -33,17 +32,17 @@ jobs:
         pwd
         chmod +x install.sh
         sudo ./install.sh
-
     - name: Configure CMake
       working-directory: ${{github.workspace}}/engine
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: |
         mkdir build
-        cmake -B ./build/chess -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=1 -DMODE_LICHESS=0 -DMODE_XIANGQI=0 -DMODE_STRATEGO=0 .
-        cmake -B ./build/lichess -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=1 -DMODE_XIANGQI=0 -DMODE_STRATEGO=0  .
-        cmake -B ./build/xiangqi -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=0 -DMODE_XIANGQI=1 -DMODE_STRATEGO=0 .
-        cmake -B ./build/stratego -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=0 -DMODE_XIANGQI=0 -DMODE_STRATEGO=1 .
+        cmake -B ./build/chess -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=1 -DMODE_LICHESS=0 -DMODE_XIANGQI=0 -DMODE_STRATEGO=0 -DMODE_OPEN_SPIEL=0 .
+        cmake -B ./build/lichess -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=1 -DMODE_XIANGQI=0 -DMODE_STRATEGO=0 -DMODE_OPEN_SPIEL=0  .
+        cmake -B ./build/xiangqi -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=1 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=0 -DMODE_XIANGQI=1 -DMODE_STRATEGO=0 -DMODE_OPEN_SPIEL=0 .
+        cmake -B ./build/stratego -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=0 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=0 -DMODE_XIANGQI=0 -DMODE_STRATEGO=1 -DMODE_OPEN_SPIEL=0 .
+        cmake -B ./build/hex -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_PROFILING=0 -DUSE_RL=0 -DBACKEND_TENSORRT=0 -DBACKEND_MXNET=0 -DBACKEND_TORCH=0 -DUSE_960=0 -DBUILD_TESTS=0 -DMODE_CRAZYHOUSE=0 -DMODE_CHESS=0 -DMODE_LICHESS=0 -DMODE_XIANGQI=0 -DMODE_STRATEGO=0 -DMODE_OPEN_SPIEL=1 .
 
     - name: Build
       # Build your program with the given configuration
@@ -52,6 +51,7 @@ jobs:
         cmake --build ${{github.workspace}}/engine/build/lichess --config ${{env.BUILD_TYPE}}
         cmake --build ${{github.workspace}}/engine/build/xiangqi --config ${{env.BUILD_TYPE}}
         cmake --build ${{github.workspace}}/engine/build/stratego --config ${{env.BUILD_TYPE}}
+        cmake --build ${{github.workspace}}/engine/build/hex --config ${{env.BUILD_TYPE}}
 
     - name: Test
       working-directory: ${{github.workspace}}/engine
@@ -62,3 +62,4 @@ jobs:
         ./build/lichess/MultiAra
         ./build/xiangqi/XiangqiAra
         ./build/stratego/StrategoAra
+        ./build/hex/OpenSpielAra

.gitmodules

@@ -1,13 +1,12 @@
 [submodule "engine/3rdparty/Stockfish"]
 	path = engine/3rdparty/Stockfish
 	url = https://github.com/QueensGambit/Stockfish.git
-[submodule "engine/3rdparty/open_spiel"]
-	path = engine/3rdparty/open_spiel
-	url = https://github.com/BluemlJ/open_spiel.git
-	branch = thesis
 [submodule "engine/3rdparty/Fairy-Stockfish"]
 	path = engine/3rdparty/Fairy-Stockfish
 	url = https://github.com/xsr7qsr/Fairy-Stockfish.git
 [submodule "engine/3rdparty/blaze"]
 	path = engine/3rdparty/blaze
 	url = https://bitbucket.org/blaze-lib/blaze.git
+[submodule "engine/3rdparty/open_spiel"]
+	path = engine/3rdparty/open_spiel
+	url = https://github.com/BluemlJ/open_spiel.git

DeepCrazyhouse/configs/rl_config.py

@@ -71,4 +71,3 @@ class UCIConfigArena:
     Centi_Temperature: int = 60
 
 
-

DeepCrazyhouse/configs/train_config_template.py → DeepCrazyhouse/configs/train_confi_template.py

@@ -132,3 +132,4 @@ class TrainObjects:
     momentum_schedule = None
     metrics = None
     variant_metrics = None
+

engine/CMakeLists.txt

@@ -307,6 +307,8 @@ if (MODE_OPEN_SPIEL OR MODE_STRATEGO)
             "3rdparty/open_spiel/open_spiel/games/chess/*.cc"
             "3rdparty/open_spiel/open_spiel/games/hex.h"
             "3rdparty/open_spiel/open_spiel/games/hex.cc"
+            "3rdparty/open_spiel/open_spiel/games/dark_hex.h"
+            "3rdparty/open_spiel/open_spiel/games/dark_hex.cc"
             )
     endif()
 

engine/src/environments/open_spiel/openspielstate.cpp

@@ -56,17 +56,16 @@ inline void OpenSpielState::check_variant(int variant)
 void OpenSpielState::set(const std::string &fenStr, bool isChess960, int variant)
 {
     check_variant(variant);
-    if (currentVariant == open_spiel::gametype::SupportedOpenSpielVariants::HEX) {
-        info_string_important("NewInitialState from string is not implemented for HEX.");
-        return;
-    }
     spielState = spielGame->NewInitialState(fenStr);
 }
 
 void OpenSpielState::get_state_planes(bool normalize, float *inputPlanes, Version version) const
 {
     std::fill(inputPlanes, inputPlanes+StateConstantsOpenSpiel::NB_VALUES_TOTAL(), 0.0f);
-    // TODO
+    //info_string_important(StateConstantsOpenSpiel::NB_VALUES_TOTAL());
+    std::vector<float> v(spielGame->ObservationTensorSize());
+    spielState->ObservationTensor(spielState->CurrentPlayer(), absl::MakeSpan(v));
+    std::copy( v.begin(), v.end(), inputPlanes);
 }
 
 unsigned int OpenSpielState::steps_from_null() const
@@ -86,6 +85,13 @@ std::string OpenSpielState::fen() const
 
 void OpenSpielState::do_action(Action action)
 {
+    auto player = spielState->CurrentPlayer();
+    if(player == 1){
+        int X = action / 11; //currently easier to set board size fix; change it later
+        int Y = action % 11;
+        spielState->ApplyAction(Y*11+X);
+        return;
+    }
     spielState->ApplyAction(action);
 }
 

engine/src/environments/open_spiel/openspielstate.h

@@ -32,13 +32,15 @@
 #include "open_spiel/spiel.h"
 #include "open_spiel/games/chess.h"
 #include "open_spiel/games/hex.h"
+#include "open_spiel/games/dark_hex.h"
 
 namespace open_spiel {
 namespace gametype {
 enum SupportedOpenSpielVariants : uint8_t {
     HEX = 0,  // 11x11 board
-    CHESS = 1,
-    YORKTOWN = 2,
+    DARKHEX = 1,
+    CHESS = 2,
+    YORKTOWN = 3,
 };
 }
 }
@@ -47,33 +49,33 @@ class StateConstantsOpenSpiel : public StateConstantsInterface<StateConstantsOpe
 {
 public:
     static uint BOARD_WIDTH() {
-        return open_spiel::chess::kDefaultBoardSize;
+        return open_spiel::hex::kDefaultBoardSize;
     }
     static uint BOARD_HEIGHT() {
-        return  open_spiel::chess::kDefaultBoardSize;
+        return  open_spiel::hex::kDefaultBoardSize;
     }
     static uint NB_CHANNELS_TOTAL() {
-        return 34U;  // TODO
+        return 9;  // TODO
     }
     static uint NB_LABELS() {
-        return 2272U;  // TODO
+        return 121; // NB_CHANNELS_TOTAL()*BOARD_HEIGHT()*BOARD_WIDTH();  // TODO
     }
     static uint NB_LABELS_POLICY_MAP() {
-        return 5184U;  // TODO
+        return BOARD_HEIGHT()*BOARD_WIDTH();  // TODO
     }
     static uint NB_AUXILIARY_OUTPUTS() {
         return 0U;
     }
     static int NB_PLAYERS() {
-        return  open_spiel::chess::NumPlayers();
+        return  open_spiel::hex::kNumPlayers;
     }
     static std::string action_to_uci(Action action, bool is960) {
         // TODO use actual uci for this
         return std::to_string(action);
     }
     template<PolicyType p = normal, MirrorType m = notMirrored>
     static MoveIdx action_to_index(Action action) {
-        return 0;  // TODO
+        return action;  // TODO
     }
     static void init(bool isPolicyMap) {
         return; // pass

engine/src/rl/selfplay.cpp

@@ -224,6 +224,8 @@ Result SelfPlay::generate_arena_game(MCTSAgent* whitePlayer, MCTSAgent* blackPla
     gamePGN.white = whitePlayer->get_name();
     gamePGN.black = blackPlayer->get_name();
     unique_ptr<StateObj> state= make_unique<StateObj>();
+    //unique_ptr<StateObj> state = init_starting_state_from_raw_policy(*rawAgent, 0, gamePGN, variant, is960, rlSettings->rawPolicyProbabilityTemperature);
+
     if (fen != "") {
         // set starting fen
         state->set(fen, is960, variant);

engine/src/uci/crazyara.cpp

@@ -133,12 +133,11 @@ void CrazyAra::uci_loop(int argc, char *argv[])
 #ifdef USE_RL
         else if (token == "selfplay")   selfplay(is);
         else if (token == "arena")      arena(is);
-    #ifdef MODE_STRATEGO
         // Test if the new modes are also usable for chess and others
+
         else if (token == "mctsmatch")   mctsarena(is, "", "");
         else if (token == "mctstournament")   mctstournament(is);
         else if (token == "tournament")   evaltournament(is);
-    #endif
 #endif   
         else
             cout << "Unknown command: " << cmd << endl;
@@ -416,6 +415,7 @@ void CrazyAra::mctstournament(istringstream &is)
     for(int i = 0;i<combinations.size();i++){
         std::istringstream iss (combinations[i] + std::to_string(numberofgames));
         mctsarena(iss, "", "");
+
     }
 
     exit(0);

engine/src/uci/variants.h

@@ -61,6 +61,7 @@ const static vector<string> availableVariants = {
 #endif
 #ifdef MODE_OPEN_SPIEL
     "hex",
+    "darkhex",
 #endif
 };
 
@@ -70,9 +71,11 @@ const int SUBVARIANT_NB = 20; // Thats high quality code
 #endif
 
 const static string StartFENs[SUBVARIANT_NB] = {
-    #ifndef MODE_STRATEGO
-    "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1",
+
+    #ifdef MODE_OPEN_SPIEL
+    ". . . . . . . . . . .  . . . . . . . . . . .   . . . . . . . . . . .    . . . . . . . . . . .     . . . . . . . . . . .      . . . . . . . . . . .       . . . . . . . . . . .        . . . . . . . . . . .         . . . . . . . . . . .          . . . . . . . . . . .           . . . . . . . . . . .",    
     #endif
+
     #ifdef ANTI
     // "The king has no royal power and accordingly:
     // it may be captured like any other piece
@@ -137,6 +140,7 @@ const static string StartFENs[SUBVARIANT_NB] = {
     #ifdef MODE_STRATEGO
     "MBCaaaaaaaKaaaaaaaaaaaaaaDaaaaaaEaDaaaLaaa__aa__aaaa__aa__aaPaaaWNaOXaQPaaaYaaaaaaaaaaaaaaaaaaaaaaaa r 0",
     #endif
+
 };
 
 #endif // VARIANTS_H