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_03_22) #5077

Merged
merged 2 commits into from
Mar 22, 2024
Merged

[VL] Daily Update Velox Version (2024_03_22) #5077

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
cea55d1
[VL] Daily Update Velox Version (2024_03_22)
Mar 22, 2024
3b81d38
fix build issue
yma11 Mar 22, 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 cpp/velox/substrait/VariantToVectorConverter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ VectorPtr setVectorFromVariantsByKind<TypeKind::VARCHAR>(
if (values[i].isNull()) {
flatVector->setNull(i, true);
} else {
flatVector->set(i, StringView(values[i].value<Varchar>()));
flatVector->set(i, StringView(values[i].value<TypeKind::VARCHAR>()));
}
}
return flatVector;
Expand Down
8 changes: 7 additions & 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_03_21
VELOX_BRANCH=2024_03_22
VELOX_HOME=""

#Set on run gluten on HDFS
Expand Down Expand Up @@ -83,6 +83,8 @@ function process_setup_ubuntu {

# No need to re-install git.
sed -i '/git \\/d' scripts/setup-ubuntu.sh
# need set BUILD_SHARED_LIBS flag for thrift
sed -i "/facebook\/fbthrift/{n;s/cmake_install -DBUILD_TESTS=OFF/cmake_install -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-ubuntu.sh
# Do not install libunwind which can cause interruption when catching native exception.
sed -i 's/sudo --preserve-env apt install -y libunwind-dev && //' scripts/setup-ubuntu.sh
sed -i '/ccache/a\ *thrift* \\' scripts/setup-ubuntu.sh
Expand Down Expand Up @@ -128,6 +130,8 @@ function process_setup_centos8 {
fi
# make this function Reentrant
git checkout scripts/setup-centos8.sh
# need set BUILD_SHARED_LIBS flag for thrift
sed -i "/cd fbthrift/{n;s/cmake_install -Denable_tests=OFF/cmake_install -Denable_tests=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-centos8.sh
# No need to re-install git.
sed -i 's/dnf_install ninja-build cmake curl ccache gcc-toolset-9 git/dnf_install ninja-build cmake curl ccache gcc-toolset-9/' scripts/setup-centos8.sh
sed -i '/^function dnf_install/i\DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}' scripts/setup-centos8.sh
Expand Down Expand Up @@ -315,6 +319,8 @@ function setup_macos {
fi

sed -i '' $'/^ run_and_time install_double_conversion/a\\\n run_and_time install_folly\\\n' scripts/setup-macos.sh
# need set BUILD_SHARED_LIBS flag for thrift
sed -i "/facebook\/fbthrift/{n;s/cmake_install -DBUILD_TESTS=OFF/cmake_install -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF/;}" scripts/setup-macos.sh
}

if [ $OS == 'Linux' ]; then
Expand Down
Loading