Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_pdata
Commits
237fef5f
Commit
237fef5f
authored
Feb 04, 2016
by
incardon
Browse files
Fixing ubuntu installation
parent
6798c748
Changes
6
Hide whitespace changes
Inline
Side-by-side
install
View file @
237fef5f
...
...
@@ -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"
...
...
m4/ax_suitesparse.m4
View file @
237fef5f
...
...
@@ -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
script/discover_package_manager
View file @
237fef5f
...
...
@@ -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
...
...
script/install_SUITESPARSE.sh
View file @
237fef5f
...
...
@@ -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
...
...
script/pre_req
View file @
237fef5f
...
...
@@ -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
\0
33[92;1m SUCCESS
\0
33[0m"
fi
command
-v
mpirun
>
/dev/null 2>&1
if
[
$?
-ne
0
]
;
then
echo
-e
"No MPI"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment