8000 BLD, ENH: Enable Accelerate Framework by Matthew-Badin · Pull Request #18874 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD, ENH: Enable Accelerate Framework #18874

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
merged 4 commits into from
May 4, 2021
Merged

BLD, ENH: Enable Accelerate Framework #18874

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e28da7a
BLD: Enable Accelerate Framework
Matthew-Badin Apr 28, 2021
ee56322
BLD: Address lint issues and reviewer comments.
Matthew-Badin Apr 30, 2021
ec479e0
BLD: Minimize diff
Matthew-Badin May 1, 2021
06fffd9
DOC: Add release note.
Matthew-Badin May 4, 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
Next Next commit
BLD: Address lint issues and reviewer comments.
  • Loading branch information
@Matthew-Badin
Matthew-Badin committed Apr 30, 2021
commit ee56322f91788c97d4a41fdf4ae66aa45310553c
1 change: 0 additions & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ include numpy/*.pxd
# Note that sub-directories that don't have __init__ are apparently not
# included by 'recursive-include', so list those separately
recursive-include numpy *
recursive-include numpy/_build_utils *
recursive-include numpy/linalg/lapack_lite *
recursive-include tools *
# Add sdist files whose use depends on local configuration.
Expand Down
9 changes: 0 additions & 9 deletions numpy/_build_utils/README
View file
Open in desktop

This file was deleted.

Empty file removed numpy/_build_utils/__init__.py
View file
Open in desktop
Empty file.
21 changes: 0 additions & 21 deletions numpy/_build_utils/apple_accelerate.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions numpy/core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
from numpy.distutils import log
from distutils.dep_util import newer
from sysconfig import get_config_var

from numpy._build_utils.apple_accelerate import (
uses_accelerate_framework
)
from numpy.compat import npy_load_module
from setup_common import * # noqa: F403

Expand Down
2 changes: 1 addition & 1 deletion numpy/core/tests/test_multiarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6219,7 +6219,7 @@ def assert_dot_close(A, X, desired):
s = aligned_array((100, 100), 15, np.float32)
np.dot(s, m) # this will always segfault if the bug is present

testdata = itertools.product((15,32), (10000,), (200,89), ('C','F'))
testdata = itertools.product((15, 32), (10000,), (200, 89), ('C', 'F'))
for align, m, n, a_order in testdata:
# Calculation in double precision
A_d = np.random.rand(m, n)
Expand Down
6 changes: 4 additions & 2 deletions numpy/distutils/system_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,8 @@ class lapack_opt_info(system_info):
notfounderror = LapackNotFoundError

# List of all known LAPACK libraries, in the default order
lapack_order = ['accelerate', 'mkl', 'openblas', 'flame', 'atlas', 'lapack']
lapack_order = ['mkl', 'openblas', 'flame',
'accelerate', 'atlas', 'lapack']
order_env_var_name = 'NPY_LAPACK_ORDER'

def _calc_info_accelerate(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These _calc_info_accelerate blocks are just moved around without any changes, right? It would be nice to undo that to clean up this PR diff. Then I think this patch is good to go.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, done =).

Expand Down Expand Up @@ -1926,7 +1927,8 @@ class blas_opt_info(system_info):
notfounderror = BlasNotFoundError
# List of all known BLAS libraries, in the default order

blas_order = ['accelerate', 'mkl', 'blis', 'openblas', 'atlas', 'blas']
blas_order = ['mkl', 'blis', 'openblas',
'accelerate', 'atlas', 'blas']
order_env_var_name = 'NPY_BLAS_ORDER'

def _calc_info_accelerate(self):
Expand Down
0