Skip to content

[GLUTEN-6887][VL] Daily Update Velox Version (2025_09_06) #10643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhouyuan merged 2 commits into from
Sep 6, 2025
Merged

[GLUTEN-6887][VL] Daily Update Velox Version (2025_09_06) #10643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98cc3ff
[GLUTEN-6887][VL] Daily Update Velox Version (2025_09_06)
Sep 6, 2025
8706d05
fix memory manager api
zhouyuan Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cpp/velox/compute/VeloxBackend.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ void VeloxBackend::init(
memoryManagerCapacity = facebook::velox::memory::kMaxMemory;
}
LOG(INFO) << "Setting global Velox memory manager with capacity: " << memoryManagerCapacity;
facebook::velox::memory::initializeMemoryManager({.allocatorCapacity = memoryManagerCapacity});
facebook::velox::memory::MemoryManager::Options options;
options.allocatorCapacity = memoryManagerCapacity;
facebook::velox::memory::initializeMemoryManager(options);

// local cache persistent relies on the cache pool from root memory pool so we need to init this
// after the memory manager instanced
Expand Down
16 changes: 8 additions & 8 deletions cpp/velox/memory/VeloxMemoryManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,14 @@ VeloxMemoryManager::VeloxMemoryManager(
auto checkUsageLeak = backendConf.get<bool>(kCheckUsageLeak, kCheckUsageLeakDefault);

ArbitratorFactoryRegister afr(listener_.get());
velox::memory::MemoryManagerOptions mmOptions{
.alignment = velox::memory::MemoryAllocator::kMaxAlignment,
.trackDefaultUsage = true, // memory usage tracking
.checkUsageLeak = checkUsageLeak, // leak check
.coreOnAllocationFailureEnabled = false,
.allocatorCapacity = velox::memory::kMaxMemory,
.arbitratorKind = afr.getKind(),
.extraArbitratorConfigs = getExtraArbitratorConfigs(backendConf)};
velox::memory::MemoryManager::Options mmOptions;
mmOptions.alignment = velox::memory::MemoryAllocator::kMaxAlignment;
mmOptions.trackDefaultUsage = true; // memory usage tracking
mmOptions.checkUsageLeak = checkUsageLeak; // leak check
mmOptions.coreOnAllocationFailureEnabled = false;
mmOptions.allocatorCapacity = velox::memory::kMaxMemory;
mmOptions.arbitratorKind = afr.getKind();
mmOptions.extraArbitratorConfigs = getExtraArbitratorConfigs(backendConf);
veloxMemoryManager_ = std::make_unique<velox::memory::MemoryManager>(mmOptions);

veloxAggregatePool_ = veloxMemoryManager_->addRootPool(
Expand Down
4 changes: 2 additions & 2 deletions ep/build-velox/src/get_velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
set -exu

VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=2025_09_04
VELOX_BRANCH=2025_09_06
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
VELOX_ENHANCED_REPO=https://github.com/IBM/velox.git
VELOX_ENHANCED_BRANCH=ibm-2025_09_04
VELOX_ENHANCED_BRANCH=ibm-2025_09_06
ENABLE_ENHANCED_FEATURES=OFF

# Developer use only for testing Velox PR.
Expand Down