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

added parsing of comments (# comment here...) 

added "lib64" as possible location (sub-directory) for liblapack.a
This commit is contained in:
Philip Eisenlohr 2011-12-20 10:19:48 +00:00
parent 2b6cb3bd84
commit 2b42896ef6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installation/mods_MarcMentat/apply_DAMASK_modifications
View File

@ -18,7 +18,7 @@ echo "MSC version: $VERSION"
INSTALLDIR='' INSTALLDIR=''
if [ -f $WORKINGDIR/../../lib/pathinfo ]; then if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
INSTALLDIR=`grep msc $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` INSTALLDIR=`grep -vE "^[[:space:]]*#|^$" | grep msc $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
fi fi
while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ] while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ]
do do
@ -35,10 +35,10 @@ echo "MSC installation path: $INSTALLDIR"
BLASDIR='' BLASDIR=''
FFTWDIR='' FFTWDIR=''
if [ -f $WORKINGDIR/../../lib/pathinfo ]; then if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
IKMLDIR=`grep ikml $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` IKMLDIR=`grep -vE "^[[:space:]]*#|^$" | grep ikml $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
ACMLDIR=`grep acml $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` ACMLDIR=`grep -vE "^[[:space:]]*#|^$" | grep acml $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
LAPACKDIR=`grep lapack $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` LAPACKDIR=`grep -vE "^[[:space:]]*#|^$" | grep lapack $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
FFTWDIR=`grep fftw $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` FFTWDIR=`grep -vE "^[[:space:]]*#|^$" | grep fftw $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
if [ -d "$IKMLDIR" ] if [ -d "$IKMLDIR" ]
BLASDIR=$IKMLDIR BLASDIR=$IKMLDIR
BLASTYPE='IKML' BLASTYPE='IKML'
@ -72,10 +72,10 @@ case $BLASTYPE in
BLAS=" -mkl" BLAS=" -mkl"
;; ;;
ACML | acml) ACML | acml)
BLAS=" -L $BLASDIR/ifort64_mp/lib -lacml_mp" BLAS=" -L$BLASDIR/ifort64_mp/lib -lacml_mp"
;; ;;
LAPACK | lapack) LAPACK | lapack)
BLAS=" -L $BLASDIR/lib -llapack" BLAS=" -L$BLASDIR/lib -L$BLASDIR/lib64 -llapack"
;; ;;
*) *)
echo "error, BLAS type must be IKML, ACML, or LAPACK" echo "error, BLAS type must be IKML, ACML, or LAPACK"