Merge pull request #1250 from google-deepmind:lanctot-patch-60

PiperOrigin-RevId: 652910944
Change-Id: Idac5292327cb87101dad8dfbc488eb86fe42b251

open_spiel/bots/uci/uci_bot.h

@@ -15,6 +15,7 @@
 #ifndef OPEN_SPIEL_BOTS_UCI_BOT_H_
 #define OPEN_SPIEL_BOTS_UCI_BOT_H_
 
+#include <cstdio>   // for size_t, needed by ::getline
 #include <map>
 #include <memory>
 #include <string>
@@ -97,7 +98,7 @@ class UCIBot : public Bot {
   // Input stream member variables for the bot.
   FILE* input_stream_ = nullptr;
   char* input_stream_buffer_ = nullptr;
-  uint64_t input_stream_buffer_size_ = 0;
+  size_t input_stream_buffer_size_ = 0;
 };
 
 /**

open_spiel/scripts/ci_script.sh

@@ -27,9 +27,7 @@ if [[ "$OS" = "Linux" && "$OS_PYTHON_VERSION" = "3.9" ]]; then
   # Still needed to support using venv on Ubuntu 20.04:
   sudo apt-get install python3.9-venv
 elif [[ "$OS" = "Darwin" ]]; then
-  # MacOS uses Python 3.11 and PyTorch does not yet support Python 3.11. For now,
-  # install the specific versions we've requested on MacOS.
-  brew install python@${OS_PYTHON_VERSION}
+  # Python is already intalled via brew in install.sh from actions.yml
   brew link --force python@${OS_PYTHON_VERSION}
 fi
 

open_spiel/scripts/install.sh

@@ -287,10 +287,12 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then  # Mac OSX
   [[ -x `which python3` ]] || brew install python3 || echo "** Warning: failed 'brew install python3' -- continuing"
   # On Github Actions, macOS comes with Python 3.9.
   # We want to test multiple Python versions determined by OS_PYTHON_VERSION.
-  if [[ "$CI" && "${OS_PYTHON_VERSION}" != "3.9" ]]; then
-    brew install "python@${OS_PYTHON_VERSION}"
+  if [[ "$CI" ]]; then
+    # Only install the python version if it's not present. There are issues otherwise.
+    if [[ `brew list python@${OS_PYTHON_VERSION}; echo $?` == 0 ]]; then
+      brew install "python@${OS_PYTHON_VERSION}"
+    fi
     # Uninstall Python 3.9 if we need to.
-    brew list [email protected] && brew unlink [email protected]
     brew link --force --overwrite "python@${OS_PYTHON_VERSION}"
   fi
   `python3 -c "import tkinter" > /dev/null 2>&1` || brew install tcl-tk || echo "** Warning: failed 'brew install tcl-tk' -- continuing"