summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2020-05-31 13:02:14 +0300
committermattip <matti.picus@gmail.com>2020-05-31 13:02:14 +0300
commitae59835cfc9af082bd54f6246ecd60b48fc9e4c0 (patch)
tree7a9f0afbc30e0577b9eba08a2fac290b74de5fd8
parentcbde47818a821ef951ca73e851579ca75d23a82b (diff)
downloadnumpy-ae59835cfc9af082bd54f6246ecd60b48fc9e4c0.tar.gz
DOC,ENH: extend error message when Accelerate is detected
-rw-r--r--doc/source/user/building.rst4
-rw-r--r--numpy/__init__.py9
-rw-r--r--site.cfg.example8
3 files changed, 8 insertions, 13 deletions
diff --git a/doc/source/user/building.rst b/doc/source/user/building.rst
index 47a0a03c9..4eded64e3 100644
--- a/doc/source/user/building.rst
+++ b/doc/source/user/building.rst
@@ -6,6 +6,10 @@ Building from source
A general overview of building NumPy from source is given here, with detailed
instructions for specific platforms given separately.
+.. comment::
+ This page is referenced from numpy/numpy/__init__.py. Please keep its
+ location in sync with the link there.
+
Prerequisites
-------------
diff --git a/numpy/__init__.py b/numpy/__init__.py
index e6a24f0d1..1c3b11844 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -279,12 +279,11 @@ else:
error_message = "{}: {}".format(w[-1].category.__name__, str(w[-1].message))
msg = (
"Polyfit sanity test emitted a warning, most likely due "
- "to using a buggy Accelerate backend. "
- "If you compiled yourself, "
- "see site.cfg.example for information. "
+ "to using a buggy Accelerate backend. If you compiled "
+ "yourself, more information is available at "
+ "https://numpy.org/doc/stable/user/building.html#accelerated-blas-lapack-libraries "
"Otherwise report this to the vendor "
- "that provided NumPy.\n{}\n".format(
- error_message))
+ "that provided NumPy.\n{}\n".format(error_message))
raise RuntimeError(msg)
del _mac_os_check
diff --git a/site.cfg.example b/site.cfg.example
index 3eba3bbd7..c809303a2 100644
--- a/site.cfg.example
+++ b/site.cfg.example
@@ -242,14 +242,6 @@
# library_dirs = C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2018\windows\mkl\lib\intel64
# libraries = mkl_rt
-# Accelerate
-# ----------
-# Accelerate/vecLib is an OSX framework providing a BLAS and LAPACK implementation.
-#
-# [accelerate]
-# libraries = Accelerate, vecLib
-# #libraries = None
-
# UMFPACK
# -------
# The UMFPACK library is used in scikits.umfpack to factor large sparse matrices.