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

now aware of ACMLpathinfo

This commit is contained in:
Philip Eisenlohr 2011-11-14 14:59:16 +00:00
parent 09799b5b58
commit 413805e589
7 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installation/mods_MarcMentat2010/2010.2/Marc_tools/run_h_marc
View File

@ -1857,7 +1857,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"

2
installation/mods_MarcMentat2010/2010.2/Marc_tools/run_marc
View File

@ -1857,7 +1857,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"

2
installation/mods_MarcMentat2010/2010.2/Marc_tools/run_mp_marc
View File

@ -1857,7 +1857,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"

2
installation/mods_MarcMentat2010/2010/Marc_tools/run_h_marc
View File

@ -1818,7 +1818,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"
then then

2
installation/mods_MarcMentat2010/2010/Marc_tools/run_marc
View File

@ -1818,7 +1818,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"

2
installation/mods_MarcMentat2010/2010/Marc_tools/run_mp_marc
View File

@ -1818,7 +1818,7 @@ fi
# user subroutine used # user subroutine used
# #
# add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY) # add BLAS options for linking (taken from ACML, AMD CORE MATH LIBRARY)
AMD_BLAS=" -L /opt/acml4.4.0/ifort64_mp/lib -lacml_mp" AMD_BLAS=" -L %ACMLDIR%/ifort64_mp/lib -lacml_mp"
if test "$user" if test "$user"
then then

23
installation/mods_MarcMentat2010/apply_DAMASK_modifications
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
DEFAULT_INSTALLDIR='/msc' DEFAULT_INSTALLDIR='/msc'
DEFAULT_ACMLDIR='/opt/acml4.0.0'
DEFAULT_VERSION='2010.2' DEFAULT_VERSION='2010.2'
WORKINGDIR=`dirname $0` WORKINGDIR=`dirname $0`
@ -16,8 +17,8 @@ done
echo "MSC version: $VERSION" echo "MSC version: $VERSION"
INSTALLDIR='' INSTALLDIR=''
if [ -f $WORKINGDIR/../../processing/MSCpath ]; then if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
INSTALLDIR=`head $WORKINGDIR/../../processing/MSCpath` INSTALLDIR=`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
@ -31,6 +32,22 @@ done
INSTALLDIR=${INSTALLDIR%/} # remove trailing slash INSTALLDIR=${INSTALLDIR%/} # remove trailing slash
echo "MSC installation path: $INSTALLDIR" echo "MSC installation path: $INSTALLDIR"
ACMLDIR=''
if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
INSTALLDIR=`grep acml $WORKINGDIR/../../lib/pathinfo | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
fi
while [ ! -d "$ACMLDIR" ] || [ -z "$ACMLDIR" ]
do
echo "Input path of ACML installation: [${DEFAULT_ACMLDIR}]"
read ACMLDIR
if [ -z $ACMLDIR ]; then
ACMLDIR=${DEFAULT_ACMLDIR}
fi
done
ACMLDIR=${ACMLDIR%/} # remove trailing slash
echo "ACML installation path: $ACMLDIR"
# tools # tools
echo '' echo ''
echo 'copying Marc tools...' echo 'copying Marc tools...'
@ -44,6 +61,7 @@ for filename in 'comp_user' \
'include_linux64'; do 'include_linux64'; do
cp $WORKINGDIR/$VERSION/Marc_tools/$filename $theDIR cp $WORKINGDIR/$VERSION/Marc_tools/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%ACMLDIR%:${ACMLDIR}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g"
echo $filename echo $filename
done done
@ -58,6 +76,7 @@ for filename in 'edit_window' \
'submit3'; do 'submit3'; do
cp $WORKINGDIR/$VERSION/Mentat_bin/$filename $theDIR cp $WORKINGDIR/$VERSION/Mentat_bin/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%ACMLDIR%:${ACMLDIR}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g"
echo $filename echo $filename
done done