mirror of
https://github.com/wassname/ray.git
synced 2026-07-24 13:20:22 +08:00
Update arrow using Plasma with glog (#2913)
* Update Arrow to Plasma with glog and update the building process * Remove ParquetExternalProject.cmake * Fix Mac building error in CI * Use find_package(BISON) instead of hard code * Revert BISON binary to hard code. * Remove build_parquet.sh * Update setup.sh
This commit is contained in:
committed by
Philipp Moritz
parent
3267676994
commit
93ded5a3d5
Vendored
-75
@@ -1,75 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
|
||||
# Cause the script to exit if a single command fails.
|
||||
set -e
|
||||
|
||||
unamestr="$(uname)"
|
||||
TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)/../
|
||||
PARQUET_HOME=$TP_DIR/pkg/arrow/cpp/build/cpp-install
|
||||
OPENSSL_DIR=/usr/local/opt/openssl
|
||||
BISON_DIR=/usr/local/opt/bison/bin
|
||||
TARGET_COMMIT_ID=63f41b00bddecb172bd5b3aa0366b4653f498811
|
||||
|
||||
build_parquet() {
|
||||
echo "Building Parquet"
|
||||
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 \
|
||||
-DPARQUET_BUILD_BENCHMARKS=off \
|
||||
-DPARQUET_BUILD_EXECUTABLES=off \
|
||||
-DPARQUET_BUILD_TESTS=off \
|
||||
.
|
||||
|
||||
OPENSSL_ROOT_DIR=$OPENSSL_DIR \
|
||||
PATH="$BISON_DIR:$PATH" \
|
||||
make -j4
|
||||
|
||||
OPENSSL_ROOT_DIR=$OPENSSL_DIR \
|
||||
PATH="$BISON_DIR:$PATH" \
|
||||
make install
|
||||
else
|
||||
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 \
|
||||
-DPARQUET_BUILD_BENCHMARKS=off \
|
||||
-DPARQUET_BUILD_EXECUTABLES=off \
|
||||
-DPARQUET_BUILD_TESTS=off \
|
||||
.
|
||||
|
||||
PARQUET_HOME=$TP_DIR/pkg/arrow/cpp/build/cpp-install \
|
||||
BOOST_ROOT=$TP_DIR/pkg/boost \
|
||||
make -j4
|
||||
make install
|
||||
fi
|
||||
}
|
||||
|
||||
if [ ! -d $TP_DIR/build/parquet-cpp/.git ]; then
|
||||
if [[ -d $TP_DIR/build/parquet-cpp ]]; then
|
||||
rm -rf $TP_DIR/build/parquet-cpp
|
||||
fi
|
||||
git clone -q https://github.com/apache/parquet-cpp.git "$TP_DIR/build/parquet-cpp"
|
||||
pushd $TP_DIR/build/parquet-cpp
|
||||
git fetch origin master
|
||||
git checkout $TARGET_COMMIT_ID
|
||||
|
||||
build_parquet
|
||||
popd
|
||||
else
|
||||
pushd $TP_DIR/build/parquet-cpp
|
||||
if [[ "$TARGET_COMMIT_ID" != `git rev-parse HEAD` ]]; then
|
||||
# TARGET_COMMIT_ID may change to later commit.
|
||||
echo "Commit ID mismatches."
|
||||
git fetch origin master
|
||||
git checkout $TARGET_COMMIT_ID
|
||||
build_parquet
|
||||
fi
|
||||
|
||||
popd
|
||||
fi
|
||||
Vendored
-5
@@ -57,11 +57,6 @@ bash "$TP_SCRIPT_DIR/build_credis.sh"
|
||||
#RAY_BUILD_JAVA=$RAY_BUILD_JAVA \
|
||||
#bash "$TP_SCRIPT_DIR/build_arrow.sh" $PYTHON_EXECUTABLE
|
||||
|
||||
##############################################
|
||||
# parquet (skipped as it is inlined in build_arrow.sh)
|
||||
##############################################
|
||||
# bash "$TP_SCRIPT_DIR/build_parquet.sh"
|
||||
|
||||
##############################################
|
||||
# catapult
|
||||
##############################################
|
||||
|
||||
Reference in New Issue
Block a user