You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/06/16 10:17:52 UTC
[incubator-doris] branch master updated: [fix] croaringbitmap compile support USE_AVX2=0 (#10140)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 14d21edf65 [fix] croaringbitmap compile support USE_AVX2=0 (#10140)
14d21edf65 is described below
commit 14d21edf6551ca344e0c3bd2709a159a9f5871b9
Author: camby <10...@qq.com>
AuthorDate: Thu Jun 16 18:17:46 2022 +0800
[fix] croaringbitmap compile support USE_AVX2=0 (#10140)
* If we disable AVX2 by config USE_AVX2=0, we need to croaringbitmap with ROARING_DISABLE_AVX=ON
* update to trigger regression test again
Co-authored-by: cambyzju <zh...@baidu.com>
---
thirdparty/build-thirdparty.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 6b436f3222..fa92259c21 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -785,13 +785,19 @@ build_bitshuffle() {
# croaring bitmap
build_croaringbitmap() {
+ avx_flag=
+ if [ ! -z "$USE_AVX2" -a "$USE_AVX2" -eq 0 ];then
+ echo "set USE_AVX2=$USE_AVX2 to FORCE disable AVX2 in croaringbitmap"
+ avx_flag="-DROARING_DISABLE_AVX=ON"
+ fi
+
check_if_source_exist $CROARINGBITMAP_SOURCE
cd $TP_SOURCE_DIR/$CROARINGBITMAP_SOURCE
mkdir -p $BUILD_DIR && cd $BUILD_DIR
rm -rf CMakeCache.txt CMakeFiles/
CXXFLAGS="-O3" \
LDFLAGS="-L${TP_LIB_DIR} -static-libstdc++ -static-libgcc" \
- ${CMAKE_CMD} -G "${GENERATOR}" -DROARING_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
+ ${CMAKE_CMD} -G "${GENERATOR}" ${avx_flag} -DROARING_BUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX=$TP_INSTALL_DIR \
-DENABLE_ROARING_TESTS=OFF ..
${BUILD_SYSTEM} -j $PARALLEL && ${BUILD_SYSTEM} install
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org