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

[GLUTEN-6887][VL] Daily Update Velox Version (2024_09_26) #7355

Merged
merged 3 commits into from
Sep 26, 2024
Merged

[GLUTEN-6887][VL] Daily Update Velox Version (2024_09_26) #7355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc50b5
[GLUTEN-6887][VL] Daily Update Velox Version (2024_09_26)
JkSelf Sep 26, 2024
7078ad6
Enable failed unit tests
JkSelf Sep 26, 2024
e466ef3
Fix the compile issue
JkSelf Sep 26, 2024
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
9 changes: 6 additions & 3 deletions cpp/velox/memory/VeloxMemoryManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ VeloxMemoryManager::VeloxMemoryManager(std::unique_ptr<AllocationListener> liste
listenableAlloc_ = std::make_unique<ListenableMemoryAllocator>(defaultMemoryAllocator().get(), blockListener_.get());
arrowPool_ = std::make_unique<ArrowMemoryPool>(listenableAlloc_.get());

std::unordered_map<std::string, std::string> extraArbitratorConfigs;
extraArbitratorConfigs["memory-pool-initial-capacity"] = folly::to<std::string>(memInitCapacity) + "B";
extraArbitratorConfigs["memory-pool-transfer-capacity"] = folly::to<std::string>(reservationBlockSize) + "B";
extraArbitratorConfigs["memory-reclaim-max-wait-time"] = folly::to<std::string>(0) + "ms";

ArbitratorFactoryRegister afr(listener_.get());
velox::memory::MemoryManagerOptions mmOptions{
.alignment = velox::memory::MemoryAllocator::kMaxAlignment,
Expand All @@ -219,9 +224,7 @@ VeloxMemoryManager::VeloxMemoryManager(std::unique_ptr<AllocationListener> liste
.coreOnAllocationFailureEnabled = false,
.allocatorCapacity = velox::memory::kMaxMemory,
.arbitratorKind = afr.getKind(),
.memoryPoolInitCapacity = memInitCapacity,
.memoryPoolTransferCapacity = reservationBlockSize,
.memoryReclaimWaitMs = 0};
.extraArbitratorConfigs = extraArbitratorConfigs};
veloxMemoryManager_ = std::make_unique<velox::memory::MemoryManager>(mmOptions);

veloxAggregatePool_ = veloxMemoryManager_->addRootPool(
Expand Down
2 changes: 1 addition & 1 deletion 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,7 +17,7 @@
set -exu

VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=2024_09_25
VELOX_BRANCH=2024_09_26
VELOX_HOME=""

OS=`uname -s`
Expand Down
1 change: 0 additions & 1 deletion gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenDecimalPrecisionSuite]
enableSuite[GlutenStringFunctionsSuite]
enableSuite[GlutenRegexpExpressionsSuite]
.excludeByPrefix("LIKE Pattern ESCAPE")
enableSuite[GlutenNullExpressionsSuite]
enableSuite[GlutenPredicateSuite]
enableSuite[GlutenMathExpressionsSuite]
Expand Down
1 change: 0 additions & 1 deletion gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("random")
.exclude("SPARK-9127 codegen with long seed")
enableSuite[GlutenRegexpExpressionsSuite]
.excludeByPrefix("LIKE Pattern ESCAPE")
enableSuite[GlutenSortShuffleSuite]
enableSuite[GlutenSortOrderExpressionsSuite]
enableSuite[GlutenStringExpressionsSuite]
Expand Down
1 change: 0 additions & 1 deletion gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("random")
.exclude("SPARK-9127 codegen with long seed")
enableSuite[GlutenRegexpExpressionsSuite]
.excludeByPrefix("LIKE Pattern ESCAPE")
enableSuite[GlutenSortShuffleSuite]
enableSuite[GlutenSortOrderExpressionsSuite]
enableSuite[GlutenStringExpressionsSuite]
Expand Down
6 changes: 0 additions & 6 deletions gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("random")
.exclude("SPARK-9127 codegen with long seed")
enableSuite[GlutenRegexpExpressionsSuite]
.excludeByPrefix("LIKE Pattern ESCAPE")
enableSuite[GlutenSortShuffleSuite]
enableSuite[GlutenSortOrderExpressionsSuite]
enableSuite[GlutenStringExpressionsSuite]
Expand Down Expand Up @@ -884,11 +883,6 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenInnerJoinSuiteForceShjOff]
enableSuite[GlutenOuterJoinSuiteForceShjOn]
enableSuite[GlutenOuterJoinSuiteForceShjOff]
// Caused by Velox SMJ result mismatches with Spark.
.exclude("basic right outer join using SortMergeJoin (whole-stage-codegen off)")
.exclude("basic right outer join using SortMergeJoin (whole-stage-codegen on)")
.exclude("right outer join with unique keys using SortMergeJoin (whole-stage-codegen off)")
.exclude("right outer join with unique keys using SortMergeJoin (whole-stage-codegen on)")
enableSuite[FallbackStrategiesSuite]
enableSuite[GlutenBroadcastExchangeSuite]
enableSuite[GlutenLocalBroadcastExchangeSuite]
Expand Down
Loading