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

ACML path example now more realistic. 

corrected dangerous overwriting of LD_LIBRARY_PATH and PYTHONPATH.
This commit is contained in:
Philip Eisenlohr 2011-11-04 15:42:52 +00:00
parent 7dfb96a3da
commit 313cd2edb3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installation/setup_shellrc
View File

@ -29,7 +29,7 @@ try: # check for MSC.Mentat installation
if line.split()[0].lower() == 'acml': ACMLpath = os.path.normpath(line.split()[1]) if line.split()[0].lower() == 'acml': ACMLpath = os.path.normpath(line.split()[1])
file.close() file.close()
except: except:
ACMLpath = os.path.join(DamaskRoot,'lib/acml-4-4-0/') ACMLpath = os.path.join(DamaskRoot,'lib/acml4.4.0/')
theShell = options.shell.lower() theShell = options.shell.lower()
theHome = os.getenv('USERPROFILE') or os.getenv('HOME') theHome = os.getenv('USERPROFILE') or os.getenv('HOME')
@ -66,9 +66,9 @@ if theShell == 'bash':
output.append(line) output.append(line)
if not matched['LD_LIB']: if not matched['LD_LIB']:
output.append('export LD_LIBRARY_PATH=%s:%s'%(os.path.join(ACMLpath,'ifort64_mp/lib'),os.path.join(ACMLpath,'ifort64/lib'))) output.append('export LD_LIBRARY_PATH=%s:%s:${LD_LIBRARY_PATH}'%(os.path.join(ACMLpath,'ifort64_mp/lib'),os.path.join(ACMLpath,'ifort64/lib')))
if not matched['PYTHONPATH']: if not matched['PYTHONPATH']:
output.append('export PYTHONPATH=%s'%(os.path.join(DamaskRoot,'lib'))) output.append('export PYTHONPATH=%s:$PYTHONPATH'%(os.path.join(DamaskRoot,'lib')))
rc = open(os.path.join(theHome,theRC),'w') rc = open(os.path.join(theHome,theRC),'w')
rc.write('\n'.join(output)+'\n') rc.write('\n'.join(output)+'\n')

2
lib/pathinfo
View File

@ -1,3 +1,3 @@
ACML /opt/acml-4-4-0/ ACML /opt/acml4.4.0/
FFTW ./ FFTW ./
MSC /msc/ MSC /msc/