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.

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

Support TBB on non-Linux, skip PyPy #73

Merged
merged 6 commits into from
Mar 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .ci_support/linux_64_numpy1.16python3.6.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.6.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
tbb:
Expand All @@ -33,3 +35,4 @@ zip_keys:
- docker_image
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_64_numpy1.16python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
tbb:
Expand All @@ -33,3 +35,4 @@ zip_keys:
- docker_image
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_64_numpy1.16python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
tbb:
Expand All @@ -33,3 +35,4 @@ zip_keys:
- docker_image
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-64
tbb:
Expand All @@ -33,3 +35,4 @@ zip_keys:
- docker_image
- - python
- numpy
- python_impl
5 changes: 5 additions & 0 deletions .ci_support/linux_aarch64_numpy1.16python3.6.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.6.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
tbb:
- '2020'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
- python_impl
5 changes: 5 additions & 0 deletions .ci_support/linux_aarch64_numpy1.16python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
tbb:
- '2020'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
- python_impl
5 changes: 5 additions & 0 deletions .ci_support/linux_aarch64_numpy1.16python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
tbb:
- '2020'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
- python_impl
5 changes: 5 additions & 0 deletions .ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-aarch64
tbb:
- '2020'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.16python3.6.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.6.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.16python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.16python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- linux-ppc64le
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_64_numpy1.16python3.6.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.6.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_64_numpy1.16python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_64_numpy1.16python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_arm64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- osx-arm64
tbb:
Expand All @@ -31,3 +33,4 @@ zip_keys:
- cxx_compiler_version
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.16python3.6.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.6.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
tbb:
- '2020'
zip_keys:
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.16python3.7.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.7.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
tbb:
- '2020'
zip_keys:
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.16python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
tbb:
- '2020'
zip_keys:
- - python
- numpy
- python_impl
3 changes: 3 additions & 0 deletions .ci_support/win_64_numpy1.19python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
python_impl:
- cpython
target_platform:
- win-64
tbb:
- '2020'
zip_keys:
- - python
- numpy
- python_impl
2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ source:
sha256: {{ sha256 }}

build:
number: 0
number: 1
entry_points:
- pycc = numba.pycc:main
- numba = numba.misc.numba_entry:main
script:
- {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv
ignore_run_exports:
# tbb-devel triggers hard dependency on tbb, this is not the case.
- tbb # [not (armv6l or armv7l or aarch64 or linux32)]
- tbb
skip: True # [python_impl == 'pypy']

requirements:
build:
Expand All @@ -38,7 +39,7 @@ requirements:
- setuptools
- llvmlite 0.36.*
- numpy
- tbb-devel >=2019.5,<=2020.3 # [linux64 or ppc64le]
- tbb-devel >=2019.5,<=2020.3

run:
- python
Expand All @@ -52,7 +53,7 @@ requirements:
# build flag issues triggering UB. It must also be <=2020.3 due to ABI
# changes in TBB, see https://github.com/numba/numba/pull/6096.
# 2020.3 is the last version with the "old" ABI
- tbb >=2019.5,<=2020.3 # [linux64 or ppc64le]
- tbb >=2019.5,<=2020.3
# avoid confusion from openblas bugs
- libopenblas !=0.3.6 # [x86_64]
# CUDA 9.0 or later is required for CUDA support
Expand All @@ -68,7 +69,7 @@ test:
- scipy
- ipython
- setuptools
- tbb >=2018.0.5 # [linux64 or ppc64le]
- tbb >=2019.5
- intel-openmp # [osx]
# Need these for AOT. Do not init msvc as it may not be present
- {{ compiler('c') }} # [not win]
Expand Down Expand Up @@ -107,7 +108,7 @@ test:
- numba.tests.npyufunc

about:
home: http://numba.github.com
home: http://numba.pydata.org
license: BSD-2-Clause
license_family: BSD
license_file: LICENSE
Expand Down
2 changes: 1 addition & 1 deletion recipe/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ python -m numba.tests.test_runtests

if [[ "$archstr" == 'aarch64' ]]; then
echo 'Running only a slice of tests'
$SEGVCATCH python -m numba.runtests -b -j --random='0.20' --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
$SEGVCATCH python -m numba.runtests -b -j --random='0.15' --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
# For now, skip tests on ppc64le because of known errors in the testing suite on ppc64le https://github.com/numba/numba/issues/4026
elif [[ "$archstr" == 'ppc64le' ]]; then
echo 'Skipping tests on ppc64le for testing'
Expand Down