From 1b4f93e521c43a7d76f38d3f0924d60918d4e5fc Mon Sep 17 00:00:00 2001 From: zhujun98 Date: Thu, 4 Mar 2021 23:37:14 +0100 Subject: [PATCH] Fix unittest with TBB and add CI with tbb --- .azure-pipelines/azure-pipelines-linux-gcc.yml | 3 +++ .azure-pipelines/unix-build.yml | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-linux-gcc.yml b/.azure-pipelines/azure-pipelines-linux-gcc.yml index bf18b99..d395ebc 100644 --- a/.azure-pipelines/azure-pipelines-linux-gcc.yml +++ b/.azure-pipelines/azure-pipelines-linux-gcc.yml @@ -10,6 +10,9 @@ jobs: gcc_version: '6' gcc_7: gcc_version: '7' + gcc_7_tbb: + gcc_version: '7' + enable_tbb: 1 gcc_8: gcc_version: '8' gcc_9: diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml index 81320c0..3de0023 100644 --- a/.azure-pipelines/unix-build.yml +++ b/.azure-pipelines/unix-build.yml @@ -4,13 +4,19 @@ steps: conda update -q conda conda env create --file environment-dev.yml source activate xtensor-python + if [[ $(enable_tbb) == 1 ]]; then + conda install tbb-devel -c conda-forge + fi displayName: Install dependencies - script: | source activate xtensor-python mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPYTHON_EXECUTABLE=`which python` -DDOWNLOAD_GTEST=ON $(Build.SourcesDirectory) + if [[ $(enable_tbb) == 1 ]]; then + CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib .."; + fi + cmake -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DPYTHON_EXECUTABLE=`which python` -DDOWNLOAD_GTEST=ON $CMAKE_EXTRA_ARGS $(Build.SourcesDirectory) displayName: Configure xtensor-python workingDirectory: $(Build.BinariesDirectory) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy