Skip to content

PR 6096 continued #6854

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

Merged
sklam merged 10 commits into from
Mar 26, 2021
Merged

PR 6096 continued #6854

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd28a48
task_scheduler_init was removed in latest tbb version
Aug 3, 2020
46bd515
fix
Aug 4, 2020
f960964
use task scheduler handle
Aug 6, 2020
2faea44
Adapt fork handling changes
Mar 22, 2021
65062f9
CI for tbb builds
stuartarchibald Mar 23, 2021
7d41603
Use Numba channel.
stuartarchibald Mar 24, 2021
9bebb9c
Clean up.
stuartarchibald Mar 24, 2021
11836a9
Force tbb 2021
stuartarchibald Mar 24, 2021
2c3c759
Sort out tbb for windows
stuartarchibald Mar 24, 2021
902891e
Update conda packaging restriction
stuartarchibald Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update conda packaging restriction 
As title.
  • Loading branch information
@stuartarchibald
stuartarchibald committed Mar 26, 2021
commit 902891ec53d0411cca3b3b25b4f3ada1ac35d326
8 changes: 5 additions & 3 deletions buildscripts/condarecipe.local/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ requirements:
- llvmlite >=0.37.0dev0,<0.37
# TBB devel version is to match TBB libs.
# 2020.3 is the last version with the "old" ABI
- tbb-devel >=2019.5,<=2020.3 # [not (armv6l or armv7l or aarch64 or linux32)]
# NOTE: ppc64le exclusion is temporary until packages are more generally
# available.
- tbb-devel >=2021 # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
run:
- python >=3.6
- numpy >=1.15
Expand All @@ -47,7 +49,7 @@ requirements:
- llvmlite >=0.37.0dev0,<0.37
run_constrained:
# If TBB is present it must be at least version 2021
- tbb >=2021 # [not (armv6l or armv7l or aarch64 or linux32)]
- tbb >=2021 # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
# avoid confusion from openblas bugs
- libopenblas !=0.3.6 # [x86_64]
# CUDA 9.2 or later is required for CUDA support
Expand All @@ -64,7 +66,7 @@ test:
- scipy # [not (armv6l or armv7l)]
- ipython # [not (armv6l or armv7l or aarch64)]
- setuptools
- tbb >=2019.5 # [not (armv6l or armv7l or aarch64 or linux32)]
- tbb >=2021 # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
- intel-openmp # [osx]
# Need these for AOT. Do not init msvc as it may not be present
- {{ compiler('c') }} # [not (win or armv6l or armv7l or aarch64)]
Expand Down