Commit eb7c7628 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Actual state

parent 5b7b5367
......@@ -87,10 +87,11 @@ esac
# First, check SUITESPARSE_LIBS environment variable
if test "x$SUITESPARSE_LIBS" != x; then
save_LIBS="$LIBS"; LIBS="$SUITESPARSE_LIBS -lumfpack -lsuitesparseconfig -lm $RT_LIB"
save_LIBS="$LIBS"; LIBS="$SUITESPARSE_LIBS -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -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=""])
SUITESPARSE_LIBS="$SUITESPARSE_LIBS -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig"
], [SUITRSPARSE_LIBS=""])
AC_MSG_RESULT($ax_suitesparse_ok)
LIBS="$save_LIBS"
if test $ax_suitesparse_ok = no; then
......@@ -100,12 +101,18 @@ if test "x$SUITESPARSE_LIBS" != x; then
CFLAGS=$SUITESPARSE_INCLUDE
AC_CHECK_HEADER(umfpack.h,[],[SUITESPARSE_INCLUDE=""
ax_suitesparse_ok=no])
CFLAGS="$old_CFLAGS"
else
AC_CHECK_LIB(umfpack,umf_l_alloc,[SUITESPARSE_LIB="$SUITESPARSE_LIB -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig -lumfpack"],[SUITESPARSE_LIB=""])
AC_CHECK_LIB(umfpack,umf_l_alloc,[SUITESPARSE_LIBS="$SUITESPARSE_LIBS -lumfpack -lamd -lbtf -lcamd -lccolamd -lcholmod -lcolamd -lcxsparse -lklu -ldl -lrbio -lspqr -lsuitesparseconfig"],[
SUITESPARSE_LIBS=""
ax_suitesparse_ok=no
])
old_CFLAGS="$CFLAGS"
AC_CHECK_HEADER(umfpack.h,[],[SUITESPARSE_INCLUDE=""
ax_suitesparse_ok=no])
CFLAGS="$old_CFLAGS"
fi
......
openfpm_data @ 8168a90c
Subproject commit 726d347a31701409657d5bf4b45336ce47eba73e
Subproject commit 8168a90ccd39ef504ba8699d6d0ed9aed46a3f31
openfpm_io @ 52333293
Subproject commit cb37b2bc9e40a02de36ed664dc0bfe43f6257f37
Subproject commit 523332938de0a47a1ca1d652a8e171cf9b8a6f5b
openfpm_numerics @ 759fb600
Subproject commit 1d68c3aa9ee4e7369d80320f7bf97c7dd9d6890d
Subproject commit 759fb600260b785c9d282c10a9f1d6596767ec78
openfpm_vcluster @ be8c849c
Subproject commit 6e360fcbf118277ca59b2709eb2ffa0661c677a8
Subproject commit be8c849c9189fe90e1533125f2544258671d0916
......@@ -131,7 +131,11 @@ class grid_dist_iterator_sub
grid_dist_iterator_sub(const grid_dist_iterator_sub<dim,device_grid> & tmp)
:g_c(tmp.g_c),gList(tmp.gList),gdb_ext(gdb_ext),start(tmp.start),stop(tmp.stop)
{
a_it.reinitialize(tmp.a_it);
// get the next grid iterator
if (g_c < gList.size())
{
a_it.reinitialize(tmp.a_it);
}
}
/*! \brief Constructor of the distributed grid iterator
......
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