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 fcf9c5d88 [VL] Make sure the same thrift lib bundled in arrow build is
used for building Velox (#6431)
fcf9c5d88 is described below
commit fcf9c5d88796e3150472cc190b1fe604f0ac071f
Author: Hongze Zhang <[email protected]>
AuthorDate: Mon Jul 15 12:18:36 2024 +0900
[VL] Make sure the same thrift lib bundled in arrow build is used for
building Velox (#6431)
---
cpp/velox/CMakeLists.txt | 15 -----------
ep/build-velox/src/modify_velox.patch | 50 ++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt
index b734669b8..a121b003d 100644
--- a/cpp/velox/CMakeLists.txt
+++ b/cpp/velox/CMakeLists.txt
@@ -614,21 +614,6 @@ else()
endif()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
-if(ENABLE_GLUTEN_VCPKG)
- find_package(Thrift CONFIG)
-else()
- # Prefer the shared library on system.
- set(ARROW_THRIFT_USE_SHARED ON)
- find_package(Thrift)
-endif()
-
-if(Thrift_FOUND)
- target_link_libraries(velox PUBLIC thrift::thrift)
-else()
- add_velox_dependency(
- thrift
"${ARROW_HOME}/src/arrow_ep-build/thrift_ep-install/lib/libthrift.a")
-endif()
-
if(BUILD_TESTS)
add_subdirectory(tests)
endif()
diff --git a/ep/build-velox/src/modify_velox.patch
b/ep/build-velox/src/modify_velox.patch
index 5b549f0b1..5fd8b8b1e 100644
--- a/ep/build-velox/src/modify_velox.patch
+++ b/ep/build-velox/src/modify_velox.patch
@@ -1,18 +1,3 @@
-From 6c75bed5ee98d25a9ebdacf0ea3cdd97f961e3f8 Mon Sep 17 00:00:00 2001
-From: yan ma <[email protected]>
-Date: Thu, 11 Jul 2024 16:55:16 +0800
-Subject: [PATCH] modify velox
-
----
- CMake/Findlz4.cmake | 27 ++++++++++---------
- .../arrow/CMakeLists.txt | 11 ++++++--
- CMakeLists.txt | 15 +++++++----
- velox/common/process/tests/CMakeLists.txt | 2 +-
- .../abfs/RegisterAbfsFileSystem.cpp | 1 -
- .../hdfs/tests/HdfsMiniCluster.cpp | 2 +-
- .../parquet/writer/arrow/tests/CMakeLists.txt | 4 ++-
- 7 files changed, 38 insertions(+), 24 deletions(-)
-
diff --git a/CMake/Findlz4.cmake b/CMake/Findlz4.cmake
index d49115f12..1aaa8e532 100644
--- a/CMake/Findlz4.cmake
@@ -51,11 +36,20 @@ index d49115f12..1aaa8e532 100644
+ endif()
endif()
diff --git a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
-index 56b673e87..aedd460ae 100644
+index 56b673e87..ef48ae9d9 100644
--- a/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
+++ b/CMake/resolve_dependency_modules/arrow/CMakeLists.txt
-@@ -23,7 +23,11 @@ if(VELOX_ENABLE_ARROW)
+@@ -14,16 +14,13 @@
+ project(Arrow)
+ if(VELOX_ENABLE_ARROW)
+- find_package(Thrift)
+- if(Thrift_FOUND)
+- set(THRIFT_SOURCE "SYSTEM")
+- else()
+- set(THRIFT_SOURCE "BUNDLED")
+- endif()
+-
set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep")
set(ARROW_CMAKE_ARGS
- -DARROW_PARQUET=OFF
@@ -67,7 +61,7 @@ index 56b673e87..aedd460ae 100644
-DARROW_WITH_THRIFT=ON
-DARROW_WITH_LZ4=ON
-DARROW_WITH_SNAPPY=ON
-@@ -37,7 +41,7 @@ if(VELOX_ENABLE_ARROW)
+@@ -37,18 +34,16 @@ if(VELOX_ENABLE_ARROW)
-DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}/install
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DARROW_BUILD_STATIC=ON
@@ -76,7 +70,22 @@ index 56b673e87..aedd460ae 100644
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH})
set(ARROW_LIBDIR ${ARROW_PREFIX}/install/${CMAKE_INSTALL_LIBDIR})
-@@ -67,6 +71,9 @@ if(VELOX_ENABLE_ARROW)
+ add_library(thrift STATIC IMPORTED GLOBAL)
+- if(NOT Thrift_FOUND)
+- set(THRIFT_ROOT ${ARROW_PREFIX}/src/arrow_ep-build/thrift_ep-install)
+- set(THRIFT_LIB ${THRIFT_ROOT}/lib/libthrift.a)
++ set(THRIFT_ROOT ${ARROW_PREFIX}/src/arrow_ep-build/thrift_ep-install)
++ set(THRIFT_LIB ${THRIFT_ROOT}/lib/libthrift.a)
+
+- file(MAKE_DIRECTORY ${THRIFT_ROOT}/include)
+- set(THRIFT_INCLUDE_DIR ${THRIFT_ROOT}/include)
+- endif()
++ file(MAKE_DIRECTORY ${THRIFT_ROOT}/include)
++ set(THRIFT_INCLUDE_DIR ${THRIFT_ROOT}/include)
+
+ set_property(TARGET thrift PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+ ${THRIFT_INCLUDE_DIR})
+@@ -67,6 +62,9 @@ if(VELOX_ENABLE_ARROW)
arrow_ep
PREFIX ${ARROW_PREFIX}
URL ${VELOX_ARROW_SOURCE_URL}
@@ -169,6 +178,3 @@ index 2cabfc29a..54329ce23 100644
add_library(
velox_dwio_arrow_parquet_writer_test_lib
---
-2.25.1
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
