Compile boost from source to fix macOS wheels (#1688)

This commit is contained in:
Philipp Moritz
2018-03-08 23:22:23 -08:00
committed by Robert Nishihara
parent 91464a56dd
commit 5ef0892236
6 changed files with 11 additions and 11 deletions
+3 -3
View File
@@ -43,7 +43,7 @@ elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then
echo "Updating brew."
brew update > /dev/null
fi
brew install cmake pkg-config automake autoconf libtool boost openssl bison > /dev/null
brew install cmake pkg-config automake autoconf libtool openssl bison > /dev/null
# Install miniconda.
wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh -nv
bash miniconda.sh -b -p $HOME/miniconda
@@ -59,7 +59,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then
echo "Updating brew."
brew update > /dev/null
fi
brew install cmake pkg-config automake autoconf libtool boost openssl bison > /dev/null
brew install cmake pkg-config automake autoconf libtool openssl bison > /dev/null
# Install miniconda.
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh -nv
bash miniconda.sh -b -p $HOME/miniconda
@@ -86,7 +86,7 @@ elif [[ "$MAC_WHEELS" == "1" ]]; then
echo "Updating brew."
brew update > /dev/null
fi
brew install cmake pkg-config automake autoconf libtool boost openssl bison > /dev/null
brew install cmake pkg-config automake autoconf libtool openssl bison > /dev/null
# We use true to avoid exiting with an error code because the brew install can
# fail if a package is already installed.
true
+1 -1
View File
@@ -26,7 +26,7 @@ To build Ray, first install the following dependencies. We recommend using
.. code-block:: bash
brew update
brew install cmake pkg-config automake autoconf libtool boost openssl bison wget
brew install cmake pkg-config automake autoconf libtool openssl bison wget
pip install cython
+3 -1
View File
@@ -86,7 +86,9 @@ void ObjectManager::SchedulePull(const ObjectID &object_id, int wait_ms) {
pull_requests_[object_id] = Timer(new boost::asio::deadline_timer(
io_service_, boost::posix_time::milliseconds(wait_ms)));
pull_requests_[object_id]->async_wait(
boost::bind(&ObjectManager::SchedulePullHandler, this, object_id));
[this, object_id](const boost::system::error_code &error_code) {
RAY_CHECK_OK(SchedulePullHandler(object_id));
});
}
ray::Status ObjectManager::SchedulePullHandler(const ObjectID &object_id) {
+1 -1
View File
@@ -16,7 +16,7 @@ class LineageCacheEntry {
private:
// TODO(swang): This should be an enum of the state of the entry - goes from
// completely local, to dirty, to in flight, to committed.
bool dirty_;
// bool dirty_;
};
class LineageCacheTaskEntry : public LineageCacheEntry {};
+1
View File
@@ -20,6 +20,7 @@ if [ ! -d $TP_DIR/build/parquet-cpp ]; then
if [ "$unamestr" == "Darwin" ]; then
OPENSSL_ROOT_DIR=$OPENSSL_DIR \
PATH="$BISON_DIR:$PATH" \
BOOST_ROOT=$TP_DIR/pkg/boost \
ARROW_HOME=$TP_DIR/pkg/arrow/cpp/build/cpp-install \
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$PARQUET_HOME \
+2 -5
View File
@@ -31,12 +31,9 @@ bash "$TP_SCRIPT_DIR/build_redis.sh"
bash "$TP_SCRIPT_DIR/build_credis.sh"
##############################################
# boost if necessary
# boost
##############################################
if [[ "$unamestr" == "Linux" ]]; then
echo "building boost"
bash "$TP_SCRIPT_DIR/build_boost.sh"
fi
bash "$TP_SCRIPT_DIR/build_boost.sh"
##############################################
# flatbuffers if necessary