This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 43a3a3a66 [GLUTEN-6495][VL] Fix build issue: --build_arrow=ON wipes
--build_type=<TYPE> setting silently (#6498)
43a3a3a66 is described below
commit 43a3a3a66d5bc220af15ea95c511d2d0ed36870f
Author: PHILO-HE <[email protected]>
AuthorDate: Fri Jul 19 09:14:02 2024 +0800
[GLUTEN-6495][VL] Fix build issue: --build_arrow=ON wipes
--build_type=<TYPE> setting silently (#6498)
---
.github/workflows/velox_docker.yml | 2 --
dev/build_arrow.sh | 11 ++++++++++-
dev/builddeps-veloxbe.sh | 9 +--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/velox_docker.yml
b/.github/workflows/velox_docker.yml
index ebdc9578d..592552a19 100644
--- a/.github/workflows/velox_docker.yml
+++ b/.github/workflows/velox_docker.yml
@@ -615,8 +615,6 @@ jobs:
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: |
source /opt/rh/gcc-toolset-9/enable
- source ./dev/build_arrow.sh
- install_arrow_deps
./dev/builddeps-veloxbe.sh --run_setup_script=OFF
--enable_ep_cache=OFF --build_tests=ON \
--build_examples=ON --build_benchmarks=ON --build_protobuf=ON
- name: Gluten CPP Test
diff --git a/dev/build_arrow.sh b/dev/build_arrow.sh
index 19d562714..b914a9fce 100755
--- a/dev/build_arrow.sh
+++ b/dev/build_arrow.sh
@@ -15,17 +15,19 @@
# limitations under the License.
CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
+export SUDO=sudo
source ${CURRENT_DIR}/build_helper_functions.sh
VELOX_ARROW_BUILD_VERSION=15.0.0
ARROW_PREFIX=$CURRENT_DIR/../ep/_ep/arrow_ep
BUILD_TYPE=Release
function prepare_arrow_build() {
- mkdir -p ${ARROW_PREFIX}/../ && cd ${ARROW_PREFIX}/../ && sudo rm -rf
arrow_ep/
+ mkdir -p ${ARROW_PREFIX}/../ && pushd ${ARROW_PREFIX}/../ && sudo rm -rf
arrow_ep/
wget_and_untar
https://archive.apache.org/dist/arrow/arrow-${VELOX_ARROW_BUILD_VERSION}/apache-arrow-${VELOX_ARROW_BUILD_VERSION}.tar.gz
arrow_ep
cd arrow_ep
patch -p1 < $CURRENT_DIR/../ep/build-velox/src/modify_arrow.patch
patch -p1 <
$CURRENT_DIR/../ep/build-velox/src/modify_arrow_dataset_scan_option.patch
+ popd
}
function install_arrow_deps {
@@ -106,3 +108,10 @@ function build_arrow_java() {
-Dmaven.test.skip -Drat.skip -Dmaven.gitcommitid.skip -Dcheckstyle.skip
-Dassembly.skipAssembly
popd
}
+
+echo "Start to build Arrow"
+prepare_arrow_build
+build_arrow_cpp
+echo "Finished building arrow CPP"
+build_arrow_java
+echo "Finished building arrow Java"
diff --git a/dev/builddeps-veloxbe.sh b/dev/builddeps-veloxbe.sh
index 1676577ae..38f3978ef 100755
--- a/dev/builddeps-veloxbe.sh
+++ b/dev/builddeps-veloxbe.sh
@@ -187,15 +187,8 @@ fi
concat_velox_param
function build_arrow {
- echo "Start to build Arrow"
- export SUDO=sudo
cd $GLUTEN_DIR/dev
- source build_arrow.sh
- prepare_arrow_build
- build_arrow_cpp
- echo "Finished building arrow CPP"
- build_arrow_java
- echo "Finished building arrow Java"
+ ./build_arrow.sh
}
function build_velox {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
