From 313cd2edb3f493d2bd830ced749e3dcd538abb1d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 4 Nov 2011 15:42:52 +0000 Subject: [PATCH] ACML path example now more realistic. corrected dangerous overwriting of LD_LIBRARY_PATH and PYTHONPATH. --- installation/setup_shellrc | 6 +++--- lib/pathinfo | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installation/setup_shellrc b/installation/setup_shellrc index e5511d253..04b30dfd9 100755 --- a/installation/setup_shellrc +++ b/installation/setup_shellrc @@ -29,7 +29,7 @@ try: # check for MSC.Mentat installation if line.split()[0].lower() == 'acml': ACMLpath = os.path.normpath(line.split()[1]) file.close() except: - ACMLpath = os.path.join(DamaskRoot,'lib/acml-4-4-0/') + ACMLpath = os.path.join(DamaskRoot,'lib/acml4.4.0/') theShell = options.shell.lower() theHome = os.getenv('USERPROFILE') or os.getenv('HOME') @@ -66,9 +66,9 @@ if theShell == 'bash': output.append(line) 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']: - 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.write('\n'.join(output)+'\n') diff --git a/lib/pathinfo b/lib/pathinfo index 516fa5fb6..54f8574c1 100644 --- a/lib/pathinfo +++ b/lib/pathinfo @@ -1,3 +1,3 @@ -ACML /opt/acml-4-4-0/ +ACML /opt/acml4.4.0/ FFTW ./ MSC /msc/