Commit 237fef5f authored by incardon's avatar incardon

Fixing ubuntu installation

parent 6798c748
......@@ -185,11 +185,6 @@ else
elif [ $conf_err -eq 205 ]; then
## First we install openblas, we ignore default lapack
## this SuiteSparse is programmed to use libopenblas
echo "Lapack not found try to install"
if [ $LAPACK_installed -eq 1 ]; then
echo "Error the installation of LAPACK failed"
exit 1
fi
./script/install_OPENBLAS.sh $i_dir $compiler_opt
LAPACK_installed=1
blas_options="--with-blas=-L$i_dir/OPENBLAS/lib/ -lopenblas"
......
......@@ -87,7 +87,7 @@ esac
# First, check SUITESPARSE_LIBS environment variable
if test "x$SUITESPARSE_LIBS" != x; then
save_LIBS="$LIBS"; LIBS="$SUITESPARSE_LIBS -lumfpack -lm -lsuitesparseconfig $RT_LIB"
save_LIBS="$LIBS"; LIBS="$SUITESPARSE_LIBS -lumfpack -lsuitesparseconfig -lm $RT_LIB"
AC_MSG_CHECKING([for umf_l_malloc])
AC_TRY_LINK_FUNC(umf_l_malloc, [ax_suitesparse_ok=yes
SUITESPARSE_LIB="$SUITESPARSE_LIBS -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig -lumfpack"], [SUITRSPARSE_LIBS=""])
......
openfpm_numerics @ 1d68c3aa
Subproject commit 624561273e0e2750890cb8c0b87b0d1119ffb956
Subproject commit 1d68c3aa9ee4e7369d80320f7bf97c7dd9d6890d
......@@ -42,7 +42,7 @@ function discover_package_manager() {
fi
command -v apt-get >/dev/null
if [ $? -eq 0 ]; then
discover_package_manager_ret="sudo apt-get"
discover_package_manager_ret="apt-get"
return
fi
command -v zypper >/dev/null
......
......@@ -22,7 +22,7 @@ cd SuiteSparse
# configuration
if [ x"$platform"==x"osx" ]; then
if [ x"$platform" = x"osx" ]; then
# installation for OSX
sed -i "" -e "s|INSTALL_LIB = \/usr\/local\/lib|INSTALL_LIB = "$1"\/SUITESPARSE\/lib|" SuiteSparse_config/SuiteSparse_config_Mac.mk
......
......@@ -12,9 +12,11 @@ source script/solve_wget
source script/solve_automake
source script/solve_brew
source script/solve_libtool
source script/solve_gfortran
source script/detect_gcc
source script/detect_osx
source script/show_solutions
source script/detect_fortran
discover_os
discover_package_manager $platform
......@@ -197,6 +199,20 @@ elif [ $dgc_ret -eq 2 ]; then
fi
fi
#### Detection gfortran
detect_fortran gfortran
if [ $dgc_ret -eq 0 ]; then
solve_gfortran $platform
detect_fortran $compiler_fortran
if [ $dgc_ret -eq 0 ]; then
exit 1
fi
else
echo -e "gfortran \033[92;1m SUCCESS \033[0m"
fi
command -v mpirun >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo -e "No MPI"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment