From ecb0464f6c7b35f94c8ea2abc1bcd50b036ecb97 Mon Sep 17 00:00:00 2001 From: Tom Lin Date: Thu, 28 Jul 2022 19:48:42 +0100 Subject: [PATCH] Fixup oneDPL and oneTBB in CI (gcc-10) --- src/ci-test-compile.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ci-test-compile.sh b/src/ci-test-compile.sh index 041c991..2a10191 100755 --- a/src/ci-test-compile.sh +++ b/src/ci-test-compile.sh @@ -137,8 +137,8 @@ build_gcc() { for use_onedpl in OFF OPENMP TBB; do case "$use_onedpl" in - OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${GCC_STD_PAR_LIB:-}" ;; - *) dpl_conditional_flags="-DUSE_TBB=ON" ;; + OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${GCC_STD_PAR_LIB:-}" ;; + *) dpl_conditional_flags="-DUSE_TBB=ON -DPSTL_USE_PARALLEL_POLICIES=0" ;; esac for use_vector in OFF ON; do # some distributions like Ubuntu bionic implements std par with TBB, so conditionally link it here @@ -227,7 +227,7 @@ build_clang() { for use_vector in OFF ON; do case "$use_onedpl" in OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${CLANG_STD_PAR_LIB:-}" ;; - *) dpl_conditional_flags="-DUSE_TBB=ON" ;; + *) dpl_conditional_flags="-DUSE_TBB=ON -DPSTL_USE_PARALLEL_POLICIES=0" ;; esac run_build $name "${CLANG_CXX:?}" std-data "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DUSE_VECTOR=$use_vector " run_build $name "${CLANG_CXX:?}" std-indices "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DUSE_VECTOR=$use_vector"