diff --git a/buildscripts/azure/azure-windows.yml b/buildscripts/azure/azure-windows.yml index c7946c0a188..aa38d8b3273 100644 --- a/buildscripts/azure/azure-windows.yml +++ b/buildscripts/azure/azure-windows.yml @@ -29,12 +29,6 @@ jobs: buildscripts\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - - script: | - # use TBB - call activate %CONDA_ENV% - conda install -y -c numba tbb=2021 tbb-devel - displayName: 'Add in TBB' - - script: | buildscripts\\incremental\\build.cmd displayName: 'Build' diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd index 6089789973f..1a4ecb7c78c 100644 --- a/buildscripts/incremental/setup_conda_environment.cmd +++ b/buildscripts/incremental/setup_conda_environment.cmd @@ -36,7 +36,7 @@ if "%BUILD_DOC%" == "yes" (%CONDA_INSTALL% sphinx sphinx_rtd_theme pygments) @rem Install dependencies for code coverage (codecov.io) if "%RUN_COVERAGE%" == "yes" (%PIP_INSTALL% codecov) @rem Install TBB -%CONDA_INSTALL% -c numba tbb=2021 tbb-devel +%CONDA_INSTALL% -c numba tbb=2021 "tbb-devel>=2021,<2021.6" if %errorlevel% neq 0 exit /b %errorlevel% echo "DEBUG ENV:" diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh index 2400fdae66d..943c428ade1 100755 --- a/buildscripts/incremental/setup_conda_environment.sh +++ b/buildscripts/incremental/setup_conda_environment.sh @@ -104,7 +104,7 @@ if [ "$RUN_COVERAGE" == "yes" ]; then $PIP_INSTALL codecov; fi # Install SVML if [ "$TEST_SVML" == "yes" ]; then $CONDA_INSTALL -c numba icc_rt; fi # Install Intel TBB parallel backend -if [ "$TEST_THREADING" == "tbb" ]; then $CONDA_INSTALL -c numba tbb=2021 tbb-devel; fi +if [ "$TEST_THREADING" == "tbb" ]; then $CONDA_INSTALL -c numba tbb=2021 "tbb-devel>=2021,<2021.6"; fi # Install pickle5 if [ "$TEST_PICKLE5" == "yes" ]; then $PIP_INSTALL pickle5; fi # Install typeguard