cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup oneDPL and oneTBB in CI (gcc-10)

Browse Source
This commit is contained in:
Tom Lin 2022-07-28 19:48:42 +01:00
parent 5a496a91b2
commit ecb0464f6c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci-test-compile.sh
View File

@ -138,7 +138,7 @@ build_gcc() {
for use_onedpl in OFF OPENMP TBB; do for use_onedpl in OFF OPENMP TBB; do
case "$use_onedpl" in case "$use_onedpl" in
OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${GCC_STD_PAR_LIB:-}" ;; OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${GCC_STD_PAR_LIB:-}" ;;
*) dpl_conditional_flags="-DUSE_TBB=ON" ;; *) dpl_conditional_flags="-DUSE_TBB=ON -DPSTL_USE_PARALLEL_POLICIES=0" ;;
esac esac
for use_vector in OFF ON; do for use_vector in OFF ON; do
# some distributions like Ubuntu bionic implements std par with TBB, so conditionally link it here # 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 for use_vector in OFF ON; do
case "$use_onedpl" in case "$use_onedpl" in
OFF) dpl_conditional_flags="-DCXX_EXTRA_LIBRARIES=${CLANG_STD_PAR_LIB:-}" ;; 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 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-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" run_build $name "${CLANG_CXX:?}" std-indices "$cxx $dpl_conditional_flags -DUSE_ONEDPL=$use_onedpl -DUSE_VECTOR=$use_vector"