This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 6ea2c4e22 [VL] Daily Update Velox Version (2024_03_22) (#5077)
6ea2c4e22 is described below
commit 6ea2c4e22a442be2ea69058d21ae91b2a8039ed8
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Fri Mar 22 16:40:14 2024 +0800
[VL] Daily Update Velox Version (2024_03_22) (#5077)
Co-authored-by: yan ma <[email protected]>
---
cpp/velox/substrait/VariantToVectorConverter.cc | 2 +-
ep/build-velox/src/get_velox.sh | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cpp/velox/substrait/VariantToVectorConverter.cc
b/cpp/velox/substrait/VariantToVectorConverter.cc
index 0fa8ccbbd..f8c9c11f0 100644
--- a/cpp/velox/substrait/VariantToVectorConverter.cc
+++ b/cpp/velox/substrait/VariantToVectorConverter.cc
@@ -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;
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 0fee29c24..26faf289f 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -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
@@ -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
@@ -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
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
