This is an automated email from the ASF dual-hosted git repository.
philo 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 9ea161849 [VL] Daily Update Velox Version (2024_06_04) (#5968)
9ea161849 is described below
commit 9ea1618498372a1e7a78b920451453165b427b1a
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Wed Jun 5 18:08:34 2024 +0800
[VL] Daily Update Velox Version (2024_06_04) (#5968)
Co-authored-by: PHILO-HE <[email protected]>
---
cpp/velox/compute/VeloxBackend.cc | 4 ++--
dev/ci-velox-buildstatic.sh | 2 +-
ep/build-velox/src/get_velox.sh | 2 +-
ep/build-velox/src/modify_velox.patch | 26 ++++++++++++--------------
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/cpp/velox/compute/VeloxBackend.cc
b/cpp/velox/compute/VeloxBackend.cc
index 187c36e1e..10d1c7529 100644
--- a/cpp/velox/compute/VeloxBackend.cc
+++ b/cpp/velox/compute/VeloxBackend.cc
@@ -156,8 +156,8 @@ void VeloxBackend::initCache() {
cacheFilePrefix_ = getCacheFilePrefix();
std::string ssdCachePath = ssdCachePathPrefix + "/" + cacheFilePrefix_;
ssdCacheExecutor_ =
std::make_unique<folly::IOThreadPoolExecutor>(ssdCacheIOThreads);
- auto ssd =
- std::make_unique<velox::cache::SsdCache>(ssdCachePath, ssdCacheSize,
ssdCacheShards, ssdCacheExecutor_.get());
+ const cache::SsdCache::Config config(ssdCachePath, ssdCacheSize,
ssdCacheShards, ssdCacheExecutor_.get());
+ auto ssd = std::make_unique<velox::cache::SsdCache>(config);
std::error_code ec;
const std::filesystem::space_info si =
std::filesystem::space(ssdCachePathPrefix, ec);
diff --git a/dev/ci-velox-buildstatic.sh b/dev/ci-velox-buildstatic.sh
index 227bad360..74688ff30 100755
--- a/dev/ci-velox-buildstatic.sh
+++ b/dev/ci-velox-buildstatic.sh
@@ -6,4 +6,4 @@ cd $GITHUB_WORKSPACE/
source ./dev/vcpkg/env.sh
sed -i '/^headers/d' ep/build-velox/build/velox_ep/CMakeLists.txt
export NUM_THREADS=4
-./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF
--enable_s3=ON --enable_gcs=ON --enable_hdfs=ON --enable_abfs=ON
+./dev/builddeps-veloxbe.sh --build_tests=OFF --build_benchmarks=OFF
--enable_s3=ON --enable_gcs=OFF --enable_hdfs=ON --enable_abfs=ON
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index e1133e88c..5aa3f2b37 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_06_03
+VELOX_BRANCH=2024_06_04
VELOX_HOME=""
#Set on run gluten on HDFS
diff --git a/ep/build-velox/src/modify_velox.patch
b/ep/build-velox/src/modify_velox.patch
index 09af35020..81560917d 100644
--- a/ep/build-velox/src/modify_velox.patch
+++ b/ep/build-velox/src/modify_velox.patch
@@ -36,10 +36,10 @@ index d49115f12..1aaa8e532 100644
+ endif()
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 53aaf4391..90aba6916 100644
+index 5c7bf770a..9f897f577 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -243,10 +243,15 @@ if(VELOX_ENABLE_ABFS)
+@@ -234,10 +234,15 @@ if(VELOX_ENABLE_ABFS)
endif()
if(VELOX_ENABLE_HDFS)
@@ -59,7 +59,7 @@ index 53aaf4391..90aba6916 100644
add_definitions(-DVELOX_ENABLE_HDFS3)
endif()
-@@ -386,7 +391,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS
${BOOST_INCLUDE_LIBRARIES})
+@@ -377,7 +382,7 @@ resolve_dependency(Boost 1.77.0 COMPONENTS
${BOOST_INCLUDE_LIBRARIES})
# for reference. find_package(range-v3)
set_source(gflags)
@@ -68,6 +68,15 @@ index 53aaf4391..90aba6916 100644
if(NOT TARGET gflags::gflags)
# This is a bit convoluted, but we want to be able to use gflags::gflags as
a
# target even when velox is built as a subproject which uses
+@@ -441,7 +446,7 @@ if(${VELOX_BUILD_MINIMAL_WITH_DWIO}
+
+ # Locate or build protobuf.
+ set_source(Protobuf)
+- resolve_dependency(Protobuf 3.21.4 EXACT)
++ resolve_dependency(Protobuf 3.21 EXACT)
+ include_directories(${Protobuf_INCLUDE_DIRS})
+ endif()
+
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ce4c24dbe..785a2acc6 100644
--- a/third_party/CMakeLists.txt
@@ -127,17 +136,6 @@ index 10ee508ba..027a58ecc 100644
setupEnvironment(hadoopHomeDirectory.string());
}
-diff --git a/velox/dwio/common/CMakeLists.txt
b/velox/dwio/common/CMakeLists.txt
-index 9b6574d6e..61abddb59 100644
---- a/velox/dwio/common/CMakeLists.txt
-+++ b/velox/dwio/common/CMakeLists.txt
-@@ -77,4 +77,5 @@ target_link_libraries(
- velox_memory
- Boost::regex
- Folly::folly
-- glog::glog)
-+ glog::glog
-+ protobuf::libprotobuf)
diff --git a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
index 2cabfc29a..54329ce23 100644
--- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
