Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restrict the TBB development package to supported version in Azure. #8486

Merged
merged 2 commits into from Oct 5, 2022
Merged

Restrict the TBB development package to supported version in Azure. #8486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3f87d3
Restrict the TBB development package to supported version in Azure.
stuartarchibald Oct 4, 2022
d13f8cb
Remove explicit TBB installation step on windows Azure builds.
stuartarchibald Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions buildscripts/azure/azure-windows.yml
View file
Open in desktop
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/incremental/setup_conda_environment.cmd
View file
Open in desktop
Expand Up @@ -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:"
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/incremental/setup_conda_environment.sh
View file
Open in desktop
Expand Up @@ -80,7 +80,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
Expand Down