Commit 72ff931d authored by Yaser Afshar's avatar Yaser Afshar

minor correction on the script - now PETSC installation works correctly

parent c6c13f43
...@@ -10,8 +10,9 @@ source script/conf_PETSC ...@@ -10,8 +10,9 @@ source script/conf_PETSC
source script/update_openfpm source script/update_openfpm
### switch to the branch ### switch to the branch
b_switch=`git rev-parse --abbrev-ref HEAD`
b_switch=$(cat switch_branch) b_switch=
#b_switch=$(cat switch_branch)
if [ x"$b_switch" != x"" ]; then if [ x"$b_switch" != x"" ]; then
git checkout $b_switch git checkout $b_switch
echo -e "Please relaunch ./install ..." echo -e "Please relaunch ./install ..."
...@@ -52,23 +53,23 @@ while getopts di:smhc:nu FLAG; do ...@@ -52,23 +53,23 @@ while getopts di:smhc:nu FLAG; do
echo "Fowarding options $OPTARG to configure script" echo "Fowarding options $OPTARG to configure script"
configure_options=$OPTARG configure_options=$OPTARG
;; ;;
m) m)
echo "Skip to make the testing" echo "Skip to make the testing"
nomake=1 nomake=1
;; ;;
u) u)
echo "Updating openfpm" echo "Updating openfpm"
update_openfpm=1 update_openfpm=1
;; ;;
n) n)
echo "Upgrading openfpm" echo "Upgrading openfpm"
upgrade_openfpm=1 upgrade_openfpm=1
;; ;;
h) #show help h) #show help
HELP HELP
;; ;;
\?) #unrecognized option - are fowarded to configure \?) #unrecognized option - are fowarded to configure
;; ;;
esac esac
done done
...@@ -101,13 +102,12 @@ if [ $upgrade_openfpm -eq 1 ]; then ...@@ -101,13 +102,12 @@ if [ $upgrade_openfpm -eq 1 ]; then
exit 0 exit 0
fi fi
remove_old $i_dir remove_old $i_dir $configure_options
## Check and try to install the prerequisites ## Check and try to install the prerequisites
pre_req pre_req
## clone the dependencies ## clone the dependencies
git submodule init git submodule init
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo -e "Configure\033[91;5;1m FAILED \033[0m" echo -e "Configure\033[91;5;1m FAILED \033[0m"
...@@ -121,7 +121,6 @@ if [ $? -ne 0 ]; then ...@@ -121,7 +121,6 @@ if [ $? -ne 0 ]; then
fi fi
# Create config directory in each submodule # Create config directory in each submodule
cd openfpm_data cd openfpm_data
if [ ! -d src/config ]; then if [ ! -d src/config ]; then
mkdir src/config mkdir src/config
...@@ -166,6 +165,7 @@ if [ $? -ne 0 ]; then ...@@ -166,6 +165,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
## check for options ## check for options
echo -e "\033[1;34;5mDEPENCENCIES INSTALLATION DIR \033[0m" echo -e "\033[1;34;5mDEPENCENCIES INSTALLATION DIR \033[0m"
...@@ -177,7 +177,7 @@ if [ x"$configure_options" == x"" ]; then ...@@ -177,7 +177,7 @@ if [ x"$configure_options" == x"" ]; then
fi fi
if [ $sq -eq 0 ]; then if [ $sq -eq 0 ]; then
unset commands unset commands
commands[0]="Continue" commands[0]="continue"
possible_solutions "${commands[@]}" possible_solutions "${commands[@]}"
fi fi
...@@ -284,7 +284,7 @@ else ...@@ -284,7 +284,7 @@ else
./configure $options $configure_options "$configure_blas_option" ./configure $options $configure_options "$configure_blas_option"
conf_err=$? conf_err=$?
echo "Configure script terminated with $conf_err" echo "Configure script terminated with $conf_err"
## if MPI or METIS installation required install it ## if MPI or METIS installation required install it
if [ $conf_err -eq 200 ]; then if [ $conf_err -eq 200 ]; then
...@@ -321,7 +321,7 @@ else ...@@ -321,7 +321,7 @@ else
fi fi
BOOST_installed=1 BOOST_installed=1
configure_options=" $configure_options --with-boost=$i_dir/BOOST " configure_options=" $configure_options --with-boost=$i_dir/BOOST "
elif [ $conf_err -eq 208 ]; then elif [ $conf_err -eq 208 ]; then
echo "ParMetis not found try to install" echo "ParMetis not found try to install"
if [ $PARMETIS_installed -eq 1 ]; then if [ $PARMETIS_installed -eq 1 ]; then
echo "Error the installation of ParMETIS failed" echo "Error the installation of ParMETIS failed"
...@@ -334,7 +334,7 @@ else ...@@ -334,7 +334,7 @@ else
echo "HDF5 not found try to install" echo "HDF5 not found try to install"
if [ $HDF5_installed -eq 1 ]; then if [ $HDF5_installed -eq 1 ]; then
echo "Error the installation of HDF5 failed" echo "Error the installation of HDF5 failed"
exit 1 exit 1
fi fi
./script/install_HDF5.sh $i_dir $ncore ./script/install_HDF5.sh $i_dir $ncore
configure_options=" $configure_options --with-hdf5=$i_dir/HDF5/bin/h5pcc " configure_options=" $configure_options --with-hdf5=$i_dir/HDF5/bin/h5pcc "
...@@ -359,11 +359,10 @@ else ...@@ -359,11 +359,10 @@ else
./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC ./script/install_PETSC.sh $i_dir $ncore $CC $CXX $F77 $FC
fi fi
### collect PETSC configuration options ### collect PETSC configuration options
conf_PETSC conf_PETSC
./configure $options $configure_options "$configure_blas_option" ./configure $options $configure_options "$configure_blas_option"
fi fi
### Create example.mk ### Create example.mk
......
...@@ -2,47 +2,47 @@ ...@@ -2,47 +2,47 @@
function conf_PETSC() function conf_PETSC()
{ {
if [ -d "$i_dir/PETSC" ]; then if [ -d "$i_dir/PETSC" ]; then
configure_options="$configure_options --with-petsc=$i_dir/PETSC " configure_options="$configure_options --with-petsc=$i_dir/PETSC "
lin_alg_dir="$lin_alg_dir -L$i_dir/PETSC/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/PETSC/lib"
lin_alg_lib="$lin_alg_lib -lpetsc" lin_alg_lib="$lin_alg_lib -lpetsc"
lin_alg_inc="$lin_alg_inc -I$i_dir/PETSC/include" lin_alg_inc="$lin_alg_inc -I$i_dir/PETSC/include"
fi fi
if [ -d "$i_dir/HYPRE" ]; then if [ -d "$i_dir/HYPRE" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/HYPRE/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/HYPRE/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/HYPRE/include" lin_alg_inc="$lin_alg_inc -I$i_dir/HYPRE/include"
fi fi
if [ -d "$i_dir/MUMPS" ]; then if [ -d "$i_dir/MUMPS" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/MUMPS/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/MUMPS/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/MUMPS/include" lin_alg_inc="$lin_alg_inc -I$i_dir/MUMPS/include"
fi fi
if [ -d "$i_dir/OPENBLAS" ]; then if [ -d "$i_dir/OPENBLAS" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/OPENBLAS/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/OPENBLAS/lib"
lin_alg_lib="$lin_alg_lib -lopenblas" lin_alg_lib="$lin_alg_lib -lopenblas"
lin_alg_inc="$lin_alg_inc -I$i_dir/OPENBLAS/include" lin_alg_inc="$lin_alg_inc -I$i_dir/OPENBLAS/include"
configure_blas_option="--with-blas=-L$i_dir/OPENBLAS/lib -lopenblas" configure_blas_option="--with-blas=-L$i_dir/OPENBLAS/lib -lopenblas"
fi fi
if [ -d "$i_dir/SCALAPACK" ]; then if [ -d "$i_dir/SCALAPACK" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/SCALAPACK/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/SCALAPACK/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/SCALAPACK/include" lin_alg_inc="$lin_alg_inc -I$i_dir/SCALAPACK/include"
fi fi
if [ -d "$i_dir/SUPERLU_DIST" ]; then if [ -d "$i_dir/SUPERLU_DIST" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/SUPERLU_DIST/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/SUPERLU_DIST/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/SUPERLU_DIST/include" lin_alg_inc="$lin_alg_inc -I$i_dir/SUPERLU_DIST/include"
fi fi
if [ -d "$i_dir/TRILINOS" ]; then if [ -d "$i_dir/TRILINOS" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/TRILINOS/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/TRILINOS/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/TRILINOS/include" lin_alg_inc="$lin_alg_inc -I$i_dir/TRILINOS/include"
fi fi
if [ -d "$i_dir/SUITESPARSE" ]; then if [ -d "$i_dir/SUITESPARSE" ]; then
lin_alg_dir="$lin_alg_dir -L$i_dir/SUITESPARSE/lib" lin_alg_dir="$lin_alg_dir -L$i_dir/SUITESPARSE/lib"
lin_alg_inc="$lin_alg_inc -I$i_dir/SUITESPARSE/include" lin_alg_inc="$lin_alg_inc -I$i_dir/SUITESPARSE/include"
lin_alg_lib="$lin_alg_lib -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig" lin_alg_lib="$lin_alg_lib -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig"
configure_options="$configure_options --with-suitesparse=$i_dir/SUITESPARSE " configure_options="$configure_options --with-suitesparse=$i_dir/SUITESPARSE "
fi fi
if [ -d "$i_dir/EIGEN" ]; then if [ -d "$i_dir/EIGEN" ]; then
configure_options=" $configure_options --with-eigen=$i_dir/EIGEN " configure_options=" $configure_options --with-eigen=$i_dir/EIGEN "
lin_alg_inc="$lin_alg_inc -I$i_dir/EIGEN" lin_alg_inc="$lin_alg_inc -I$i_dir/EIGEN"
fi fi
} }
#! /bin/bash #! /bin/bash
function haveProg() {
[ -x "$(command -v $1)" ]
}
function gpp_clang() function gpp_clang()
{ {
if [ x"$dgc_compiler" == x"g++" ]; then if [ x"$dgc_compiler" == x"g++" ]; then
...@@ -15,20 +19,17 @@ function gpp_clang() ...@@ -15,20 +19,17 @@ function gpp_clang()
fi fi
} }
function detect_compiler() function detect_compiler()
{ {
gpp_found=0 gpp_found=0
icpc_found=0 icpc_found=0
dgc_ret=0 dgc_ret=0
# First we try to understand if g++ command line is linked to clang # First we try to understand if g++ command line is linked to clang
if haveProg g++; then
g++ --version | grep "Apple LLVM"
if [ $? == 0 ]; then
echo "Apple LLVM based g++"
g++ --version | grep "Apple LLVM" >/dev/null 2>&1
if [ $? == 0 ]; then
echo "Apple LLVM based g++" echo "Apple LLVM based g++"
# we try the detect the version # we try the detect the version
...@@ -65,13 +66,13 @@ function detect_compiler() ...@@ -65,13 +66,13 @@ function detect_compiler()
dgc_ret=1 dgc_ret=1
gpp_found=1 gpp_found=1
fi fi
else else
dgc_ret=2 dgc_ret=2
fi fi
fi fi
g++ --version | grep g++ g++ --version | grep "g++" > /dev/null 2>&1
if [ $? == 0 -a x"g++" == x"g++" ]; then if [ $? == 0 ]; then
dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g') dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g') dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g') dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
...@@ -104,10 +105,10 @@ function detect_compiler() ...@@ -104,10 +105,10 @@ function detect_compiler()
dgc_ret=0 dgc_ret=0
gpp_found=0 gpp_found=0
fi fi
fi fi
g++ --version | grep g++ g++ --version | grep "clang" > /dev/null 2>&1
if [ $? == 0 -a x"g++" == x"clang" ]; then if [ $? == 0 ]; then
dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g') dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g') dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g') dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
...@@ -136,10 +137,12 @@ function detect_compiler() ...@@ -136,10 +137,12 @@ function detect_compiler()
dgc_ret=0 dgc_ret=0
gpp_found=0 gpp_found=0
fi fi
fi
fi fi
icpc --version | grep icpc if haveProg icpc; then
if [ $? == 0 -a x"icpc" == x"icpc" ]; then icpc --version | grep icpc > /dev/null 2>&1
if [ $? == 0 ]; then
dgc_major=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g') dgc_major=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
dgc_middle=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g') dgc_middle=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
dgc_minor=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g') dgc_minor=$(icpc --version | grep icpc | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
...@@ -164,10 +167,10 @@ function detect_compiler() ...@@ -164,10 +167,10 @@ function detect_compiler()
dgc_ret=1 dgc_ret=1
icpc_found=1 icpc_found=1
fi fi
fi
fi fi
### If we detect more than one valid compiler ask to choose ### If we detect more than one valid compiler ask to choose
if [ $icpc_found -eq 1 -a $gpp_found -eq 1 ]; then if [ $icpc_found -eq 1 -a $gpp_found -eq 1 ]; then
echo "Two different valid compilers has been found please choose one" echo "Two different valid compilers has been found please choose one"
commands[0]="icpc" commands[0]="icpc"
......
#! /bin/bash #! /bin/bash
function haveProg() {
[ -x "$(command -v $1)" ]
}
function discover_package_manager() { function discover_package_manager() {
if [ x"$1" = x"osx" ]; then if [ x"$1" == x"osx" ]; then
command -v brew >/dev/null if haveProg brew; then
if [ $? -eq 0 ]; then discover_package_manager_ret="brew"
discover_package_manager_ret="brew" brew_idir=$(brew --prefix)
brew_idir=$(brew --prefix) brew_path=$(which brew)
brew_path=$(which brew) brew_user=$(stat -f '%Su' $brew_path)
brew_user=$(stat -f '%Su' $brew_path) if [ x$"brew_user" == root ]; then
if [ x$"brew_user" == root ]; then discover_package_ret="sudo brew"
discover_package_ret="sudo brew" echo 'Package Manager: '"$discover_package_manager_ret"
return return
else else
if [ ! -w $brew_idir ]; then if [ ! -w $brew_idir ]; then
echo -e "\033[43;30;1;5mWARNING: \033[0m $brew_idir is not writtable, brew require that $brew_idir is writtable and $brew_idir/bin is in your PATH, otherwise it will be not possible to install with brew" echo -e "\033[43;30;1;5mWARNING: \033[0m $brew_idir is not writtable, brew require that $brew_idir is writtable and $brew_idir/bin is in your PATH, otherwise it will be not possible to install with brew"
commands[0]="sudo chown -R $USER $brew_idir && chmod -R u+w $brew_idir" commands[0]="sudo chown -R $USER $brew_idir && chmod -R u+w $brew_idir"
possible_solutions "${commands[@]}" possible_solutions "${commands[@]}"
fi
fi fi
fi if [ ! -w ]; then
if [ ! -w ]; then echo -e "\033[43,33;5mWARNING: \033[0m $brew_idir is not writtable, brew require that $brew_idir is writtable and $brew_idir/bin is in your PATH, otherwise it will be not possible to install with brew"
echo -e "\033[43,33;5mWARNING: \033[0m $brew_idir is not writtable, brew require that $brew_idir is writtable and $brew_idir/bin is in your PATH, otherwise it will be not possible to install with brew" sleep 10
sleep 10 fi
fi echo echo 'Package Manager: '"$discover_package_manager_ret"
return return
fi fi
command -v port >/dev/null if haveProg port; then
if [ $? -eq 0 ]; then discover_package_manager_ret="sudo port"
discover_package_manager_ret="sudo port" echo 'Package Manager: '"$discover_package_manager_ret"
return return
else else
discover_package_manager_ret="" discover_package_manager_ret=""
return echo 'Package Manager: '"$discover_package_manager_ret"
return
fi fi
elif [ x"$1" = x"linux" ]; then elif [ x"$1" == x"linux" ]; then
command -v yum >/dev/null if haveProg yum; then
if [ $? -eq 0 ]; then discover_package_manager_ret="yum"
discover_package_manager_ret="yum" echo 'Package Manager: '"$discover_package_manager_ret"
return return
fi fi
command -v apt-get >/dev/null if haveProg apt-get; then
if [ $? -eq 0 ]; then discover_package_manager_ret="apt-get"
discover_package_manager_ret="apt-get" echo 'Package Manager: '"$discover_package_manager_ret"
return return
fi fi
command -v zypper >/dev/null if haveProg zypper; then
if [ $? -eq 0 ]; then discover_package_manager_ret="zypper"
discover_package_manager_ret="zypper" echo 'Package Manager: '"$discover_package_manager_ret"
return return
else else
discover_package_manager_ret="" discover_package_manager_ret=""
return echo 'Package Manager: '"$discover_package_manager_ret"
return
fi fi
fi fi
} }
echo "$discover_package_manager_ret"
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# check if the directory $1/EIGEN exist # check if the directory $1/EIGEN exist
if [ -d "$1/EIGEN" ]; then if [ -d "$1/EIGEN" ]; then
echo "EIGEN already installed" echo "EIGEN is already installed"
exit 0 exit 0
fi fi
......
...@@ -3,14 +3,39 @@ ...@@ -3,14 +3,39 @@
# check if the directory $1/HDF5 exist # check if the directory $1/HDF5 exist
if [ -d "$1/HDF5" ]; then if [ -d "$1/HDF5" ]; then
echo "HDF5 already installed" echo "HDF5 is already installed"
exit 0 exit 0
fi fi
if [ ! -d "$1/ZLIB" ]; then
rm zlib1211.zip
rm -rf zlib-1.2.11
wget https://zlib.net/zlib1211.zip
if [ $? -ne 0 ]; then
echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m"
exit 1
fi
unzip zlib1211.zip
cd zlib-1.2.11
CC=mpicc ./configure --prefix=$1/ZLIB
make -j $2
if [ $? -eq 0 ]; then
make check install
else
echo -e "\033[91;5;1m ZLIB Installation FAILED \033[0m"
exit 1
fi
else
echo "ZLIB is already installed"
fi
wget http://ppmcore.mpi-cbg.de/upload/hdf5-1.8.16.tar.bz2 wget http://ppmcore.mpi-cbg.de/upload/hdf5-1.8.16.tar.bz2
tar -xf hdf5-1.8.16.tar.bz2 tar -xf hdf5-1.8.16.tar.bz2
cd hdf5-1.8.16 cd hdf5-1.8.16
CC=mpicc ./configure --enable-parallel --prefix=$1/HDF5 CC=mpicc ./configure --with-zlib=$1/ZLIB --enable-parallel --prefix=$1/HDF5
make -j $2 make -j $2
mkdir $1/HDF5 mkdir $1/HDF5
make install make install
#!/bin/bash #!/bin/bash
# check if the directory $1/MPI exist # check if the directory $1/MPI exist
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# check if the directory $1/METIS exist # check if the directory $1/METIS exist
if [ -d "$1/METIS" ]; then if [ -d "$1/METIS" ]; then
echo "METIS already installed" echo "METIS is already installed"
exit 0 exit 0
fi fi
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# check if the directory $1/OPENBLAS exist # check if the directory $1/OPENBLAS exist
if [ -d "$1/OPENBLAS" ]; then if [ -d "$1/OPENBLAS" ]; then
echo "OPENBLAS already installed" echo "OPENBLAS is already installed"
exit 0 exit 0
fi fi
......
...@@ -8,7 +8,7 @@ F77=$5 ...@@ -8,7 +8,7 @@ F77=$5
FC=$6 FC=$6
if [ -d "$1/PETSC" ]; then if [ -d "$1/PETSC" ]; then
echo "PETSC already installed" echo "PETSC is already installed"
exit 0 exit 0
fi fi
...@@ -45,7 +45,7 @@ configure_options_hypre="" ...@@ -45,7 +45,7 @@ configure_options_hypre=""
if [ -d "$1/PARMETIS" ]; then if [ -d "$1/PARMETIS" ]; then
configure_options="$configure_options --with-parmetis=yes --with-parmetis-dir=$1/PARMETIS/ " configure_options="$configure_options --with-parmetis=yes --with-parmetis-dir=$1/PARMETIS "
configure_options_superlu="-DTPL_PARMETIS_INCLUDE_DIRS=$1/PARMETIS/include;$1/METIS/include -DTPL_PARMETIS_LIBRARIES=$1/PARMETIS/lib/libparmetis.a;$1/METIS/lib/libmetis.so $configure_options_superlu" configure_options_superlu="-DTPL_PARMETIS_INCLUDE_DIRS=$1/PARMETIS/include;$1/METIS/include -DTPL_PARMETIS_LIBRARIES=$1/PARMETIS/lib/libparmetis.a;$1/METIS/lib/libmetis.so $configure_options_superlu"
fi fi
...@@ -53,11 +53,7 @@ if [ -d "$1/METIS" ]; then ...@@ -53,11 +53,7 @@ if [ -d "$1/METIS" ]; then
configure_options="$configure_options --with-metis=yes --with-metis-dir=$1/METIS " configure_options="$configure_options --with-metis=yes --with-metis-dir=$1/METIS "
fi fi
#if [ -d "$1/HDF5" ]; then if [ -d "$1/BOOST" ]; then
# configure_options="$configure_options --with-hdf5=yes --with-hdf5-dir=$1/HDF5 "
#fi
if [ -d "$1/BOOST" ]; then
configure_options="$configure_options --with-boost=yes --with-boost-dir=$1/BOOST "