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

remove LD_LIBRARY_PATH (http://linuxmafia.com/faq/Admin/ld-lib-path.html) and fixed wrong named xxx_ROOT

This commit is contained in:
Martin Diehl 2014-01-25 00:15:04 +00:00
parent 081d4da768
commit 4850e5987d
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DAMASK_env.sh
View File

@ -17,24 +17,10 @@ fi
if [ "x$DAMASK_NUM_THREADS" != "x" ]
then export DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS
fi
export FFTW_ROOT=$FFTW_ROOT
LD_NEW=$FFTW_ROOT/lib
if [ "x$LAPACK_ROOT" != "x" ]
then LD_NEW=$LD_NEW:$LAPACK_ROOT/lib:$LAPACK_ROOT/lib64
fi
if [ "x$ACML_ROOT" != "x" ]
then LD_NEW=$LD_NEW:$ACML_ROOT/ifort64_mp/lib:$ACML_ROOT/ifort64/lib:$ACML_ROOT/gfortran64_mp/lib:$ACML_ROOT/gfortran64/lib
fi
if [ "x$IMKL_ROOT" != "x" ]
then LD_NEW=$LD_NEW:$IMKL_ROOT/lib/intel64
fi
if [ "x$F90" != "x" ]
then export F90=$F90
fi
if [ "x$DAMASK_BIN" == "x" ]
then DAMASK_BIN=$DAMASK_ROOT/bin
fi
# disable output in case of scp
if [ ! -z "$PS1" ]; then
@ -47,11 +33,9 @@ if [ ! -z "$PS1" ]; then
echo "DAMASK installation in $DAMASK_ROOT"
echo "DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS"
echo "F90=$F90"
echo "prepending to LD_LIBRARY_PATH: $LD_NEW"
fi
ulimit -s unlimited
ulimit -c 0
ulimit -v unlimited
ulimit -m unlimited
export PYTHONPATH=$PYTHONPATH:$DAMASK_ROOT/lib
export LD_LIBRARY_PATH=$LD_NEW:$LD_LIBRARY_PATH

16
code/Makefile
View File

@ -46,7 +46,7 @@ COMPILERNAME ?= $(F90)
INCLUDE_DIRS :=-I../lib
LIBRARIES :=-lfftw3
LIB_DIRS :=-L$(FFTWROOT)/lib
LIB_DIRS :=-L$(FFTW_ROOT)/lib
ifeq "$(FASTBUILD)" "YES"
OPENMP := OFF
@ -93,17 +93,17 @@ else
IMKL_ARCH =_sequential
endif
ifneq "x$(IMKLROOT)" "x"
LIB_DIRS :=-L$(IMKLROOT)/lib/intel64
INCLUDE_DIRS +=-I$(IMKLROOT)/include
ifneq "x$(IMKL_ROOT)" "x"
LIB_DIRS :=-L$(IMKL_ROOT)/lib/intel64
INCLUDE_DIRS +=-I$(IMKL_ROOT)/include
LIBRARIES +=-lmkl_intel_lp64 -lmkl_core -lmkl$(ACML_ARCH) -lm -lpthread -liomp5
else
ifneq "x$(ACMLROOT)" "x"
LIB_DIRS +=-L$(ACMLROOT)/$(F90)64$(ACML_ARCH)/lib
ifneq "x$(ACML_ROOT)" "x"
LIB_DIRS +=-L$(ACML_ROOT)/$(F90)64$(ACML_ARCH)/lib
LIBRARIES +=-lacml$(ACML_ARCH)
else
ifneq "x$(LAPACKROOT)" "x"
LIB_DIRS +=-L$(LAPACKROOT)/lib64 -L$(LAPACKROOT)/lib
ifneq "x$(LAPACK_ROOT)" "x"
LIB_DIRS +=-L$(LAPACK_ROOT)/lib64 -L$(LAPACK_ROOT)/lib
LIBRARIES +=-llapack
endif
endif