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

0.56.4 lints, try to convice Travis CI to build for ppc64le #109

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft
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
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.20'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.20'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
pin_run_as_build:
Expand Down
2 changes: 0 additions & 2 deletions recipe/conda_build_config.yaml

This file was deleted.

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

build:
number: 0
number: 1
entry_points:
- pycc = numba.pycc:main
- numba = numba.misc.numba_entry:main
Expand All @@ -24,7 +24,6 @@ build:
# tbb-devel triggers hard dependency on tbb, this is not the case.
- tbb
skip: true # [python_impl == 'pypy']
skip: true # [py<37]

requirements:
build:
Expand Down Expand Up @@ -53,7 +52,7 @@ requirements:
- setuptools

run_constrained:
- tbb 2021.* # [not (armv6l or armv7l or aarch64 or linux32 or ppc64le)]
- {{ pin_compatible('tbb-devel', min_pin='x', max_pin='x') | replace('-devel', '') }}
# avoid confusion from openblas bugs
- libopenblas !=0.3.6 # [x86_64]
- libopenblas >=0.3.18, !=0.3.20 # [arm64]
Expand All @@ -77,8 +76,7 @@ test:
- scipy
- ipython
- setuptools
- tbb >=2021.0
- llvm-openmp # [osx]
- {{ pin_compatible('tbb-devel', min_pin='x', max_pin='x') | replace('-devel', '') }}
# Need these for AOT. Do not init msvc as it may not be present
- {{ compiler('c') }} # [not win]
- {{ compiler('cxx') }} # [not win]
Expand Down
38 changes: 28 additions & 10 deletions recipe/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@ export NUMBA_DEVELOPER_MODE=1
export NUMBA_DISABLE_ERROR_MESSAGE_HIGHLIGHTING=1
export PYTHONFAULTHANDLER=1

runtests=(
python -m numba.runtests
-b
--exclude-tags='long_running'
)

unamestr=`uname`
if [[ "$unamestr" == 'Linux' ]]; then
SEGVCATCH=catchsegv
runtests=(catchsegv "${runtests[@]}")
export CC="${CC} -pthread"
elif [[ "$unamestr" == 'Darwin' ]]; then
SEGVCATCH=""
:
else
echo Error
fi
Expand All @@ -20,11 +26,11 @@ fi
# occur on high core count systems
archstr=`uname -m`
if [[ "$archstr" == 'ppc64le' ]]; then
TEST_NPROCS=1
runtests+=(-m 1)
elif [[ "$archstr" == 'aarch64' ]]; then
TEST_NPROCS=4
runtests+=(-m 4)
else
TEST_NPROCS=${CPU_COUNT}
runtests+=(-m ${CPU_COUNT})
fi

# Disable NumPy dispatching to AVX512_SKX feature extensions if the chip is
Expand Down Expand Up @@ -52,13 +58,25 @@ numba -s
python -m numba.tests.test_runtests

if [[ "$archstr" == 'aarch64' ]] || [[ "$archstr" == "ppc64le" ]]; then
echo 'Running only a slice of tests'
$SEGVCATCH python -m numba.runtests -b -j --random='0.15' --exclude-tags='long_running' -m $TEST_NPROCS -- numba.tests
echo 'Running only a slice of tests'
# Run tests verbosely to avoid Travis CI from killing it early
runtests+=(-v)
if [[ "$archstr" == "ppc64le" ]]; then
runtests+=(-j --random='0.125')
else
runtests+=(-j --random='0.5')
fi
runtests+=(-- numba.tests)
# Else run the whole test suite
else
echo 'Running all the tests except long_running'
echo "Running: $SEGVCATCH python -m numba.runtests -b -m $TEST_NPROCS -- $TESTS_TO_RUN"
$SEGVCATCH python -m numba.runtests -b --exclude-tags='long_running' -m $TEST_NPROCS -- $TESTS_TO_RUN
echo 'Running all the tests except long_running'
runtests+=(--)
fi

echo "Running: ${runtests[*]}"
# Oddly enough, Travis CI seems to buffer stderr output more than stdout;
# So, to avoid early job terminations, redirect stderr to stdout
2>&1 \
"${runtests[@]}"

pip check