apply changes from google-deepmind#873 locally

acforvs · Jun 30, 2022 · 05b7dda · 05b7dda
1 parent 87e1808
commit 05b7dda
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/open_spiel/CMakeLists.txt b/open_spiel/CMakeLists.txt
@@ -197,6 +197,7 @@ set (OPEN_SPIEL_CORE_FILES
 # We add the subdirectory here so open_spiel_core can #include absl.
 set(ABSL_PROPAGATE_CXX_STD ON)
 add_subdirectory (abseil-cpp)
+include_directories (abseil-cpp)
 
 # Just the core without any of the games
 add_library(open_spiel_core OBJECT ${OPEN_SPIEL_CORE_FILES})

diff --git a/open_spiel/python/CMakeLists.txt b/open_spiel/python/CMakeLists.txt
@@ -75,6 +75,7 @@ endif()
 
 
 # List of all Python bindings to add to pyspiel.
+include_directories (../pybind11_abseil ../../pybind11/include)
 set(PYTHON_BINDINGS ${PYTHON_BINDINGS}
   pybind11/algorithms_corr_dist.cc
   pybind11/algorithms_corr_dist.h

diff --git a/open_spiel/python/pybind11/games_euchre.cc b/open_spiel/python/pybind11/games_euchre.cc
@@ -19,6 +19,7 @@
 #include "open_spiel/games/euchre.h"
 #include "open_spiel/python/pybind11/pybind11.h"
 #include "open_spiel/spiel.h"
+#include "pybind11_abseil/absl_casters.h"
 
 PYBIND11_SMART_HOLDER_TYPE_CASTERS(open_spiel::euchre::EuchreGame);
 PYBIND11_SMART_HOLDER_TYPE_CASTERS(open_spiel::euchre::EuchreState);

diff --git a/open_spiel/scripts/install.sh b/open_spiel/scripts/install.sh
@@ -107,7 +107,15 @@ fi
 
 DIR="open_spiel/abseil-cpp"
 if [[ ! -d ${DIR} ]]; then
-  cached_clone -b '20211102.0' --single-branch --depth 1 https://github.com/abseil/abseil-cpp.git open_spiel/abseil-cpp
+  cached_clone -b '20211102.0' --single-branch --depth 1 https://github.com/abseil/abseil-cpp.git ${DIR}
+fi
+
+DIR="open_spiel/pybind11_abseil"
+if [[ ! -d ${DIR} ]]; then
+  cached_clone -b 'master' --single-branch --depth 1 https://github.com/pybind/pybind11_abseil.git ${DIR}
+  pushd ${DIR}
+  git checkout '73992b5'
+  popd
 fi
 
 # Optional dependencies.