This is an automated email from the ASF dual-hosted git repository.
yuanzhou 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 9a974bfb84 [GLUTEN-7903][VL] move local velox patch to oap/velox
(#8265)
9a974bfb84 is described below
commit 9a974bfb84a77e07a27b21bec46caa47755c57b9
Author: Yuan <[email protected]>
AuthorDate: Wed Dec 18 21:27:50 2024 +0800
[GLUTEN-7903][VL] move local velox patch to oap/velox (#8265)
move local velox changes to oap/velox
(Fixes: #7903)
Signed-off-by: Yuan Zhou <[email protected]>
---
ep/build-velox/src/get_velox.sh | 17 +++++------------
ep/build-velox/src/modify_velox.patch | 24 ------------------------
2 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 67f2a9f842..639ac34055 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -17,7 +17,7 @@
set -exu
VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2024_12_18
+VELOX_BRANCH=2024_12_18_2
VELOX_HOME=""
OS=`uname -s`
@@ -169,27 +169,20 @@ git submodule update --init --recursive
function apply_compilation_fixes {
current_dir=$1
velox_home=$2
- sudo cp ${current_dir}/modify_velox.patch ${velox_home}/
+
sudo cp ${current_dir}/modify_arrow.patch
${velox_home}/CMake/resolve_dependency_modules/arrow/
sudo cp ${current_dir}/modify_arrow_dataset_scan_option.patch
${velox_home}/CMake/resolve_dependency_modules/arrow/
- git add ${velox_home}/modify_velox.patch # to avoid the file from being
deleted by git clean -dffx :/
+
git add
${velox_home}/CMake/resolve_dependency_modules/arrow/modify_arrow.patch # to
avoid the file from being deleted by git clean -dffx :/
git add
${velox_home}/CMake/resolve_dependency_modules/arrow/modify_arrow_dataset_scan_option.patch
# to avoid the file from being deleted by git clean -dffx :/
- cd ${velox_home}
- echo "Applying patch to Velox source code..."
- git apply modify_velox.patch
- if [ $? -ne 0 ]; then
- echo "Failed to apply compilation fixes to Velox: $?."
- exit 1
- fi
+
}
function setup_linux {
local LINUX_DISTRIBUTION=$(. /etc/os-release && echo ${ID})
local LINUX_VERSION_ID=$(. /etc/os-release && echo ${VERSION_ID})
- # apply patches
- sed -i 's/SUDO="${SUDO:-""}"/SUDO="${SUDO:-"sudo --preserve-env"}"/g'
scripts/setup-helper-functions.sh
+ export SUDO="sudo --preserve-env"
if [[ "$LINUX_DISTRIBUTION" == "ubuntu" || "$LINUX_DISTRIBUTION" == "debian"
|| "$LINUX_DISTRIBUTION" == "pop" ]]; then
process_setup_ubuntu
elif [[ "$LINUX_DISTRIBUTION" == "centos" ]]; then
diff --git a/ep/build-velox/src/modify_velox.patch
b/ep/build-velox/src/modify_velox.patch
deleted file mode 100644
index 6938deddef..0000000000
--- a/ep/build-velox/src/modify_velox.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMake/resolve_dependency_modules/simdjson.cmake
b/CMake/resolve_dependency_modules/simdjson.cmake
-index ddd232050..b6ed2432b 100644
---- a/CMake/resolve_dependency_modules/simdjson.cmake
-+++ b/CMake/resolve_dependency_modules/simdjson.cmake
-@@ -29,4 +29,6 @@ FetchContent_Declare(
- URL ${VELOX_SIMDJSON_SOURCE_URL}
- URL_HASH ${VELOX_SIMDJSON_BUILD_SHA256_CHECKSUM})
-
-+set(SIMDJSON_SKIPUTF8VALIDATION ON)
-+
- FetchContent_MakeAvailable(simdjson)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5929473ae..e4e28c4f1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -422,7 +422,7 @@ velox_resolve_dependency(Boost 1.77.0 COMPONENTS
${BOOST_INCLUDE_LIBRARIES})
-
- velox_set_source(gflags)
-
--velox_resolve_dependency(gflags COMPONENTS ${VELOX_GFLAGS_TYPE})
-+velox_resolve_dependency(gflags)
-
- if(NOT TARGET gflags::gflags)
- # This is a bit convoluted, but we want to be able to use gflags::gflags as
a
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
