Skip to content
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

Jump to bottom

[VL]Daily Update Velox Version (20231203) #3913

Merged
merged 1 commit into from
Dec 4, 2023
Merged

[VL]Daily Update Velox Version (20231203) #3913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ add_compile_options(-Werror)
add_compile_options(-Wno-error=parentheses)
add_compile_options(-Wno-error=unused-function)
add_compile_options(-Wno-error=unused-variable)
add_compile_options(-Wno-strict-aliasing)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options(-Wno-error=unused-but-set-variable)
Expand Down
6 changes: 4 additions & 2 deletions cpp/velox/memory/VeloxMemoryManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator {
std::lock_guard<std::recursive_mutex> l(mutex_); // FIXME: Do we have recursive locking for this mutex?
auto pool = pools.at(0);
const uint64_t oldCapacity = pool->capacity();
uint64_t spilledOut = pool->reclaim(targetBytes, status); // ignore the output
uint64_t spilledOut = pool->reclaim(targetBytes, 0, status); // ignore the output
uint64_t shrunken = pool->shrink(0);
const uint64_t newCapacity = pool->capacity();
uint64_t total = oldCapacity - newCapacity;
Expand Down Expand Up @@ -175,14 +175,16 @@ VeloxMemoryManager::VeloxMemoryManager(
true, // memory usage tracking
true, // leak check
false, // debug
false, // coreOnAllocationFailureEnabled
#ifdef GLUTEN_ENABLE_HBM
wrappedAlloc.get(),
#else
veloxAlloc,
#endif
afr.getKind(),
0,
32 << 20};
32 << 20,
0};
veloxMemoryManager_ = std::make_unique<velox::memory::MemoryManager>(mmOptions);

veloxAggregatePool_ = veloxMemoryManager_->addRootPool(
Expand Down
Loading