Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit5ba6e41

Browse files
author
Ralf Gommers
committed
Merge pull request#5393 from charris/detect_atlas_3_10
ENH: Add support for ATLAS > 3.9.33.
2 parentsbd7fcee +dd0732e commit5ba6e41

File tree

1 file changed

+80
-3
lines changed

1 file changed

+80
-3
lines changed

‎numpy/distutils/system_info.py‎

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
atlas_blas_info
1111
atlas_blas_threads_info
1212
lapack_atlas_info
13+
lapack_atlas_threads_info
14+
atlas_3_10_info
15+
atlas_3_10_threads_info
16+
atlas_3_10_blas_info,
17+
atlas_3_10_blas_threads_info,
18+
lapack_atlas_3_10_info
19+
lapack_atlas_3_10_threads_info
1320
blas_info
1421
lapack_info
1522
openblas_info
@@ -302,6 +309,12 @@ def get_info(name, notfound_action=0):
302309
'atlas_blas_threads':atlas_blas_threads_info,
303310
'lapack_atlas':lapack_atlas_info,# use lapack_opt instead
304311
'lapack_atlas_threads':lapack_atlas_threads_info,# ditto
312+
'atlas_3_10':atlas_3_10_info,# use lapack_opt or blas_opt instead
313+
'atlas_3_10_threads':atlas_3_10_threads_info,# ditto
314+
'atlas_3_10_blas':atlas_3_10_blas_info,
315+
'atlas_3_10_blas_threads':atlas_3_10_blas_threads_info,
316+
'lapack_atlas_3_10':lapack_atlas_3_10_info,# use lapack_opt instead
317+
'lapack_atlas_3_10_threads':lapack_atlas_3_10_threads_info,# ditto
305318
'mkl':mkl_info,
306319
# openblas which may or may not have embedded lapack
307320
'openblas':openblas_info,# use blas_opt instead
@@ -1148,6 +1161,63 @@ class lapack_atlas_threads_info(atlas_threads_info):
11481161
_lib_names= ['lapack_atlas']+atlas_threads_info._lib_names
11491162

11501163

1164+
classatlas_3_10_info(atlas_info):
1165+
_lib_names= ['satlas']
1166+
_lib_atlas=_lib_names
1167+
_lib_lapack=_lib_names
1168+
1169+
1170+
classatlas_3_10_blas_info(atlas_3_10_info):
1171+
_lib_names= ['satlas']
1172+
1173+
defcalc_info(self):
1174+
lib_dirs=self.get_lib_dirs()
1175+
info= {}
1176+
atlas_libs=self.get_libs('atlas_libs',
1177+
self._lib_names)
1178+
atlas=self.check_libs2(lib_dirs,atlas_libs, [])
1179+
ifatlasisNone:
1180+
return
1181+
include_dirs=self.get_include_dirs()
1182+
h= (self.combine_paths(lib_dirs+include_dirs,'cblas.h')or [None])
1183+
h=h[0]
1184+
ifh:
1185+
h=os.path.dirname(h)
1186+
dict_append(info,include_dirs=[h])
1187+
info['language']='c'
1188+
info['define_macros']= [('HAVE_CBLAS',None)]
1189+
1190+
atlas_version,atlas_extra_info=get_atlas_version(**atlas)
1191+
dict_append(atlas,**atlas_extra_info)
1192+
1193+
dict_append(info,**atlas)
1194+
1195+
self.set_info(**info)
1196+
return
1197+
1198+
1199+
classatlas_3_10_threads_info(atlas_3_10_info):
1200+
dir_env_var= ['PTATLAS','ATLAS']
1201+
_lib_names= ['tatlas']
1202+
#if sys.platfcorm[:7] == 'freebsd':
1203+
## I don't think freebsd supports 3.10 at this time - 2014
1204+
_lib_atlas=_lib_names
1205+
_lib_lapack=_lib_names
1206+
1207+
1208+
classatlas_3_10_blas_threads_info(atlas_3_10_blas_info):
1209+
dir_env_var= ['PTATLAS','ATLAS']
1210+
_lib_names= ['tatlas']
1211+
1212+
1213+
classlapack_atlas_3_10_info(atlas_3_10_info):
1214+
pass
1215+
1216+
1217+
classlapack_atlas_3_10_threads_info(atlas_3_10_threads_info):
1218+
pass
1219+
1220+
11511221
classlapack_info(system_info):
11521222
section='lapack'
11531223
dir_env_var='LAPACK'
@@ -1366,7 +1436,6 @@ def get_atlas_version(**config):
13661436
returnresult
13671437

13681438

1369-
13701439
classlapack_opt_info(system_info):
13711440

13721441
notfounderror=LapackNotFoundError
@@ -1383,7 +1452,11 @@ def calc_info(self):
13831452
self.set_info(**lapack_mkl_info)
13841453
return
13851454

1386-
atlas_info=get_info('atlas_threads')
1455+
atlas_info=get_info('atlas_3_10_threads')
1456+
ifnotatlas_info:
1457+
atlas_info=get_info('atlas_3_10')
1458+
ifnotatlas_info:
1459+
atlas_info=get_info('atlas_threads')
13871460
ifnotatlas_info:
13881461
atlas_info=get_info('atlas')
13891462

@@ -1480,7 +1553,11 @@ def calc_info(self):
14801553
self.set_info(**openblas_info)
14811554
return
14821555

1483-
atlas_info=get_info('atlas_blas_threads')
1556+
atlas_info=get_info('atlas_3_10_blas_threads')
1557+
ifnotatlas_info:
1558+
atlas_info=get_info('atlas_3_10_blas')
1559+
ifnotatlas_info:
1560+
atlas_info=get_info('atlas_blas_threads')
14841561
ifnotatlas_info:
14851562
atlas_info=get_info('atlas_blas')
14861563

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp