223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

corrected directories for linking

This commit is contained in:
Pratheek Shanthraj 2012-01-06 10:41:01 +00:00
parent 8b572ff4c5
commit 159c8cad89
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
processing/setup/setup_processing.py
View File

@ -69,8 +69,7 @@ codeDir = damaskEnv.relPath('code/')
if 'ikml' in damaskEnv.pathInfo and damaskEnv.pathInfo['ikml'] != '': if 'ikml' in damaskEnv.pathInfo and damaskEnv.pathInfo['ikml'] != '':
lib_lapack = '' # TODO!! lib_lapack = '' # TODO!!
elif 'acml' in damaskEnv.pathInfo and damaskEnv.pathInfo['acml'] != '': elif 'acml' in damaskEnv.pathInfo and damaskEnv.pathInfo['acml'] != '':
lib_lapack = '-L%s -lacml'%(os.path.join(damaskEnv.pathInfo['acml'],'%s64')) # can we use linker flag? lib_lapack = '-L%s/%s64/lib -lacml'%(os.path.join(damaskEnv.pathInfo['acml']),compiler) # can we use linker flag?
# lib_lapack = os.path.join(damaskEnv.pathInfo['acml'],'%s64/lib/libacml.a'%options.compiler) # why linking against static lib?
elif 'lapack' in damaskEnv.pathInfo and damaskEnv.pathInfo['lapack'] != '': elif 'lapack' in damaskEnv.pathInfo and damaskEnv.pathInfo['lapack'] != '':
lib_lapack = '-L%s -llapack'%(damaskEnv.pathInfo['lapack']) # see http://cens.ioc.ee/pipermail/f2py-users/2003-December/000621.html lib_lapack = '-L%s -llapack'%(damaskEnv.pathInfo['lapack']) # see http://cens.ioc.ee/pipermail/f2py-users/2003-December/000621.html
@ -132,7 +131,7 @@ execute = { \
' -c --fcompiler=%s'%(f2py_compiler) +\ ' -c --fcompiler=%s'%(f2py_compiler) +\
' %s'%(os.path.join(codeDir,'core_modules.f90'))+\ ' %s'%(os.path.join(codeDir,'core_modules.f90'))+\
' %s'%(os.path.join(codeDir,'math.f90'))+\ ' %s'%(os.path.join(codeDir,'math.f90'))+\
' -L%s -lfftw3'%(damaskEnv.pathInfo['fftw'])+\ ' -L%s/lib -lfftw3'%(damaskEnv.pathInfo['fftw'])+\
' %s'%lib_lapack, ' %s'%lib_lapack,
'mv %s %s' %(os.path.join(codeDir,'core.so'),damaskEnv.relPath('lib/damask')), 'mv %s %s' %(os.path.join(codeDir,'core.so'),damaskEnv.relPath('lib/damask')),
] ]