Skip to content

Fixes for macOS #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OpenSpiel merged 2 commits into from
Sep 4, 2019
Merged

Fixes for macOS #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4599868
Fixes for macOS
bradhowes Aug 28, 2019
da8abca
Fix build for macOS
bradhowes Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${OS_PYTHON_VERSION} 10
fi
elif [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX
brew install python3 gcc@7
[[ -x "$(type python3)" ]] || brew install python3 || echo "** Warning: failed 'brew install python3' -- continuing"
# [[ -x "${type g++-7)" ]] || brew install gcc@7 || echo "** Warning: failed 'brew install gcc@7' -- continuing"
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python3 get-pip.py
pip3 install virtualenv
Expand All @@ -38,8 +39,12 @@ else
exit 1
fi

git clone -b 'v2.2.4' --single-branch --depth 1 https://github.com/pybind/pybind11.git
[[ -d "./pybind11" ]] || git clone -b 'v2.2.4' --single-branch --depth 1 https://github.com/pybind/pybind11.git
# TODO: Point to the official https://github.com/dds-bridge/dds.git
# when pull requests are in
git clone -b 'develop' --single-branch --depth 1 https://github.com/jblespiau/dds.git open_spiel/games/bridge/double_dummy_solver
git clone -b 'master' --single-branch --depth 1 https://github.com/abseil/abseil-cpp.git open_spiel/abseil-cpp
[[ -d open_spiel/games/bridge/double_dummy_solver ]] || \
git clone -b 'develop' --single-branch --depth 1 https://github.com/jblespiau/dds.git \
open_spiel/games/bridge/double_dummy_solver
[[ -d open_spiel/abseil-cpp ]] || \
git clone -b 'master' --single-branch --depth 1 https://github.com/abseil/abseil-cpp.git \
open_spiel/abseil-cpp
4 changes: 2 additions & 2 deletions open_spiel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Any Python library found with CMake modules FindPython2/FindPython3 that \
agrees with the major version and is at least as high for minor version and \
patch number is accepted. If the variable is not set, we use the FindPython \
module which favours Python 3 over Python 2 if both are available.")
set (CMAKE_CXX_COMPILER "/usr/bin/g++")
# set (CMAKE_CXX_COMPILER "/usr/bin/g++")
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_FLAGS "-Werror")
set (CMAKE_CXX_FLAGS "-Werror -undefined dynamic_lookup")

# Position-independent code is needed for Python extension modules.
set (CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand Down
8 changes: 4 additions & 4 deletions open_spiel/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
if(${Python_TARGET_VERSION} STREQUAL "")
if(Python_TARGET_VERSION STREQUAL "")
find_package(Python COMPONENTS Development)
include_directories(SYSTEM ${Python_INCLUDE_DIRS})
elseif(${Python_TARGET_VERSION} VERSION_LESS "3.0.0")
elseif(Python_TARGET_VERSION VERSION_LESS "3.0.0")
message(FATAL_ERROR
"Only Python 3 is supported, not ${Python_TARGET_VERSION}")
elseif(${Python_TARGET_VERSION} VERSION_GREATER_EQUAL "3.0.0")
elseif(Python_TARGET_VERSION VERSION_GREATER_EQUAL "3.0.0")
find_package(Python3 COMPONENTS Development)
include_directories(SYSTEM ${Python3_INCLUDE_DIRS})
if(${Python3_VERSION} VERSION_LESS ${Python_TARGET_VERSION})
if(Python3_VERSION VERSION_LESS Python_TARGET_VERSION)
message(FATAL_ERROR
"Python found ${Python3_VERSION} < ${Python_TARGET_VERSION}")
endif()
Expand Down
7 changes: 4 additions & 3 deletions open_spiel/scripts/build_and_run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ set -e # exit when any command fails
set -x

CXX=g++
NPROC=nproc
if [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX
alias nproc="sysctl -n hw.physicalcpu"
NPROC="sysctl -n hw.physicalcpu"
CXX=/usr/local/bin/g++-7
fi

MAKE_NUM_PROCS=$(nproc)
let TEST_NUM_PROCS=4*$(nproc)
MAKE_NUM_PROCS=$(${NPROC})
let TEST_NUM_PROCS=4*${MAKE_NUM_PROCS}

PYVERSION=$(python3 -c 'import sys; print(sys.version.split(" ")[0])')
PY_VERSION_MAJOR=$(python3 -c 'import sys; print(sys.version_info.major)')
Expand Down