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

Support building Java and Python version at the same time. (#2640)

Browse Source 
* Support building Java and Python version at the same time.

* Remove duplicated definition.

* Refine the building process of local_scheduler

* Refine

* Add comment for languages

* Modify instruction and add python,jave building to CI.

* change according to comment
This commit is contained in:
Yuhong Guo
2018-08-14 11:33:51 -07:00
committed by Philipp Moritz
parent 493585574a
commit 4bd98eed45
7 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thirdparty/scripts/build_arrow.sh
Vendored
+4 -11
View File
@@ -15,12 +15,6 @@ else
fi
echo "Using Python executable $PYTHON_EXECUTABLE."
LANGUAGE="python"
if [[ -n "$2" ]]; then
LANGUAGE=$2
fi
echo "Build language is $LANGUAGE."
unamestr="$(uname)"
if [[ "$unamestr" == "Linux" ]]; then
@@ -46,9 +40,8 @@ fi
TARGET_COMMIT_ID=d48dce2cfebdbd044a8260d0a77f5fe3d89a4a2d
build_arrow() {
echo "building arrow"
# Make sure arrow will be built again when building ray for java later than python
if [[ "$LANGUAGE" == "java" ]]; then
if [[ "$RAY_BUILD_JAVA" == "YES" ]]; then
rm -rf $TP_DIR/build/arrow/cpp/build/CMakeCache.txt
fi
@@ -78,7 +71,7 @@ build_arrow() {
cd build
BUILD_ARROW_PLASMA_JAVA_CLIENT=off
if [[ "$LANGUAGE" == "java" ]]; then
if [[ "$RAY_BUILD_JAVA" == "YES" ]]; then
BUILD_ARROW_PLASMA_JAVA_CLIENT=on
fi
@@ -147,8 +140,8 @@ build_arrow() {
popd
}
# Download and compile arrow if it isn't already present or the commit-id mismatches.
if [[ ! -d $TP_DIR/../python/ray/pyarrow_files/pyarrow ]] || \
[[ "$LANGUAGE" == "java" && ! -f $TP_DIR/build/arrow/cpp/build/release/libplasma_java.dylib ]]; then
if [[ "$RAY_BUILD_PYTHON" == "YES" && ! -d $TP_DIR/../python/ray/pyarrow_files/pyarrow ]] || \
[[ "$RAY_BUILD_JAVA" == "YES" && ! -f $TP_DIR/build/arrow/cpp/build/release/libplasma_java.dylib ]]; then
build_arrow
else
REBUILD=off
thirdparty/scripts/setup.sh
Vendored
+8 -5
View File
@@ -18,11 +18,12 @@ else
fi
echo "Using Python executable $PYTHON_EXECUTABLE."
LANGUAGE="python"
if [[ -n "$2" ]]; then
LANGUAGE=$2
if [[ "$RAY_BUILD_JAVA" == "YES" ]]; then
echo "Java library will be built."
fi
if [[ "$RAY_BUILD_PYTHON" == "YES" ]]; then
echo "Python library will be built."
fi
echo "Build language is $LANGUAGE."
unamestr="$(uname)"
@@ -52,7 +53,9 @@ fi
##############################################
# arrow
##############################################
bash "$TP_SCRIPT_DIR/build_arrow.sh" $PYTHON_EXECUTABLE $LANGUAGE
RAY_BUILD_PYTHON=$RAY_BUILD_PYTHON \
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)