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

[VL] Daily Update Velox Version (2024_06_21) #6173

Merged
merged 2 commits into from
Jun 21, 2024
Merged

[VL] Daily Update Velox Version (2024_06_21) #6173

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
d05e3f8
[VL] Daily Update Velox Version (2024_06_21)
Jun 21, 2024
4df537f
Remove the pb changes
JkSelf Jun 21, 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
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_06_20
VELOX_BRANCH=2024_06_21
VELOX_HOME=""

#Set on run gluten on HDFS
Expand Down
8 changes: 0 additions & 8 deletions ep/build-velox/src/modify_velox.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ index 5c7bf770a..9f897f577 100644
if(NOT TARGET gflags::gflags)
# This is a bit convoluted, but we want to be able to use gflags::gflags as a
# target even when velox is built as a subproject which uses
@@ -441,7 +446,7 @@ if(${VELOX_BUILD_MINIMAL_WITH_DWIO}

# Locate or build protobuf.
set_source(Protobuf)
- resolve_dependency(Protobuf 3.21.4 EXACT)
+ resolve_dependency(Protobuf 3.21 EXACT)
include_directories(${Protobuf_INCLUDE_DIRS})
endif()

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ce4c24dbe..785a2acc6 100644
Expand Down
Loading