wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-12 05:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove boost dependencies from Ray (#518)

Browse Source 
* remove boost regex

* workaround for boost

* fix

* do not link against boost any more

* rebased on arrow change
This commit is contained in:
Philipp Moritz
2017-05-09 16:17:20 -07:00
committed by Stephanie Wang
parent e5e2aab5e4
commit 118fac5619
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numbuf/CMakeLists.txt
+4 -4
View File
@@ -65,15 +65,15 @@ if(APPLE)
endif(APPLE)
if(APPLE)
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem)
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread)
else()
target_link_libraries(numbuf -Wl,--whole-archive ${ARROW_LIB} -Wl,--no-whole-archive ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem)
target_link_libraries(numbuf -Wl,--whole-archive ${ARROW_LIB} -Wl,--no-whole-archive ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread)
endif()
if(HAS_PLASMA)
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} plasma_lib common ${FLATBUFFERS_STATIC_LIB} -lpthread -lboost_regex -lboost_system -lboost_filesystem)
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} plasma_lib common ${FLATBUFFERS_STATIC_LIB} -lpthread)
else()
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem)
target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread)
endif()
install(TARGETS numbuf DESTINATION ${CMAKE_SOURCE_DIR}/numbuf/)
src/numbuf/thirdparty/build_thirdparty.sh
Vendored
+1 -1
View File
@@ -24,5 +24,5 @@ echo "building arrow"
cd $TP_DIR/arrow/cpp
mkdir -p $TP_DIR/arrow/cpp/build
cd $TP_DIR/arrow/cpp/build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-g -O3 -march=native -mtune=native" -DCMAKE_CXX_FLAGS="-g -O3 -march=native -mtune=native" -DARROW_BUILD_TESTS=OFF -DARROW_PYTHON=on ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-g -O3 -march=native -mtune=native" -DCMAKE_CXX_FLAGS="-g -O3 -march=native -mtune=native" -DARROW_BUILD_TESTS=OFF -DARROW_HDFS=OFF -DARROW_PYTHON=on ..
make VERBOSE=1 -j$PARALLEL
src/numbuf/thirdparty/download_thirdparty.sh
Vendored
+2
View File
@@ -11,4 +11,6 @@ if [ ! -d $TP_DIR/arrow ]; then
git clone https://github.com/apache/arrow/ "$TP_DIR/arrow"
fi
cd $TP_DIR/arrow
git checkout 670612e6fdf699486641ed0d39d22257eb8acdb2