Skip to content

Commit

Permalink
[VL] Fix dependencies setup (#7443)
Browse files Browse the repository at this point in the history
  • Loading branch information
PHILO-HE authored Oct 9, 2024
1 parent 1f03a61 commit d06bddf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cpp/velox/memory/VeloxMemoryManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
{
Expand Down
7 changes: 5 additions & 2 deletions ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d06bddf

Please sign in to comment.