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 d06bddf322 [VL] Fix dependencies setup (#7443)
d06bddf322 is described below
commit d06bddf32278cdec24e40388d8e10d8440bec105
Author: PHILO-HE <[email protected]>
AuthorDate: Wed Oct 9 21:46:23 2024 +0800
[VL] Fix dependencies setup (#7443)
---
cpp/velox/memory/VeloxMemoryManager.cc | 2 +-
ep/build-velox/src/get_velox.sh | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc
b/cpp/velox/memory/VeloxMemoryManager.cc
index cf71add220..6009441f48 100644
--- a/cpp/velox/memory/VeloxMemoryManager.cc
+++ b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -111,7 +111,7 @@ class ListenableArbitrator : public
velox::memory::MemoryArbitrator {
}
uint64_t shrinkCapacity(uint64_t targetBytes, bool allowSpill, bool
allowAbort) override {
- velox::memory::ScopedMemoryArbitrationContext ctx();
+ velox::memory::ScopedMemoryArbitrationContext ctx{};
facebook::velox::exec::MemoryReclaimer::Stats status;
velox::memory::MemoryPool* pool;
{
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 28b8678685..4f690b091c 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -80,7 +80,10 @@ function process_setup_ubuntu {
ensure_pattern_matched 'libgmock-dev' scripts/setup-ubuntu.sh
sed -i '/libgmock-dev/d' scripts/setup-ubuntu.sh # resolved by
ep/build-velox/build/velox_ep/CMake/resolve_dependency_modules/gtest.cmake
ensure_pattern_matched 'function install_folly' scripts/setup-ubuntu.sh
- sed -i '/^function install_folly.*/i function install_protobuf {\n
wget_and_untar
https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protobuf-all-21.4.tar.gz
protobuf\n (\n cd protobuf\n ./configure CXXFLAGS="-fPIC"
--prefix=/usr/local\n make "-j$(nproc)"\n sudo make install\n sudo
ldconfig\n )\n}\n' scripts/setup-ubuntu.sh
+ sed -i '/^function install_folly.*/i function install_protobuf {\
+ wget_and_untar
https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protobuf-all-21.4.tar.gz
protobuf\
+ (\n cd ${DEPENDENCY_DIR}/protobuf\n ./configure CXXFLAGS="-fPIC"
--prefix=${INSTALL_PREFIX}\n make "-j$(nproc)"\
+ sudo make install\n sudo ldconfig\n )\n}\n' scripts/setup-ubuntu.sh
ensure_pattern_matched ' run_and_time install_folly' scripts/setup-ubuntu.sh
sed -i '/^ run_and_time install_folly/a \ \ run_and_time install_protobuf'
scripts/setup-ubuntu.sh
# Required by lib hdfs.
@@ -111,7 +114,7 @@ function process_setup_centos9 {
ensure_pattern_matched 'install_fbthrift' scripts/setup-centos9.sh
sed -i '/^ run_and_time install_fbthrift/a \ run_and_time install_openssl'
scripts/setup-centos9.sh
- sed -i '/cd protobuf/{n;s/\.\/configure --prefix=\/usr/\.\/configure
CXXFLAGS="-fPIC" --prefix=\/usr\/local/;}' scripts/setup-centos9.sh
+ sed -i '/cd ${DEPENDENCY_DIR}\/protobuf/{n;s/\.\/configure
--prefix=${INSTALL_PREFIX}/\.\/configure CXXFLAGS="-fPIC"
--prefix=${INSTALL_PREFIX}/;}' scripts/setup-centos9.sh
# Required by lib hdfs.
ensure_pattern_matched 'dnf_install ninja-build' scripts/setup-centos9.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
