Skip to content

Commit

Permalink
Update arrow using Plasma with glog (ray-project#2913)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
guoyuhong authored and pcmoritz committed Sep 20, 2018
1 parent 3267676 commit 93ded5a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 141 deletions.
23 changes: 21 additions & 2 deletions cmake/Modules/ArrowExternalProject.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
# - PLASMA_SHARED_LIB

set(arrow_URL https://github.com/apache/arrow.git)
set(arrow_TAG 927bd34aaad875e82beca2584d5d777839fa8bb0)
# The PR for this commit is https://github.com/apache/arrow/pull/2522. We
# include the link here to make it easier to find the right commit because
# Arrow often rewrites git history and invalidates certain commits.
set(arrow_TAG 7104d64ff2cd6c20e29d3cf4ec5c58bc10798f66)

set(ARROW_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/arrow-install)
set(ARROW_HOME ${ARROW_INSTALL_PREFIX})
Expand Down Expand Up @@ -53,11 +56,27 @@ set(ARROW_CMAKE_ARGS
-DARROW_JEMALLOC=off
-DARROW_WITH_BROTLI=off
-DARROW_WITH_LZ4=off
-DARROW_WITH_ZLIB=off
-DARROW_WITH_ZSTD=off
-DFLATBUFFERS_HOME=${FLATBUFFERS_HOME}
-DBOOST_ROOT=${BOOST_ROOT})

if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
# PyArrow needs following settings.
set(ARROW_CMAKE_ARGS ${ARROW_CMAKE_ARGS}
-DARROW_WITH_THRIFT=ON
-DARROW_PARQUET=ON
-DARROW_WITH_ZLIB=ON)
else()
set(ARROW_CMAKE_ARGS ${ARROW_CMAKE_ARGS}
-DARROW_WITH_THRIFT=OFF
-DARROW_PARQUET=OFF
-DARROW_WITH_ZLIB=OFF)
endif ()
if (APPLE)
set(ARROW_CMAKE_ARGS ${ARROW_CMAKE_ARGS}
-DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison)
endif()

if ("${CMAKE_RAY_LANG_JAVA}" STREQUAL "YES")
set(ARROW_CMAKE_ARGS ${ARROW_CMAKE_ARGS} -DARROW_PLASMA_JAVA_CLIENT=ON)
endif ()
Expand Down
45 changes: 0 additions & 45 deletions cmake/Modules/ParquetExternalProject.cmake

This file was deleted.

15 changes: 1 addition & 14 deletions cmake/Modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,6 @@ ADD_THIRDPARTY_LIB(plasma STATIC_LIB ${PLASMA_STATIC_LIB})
add_dependencies(plasma plasma_ep)

if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
# Apache parquet cpp
include(ParquetExternalProject)

message(STATUS "Parquet home: ${PARQUET_HOME}")
message(STATUS "Parquet include dir: ${PARQUET_INCLUDE_DIR}")
message(STATUS "Parquet static library: ${PARQUET_STATIC_LIB}")
message(STATUS "Parquet shared library: ${PARQUET_SHARED_LIB}")
include_directories(SYSTEM ${PARQUET_INCLUDE_DIR})

ADD_THIRDPARTY_LIB(parquet STATIC_LIB ${PARQUET_STATIC_LIB})

add_dependencies(parquet parquet_ep)

# pyarrow
find_package(PythonInterp REQUIRED)
message(STATUS "PYTHON_EXECUTABLE for pyarrow: ${PYTHON_EXECUTABLE}")
Expand All @@ -185,7 +172,7 @@ if ("${CMAKE_RAY_LANG_PYTHON}" STREQUAL "YES")
# add_custom_command would have problem with setup.py
ExternalProject_Add(pyarrow_ext
PREFIX external/pyarrow
DEPENDS parquet_ep
DEPENDS arrow_ep
DOWNLOAD_COMMAND ""
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cd ${ARROW_SOURCE_DIR}/python && ${CMAKE_COMMAND} -E env ${pyarrow_ENV} ${PYTHON_EXECUTABLE} setup.py build
Expand Down
75 changes: 0 additions & 75 deletions thirdparty/scripts/build_parquet.sh

This file was deleted.

5 changes: 0 additions & 5 deletions thirdparty/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
##############################################
Expand Down

0 comments on commit 93ded5a

Please sign in to comment.