research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the Accelerate framework for BLAS and LAPACK on OS X

Browse source
This commit is contained in:
Ray Speth 2012-03-15 22:49:04 +00:00
parent 9dc9ddc1bc
commit f22ecac5c4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SConstruct
View file

@ -797,13 +797,16 @@ if env.get('python_array') in ('numarray', 'numeric'):
# **********************************************
# *** Set additional configuration variables ***
# **********************************************
if env['blas_lapack_libs'] == '':
if env['blas_lapack_libs'] != '':
env['blas_lapack_libs'] = env['blas_lapack_libs'].split(',')
env['BUILD_BLAS_LAPACK'] = False
elif env['OS'] == 'Darwin':
env['BUILD_BLAS_LAPACK'] = False
env.Append(FRAMEWORKS=['Accelerate'])
else:
# External BLAS/LAPACK were not given, so we need to compile them
env['BUILD_BLAS_LAPACK'] = True
env['blas_lapack_libs'] = [] # built into libcantera
else:
env['blas_lapack_libs'] = env['blas_lapack_libs'].split(',')
env['BUILD_BLAS_LAPACK'] = False
# Directories where things will be after actually being installed
# These variables are the ones that are used to populate header files,

1
src/matlab/SConscript
View file

@ -30,7 +30,6 @@ elif localenv['OS'] == 'Darwin':
linklibs += ['mx', 'mex', 'mat'] + env['LIBM']
mexPlatform = 'maci'
linkflags.extend(['-Wl,-exported_symbol,_mexFunction'])
localenv.Append(FRAMEWORKS=['Accelerate'])
if localenv['OS_BITS'] == 64:
matlab_libs = pjoin(localenv['matlab_path'], 'bin', 'maci64')