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

Prevent faulthandler installation on armv7l #3491

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Prevent faulthandler installation on armv7l #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion buildscripts/condarecipe.local/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test:
- scipy # [not (armv6l or armv7l)]
- ipython # [not (armv6l or armv7l)]
- setuptools
- faulthandler # [py27]
- faulthandler # [py27 and (not (armv6l or armv7l))]
- tbb >=2018.0.5 # [not ((armv6l or armv7l or aarch64) or (win and py27))]
- intel-openmp # [osx]
# Need these for AOT. Do not init msvc as it may not be present
Expand Down
8 changes: 6 additions & 2 deletions buildscripts/incremental/setup_conda_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,9 @@ if [ "$RUN_COVERAGE" == "yes" ]; then $PIP_INSTALL codecov; fi
if [ "$TEST_SVML" == "yes" ]; then $CONDA_INSTALL -c numba icc_rt; fi
# Install Intel TBB parallel backend
if [ "$TEST_THREADING" == "tbb" ]; then $CONDA_INSTALL tbb tbb-devel; fi
# install the faulthandler for Python 2.x
if [ $PYTHON \< "3.0" ]; then $CONDA_INSTALL faulthandler; fi
# install the faulthandler for Python 2.x, but not on armv7l as it doesn't exist
# in berryconda
archstr=`uname -m`
if [[ "$archstr" != 'armv7l' ]]; then
if [ $PYTHON \< "3.0" ]; then $CONDA_INSTALL faulthandler; fi
fi