| 1 |
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
| 2 |
index e0fd213..e944fd1 100644
|
| 3 |
--- a/numpy/distutils/system_info.py
|
| 4 |
+++ b/numpy/distutils/system_info.py
|
| 5 |
@@ -1254,18 +1254,16 @@ class lapack_opt_info(system_info):
|
| 6 |
intel = 1
|
| 7 |
else:
|
| 8 |
intel = 0
|
| 9 |
- if os.path.exists('/System/Library/Frameworks/Accelerate.framework/'):
|
| 10 |
- if intel:
|
| 11 |
- args.extend(['-msse3'])
|
| 12 |
- else:
|
| 13 |
- args.extend(['-faltivec'])
|
| 14 |
- link_args.extend(['-Wl,-framework','-Wl,Accelerate'])
|
| 15 |
- elif os.path.exists('/System/Library/Frameworks/vecLib.framework/'):
|
| 16 |
- if intel:
|
| 17 |
- args.extend(['-msse3'])
|
| 18 |
- else:
|
| 19 |
- args.extend(['-faltivec'])
|
| 20 |
- link_args.extend(['-Wl,-framework','-Wl,vecLib'])
|
| 21 |
+ if intel:
|
| 22 |
+ args.extend(['-msse3'])
|
| 23 |
+ else:
|
| 24 |
+ args.extend(['-faltivec'])
|
| 25 |
+ link_args.extend(['-llapack'])
|
| 26 |
+ if intel:
|
| 27 |
+ args.extend(['-msse3'])
|
| 28 |
+ else:
|
| 29 |
+ args.extend(['-faltivec'])
|
| 30 |
+ link_args.extend(['-lblas'])
|
| 31 |
if args:
|
| 32 |
self.set_info(extra_compile_args=args,
|
| 33 |
extra_link_args=link_args,
|
| 34 |
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
| 35 |
index e944fd1..0c6fd27 100644
|
| 36 |
--- a/numpy/distutils/system_info.py
|
| 37 |
+++ b/numpy/distutils/system_info.py
|
| 38 |
@@ -1349,22 +1349,13 @@ class blas_opt_info(system_info):
|
| 39 |
intel = 1
|
| 40 |
else:
|
| 41 |
intel = 0
|
| 42 |
- if os.path.exists('/System/Library/Frameworks/Accelerate.framework/'):
|
| 43 |
- if intel:
|
| 44 |
- args.extend(['-msse3'])
|
| 45 |
- else:
|
| 46 |
- args.extend(['-faltivec'])
|
| 47 |
- args.extend([
|
| 48 |
- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
|
| 49 |
- link_args.extend(['-Wl,-framework','-Wl,Accelerate'])
|
| 50 |
- elif os.path.exists('/System/Library/Frameworks/vecLib.framework/'):
|
| 51 |
- if intel:
|
| 52 |
- args.extend(['-msse3'])
|
| 53 |
- else:
|
| 54 |
- args.extend(['-faltivec'])
|
| 55 |
- args.extend([
|
| 56 |
- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
|
| 57 |
- link_args.extend(['-Wl,-framework','-Wl,vecLib'])
|
| 58 |
+ if intel:
|
| 59 |
+ args.extend(['-msse3'])
|
| 60 |
+ else:
|
| 61 |
+ args.extend(['-faltivec'])
|
| 62 |
+ args.extend([
|
| 63 |
+ '-I' + os.environ.get("LAPACK_ROOT",".")])
|
| 64 |
+ link_args.extend(['-lblas'])
|
| 65 |
if args:
|
| 66 |
self.set_info(extra_compile_args=args,
|
| 67 |
extra_link_args=link_args,
|
