Commit e4747ad7 authored by Rafael Laboissiere's avatar Rafael Laboissiere

New upstream version 1.0.6

parent 56229844
Name: sparsersb
Version: 1.0.5
Date: 2017-03-29
Version: 1.0.6
Date: 2018-06-19
Author: Michele Martone <michelemartone@users.sourceforge.net>
Maintainer: Michele Martone <michelemartone@users.sourceforge.net>
Title: Interface to the librsb package implementing the RSB sparse matrix format.
Description: Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations.
Depends: octave (>= 4.0.0)
Depends: octave (>= 4.4.0)
License: GPLv3+
Url: http://librsb.sourceforge.net/
Categories: Sparse Matrix Computations
......
Summary of important user-visible changes for releases of the sparsersb package
===============================================================================
sparsersb-1.0.6 Release Date: 2018-06-15
===============================================================================
** Intended to be used with the latest librsb-1.2.0.
** - fix of typo breaking builds (bug # #50764)
===============================================================================
sparsersb-1.0.5 Release Date: 2017-03-29
===============================================================================
** Intended to be used with the latest librsb-1.2.0.
......
......@@ -4,3 +4,4 @@ MKOCTFILE = @MKOCTFILE@ -v
SPARSERSB_CXXFLAGS = @SPARSERSB_CXXFLAGS@
SPARSERSB_LDFLAGS = @SPARSERSB_LDFLAGS@
SPARSERSB_CXX11= @SPARSERSB_CXX11@
OCTAVE_FUNC_DEFINES = @HAVE_OCTAVE_VALUE_ISCOMPLEX@
sinclude Makeconf
# Makeconf is created by the configure script.
# You can also not use it but set explicitly the following:
CXXFLAGS=$(SPARSERSB_CXXFLAGS)
CXXFLAGS=$(SPARSERSB_CXXFLAGS) $(OCTAVE_FUNC_DEFINES)
LFLAGS=$(shell $(MKOCTFILE) -p LFLAGS) $(SPARSERSB_LDFLAGS)
CXXFLAGS_CXX11=$(SPARSERSB_CXX11)
......
......@@ -621,6 +621,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
TARGETS
HAVE_OCTAVE_VALUE_ISCOMPLEX
EGREP
GREP
CXXCPP
......@@ -657,6 +658,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
......@@ -737,6 +739,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
......@@ -989,6 +992,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
......@@ -1126,7 +1138,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
......@@ -1279,6 +1291,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
......@@ -2900,11 +2913,7 @@ $as_echo "$as_me: Setting SPARSERSB_CXXFLAGS from $librsb_conf --I_opts..." >&6;
fi
fi
if test -x `which $OCTAVE-cli` ; then
OCTAVE_CLI="$OCTAVE-cli";
else
OCTAVE_CLI="$OCTAVE";
fi
OCTAVE_CLI="$OCTAVE --no-gui --no-window-system";
SPARSERSB_USE_64BIT_IDX=`$OCTAVE_CLI --no-line-editing -qf --eval 'printf ("%i", sizemax() > intmax ("int32"))'`
if test x"$SPARSERSB_USE_64BIT_IDX" = x"1" ; then
......@@ -3483,6 +3492,57 @@ if test "$have_rsb" != "yes" ; then
as_fn_error $? "$PACKAGE_NAME requires librsb library" "$LINENO" 5
fi
# check for octave functions
save_CXX="$CXX"
save_CXXFLAGS="$CXXFLAGS"
CXX=`${MKOCTFILE} -p CXX`
CXXFLAGS="$CXXFLAGS -I`$MKOCTFILE -p OCTINCLUDEDIR`"
# need to use interpreter->get_load_path in dev version of octave,
# prior to that methods of load_path were static
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_value function iscomplex" >&5
$as_echo_n "checking for octave_value function iscomplex... " >&6; }
if ${octave_value_cv_iscomplex+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <oct.h>
#include <octave.h>
int
main ()
{
octave_value().iscomplex();
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
octave_value_cv_iscomplex=yes
else
octave_value_cv_iscomplex=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave_value_cv_iscomplex" >&5
$as_echo "$octave_value_cv_iscomplex" >&6; }
if test "$octave_value_cv_iscomplex" = "yes" ; then
HAVE_OCTAVE_VALUE_ISCOMPLEX=-DHAVE_OCTAVE_VALUE_ISCOMPLEX
else
HAVE_OCTAVE_VALUE_ISCOMPLEX=
fi
CC=$save_CXX
CXXFLAGS=$save_CXXFLAGS
......@@ -4648,6 +4708,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}:
$PACKAGE_NAME is configured with:
......
......@@ -107,11 +107,7 @@ else
fi
fi
if test -x `which $OCTAVE-cli` ; then
OCTAVE_CLI="$OCTAVE-cli";
else
OCTAVE_CLI="$OCTAVE";
fi
OCTAVE_CLI="$OCTAVE --no-gui --no-window-system";
SPARSERSB_USE_64BIT_IDX=`$OCTAVE_CLI --no-line-editing -qf --eval 'printf ("%i", sizemax() > intmax ("int32"))'`
if [test x"$SPARSERSB_USE_64BIT_IDX" = x"1" ]; then
......@@ -158,6 +154,40 @@ if [ test "$have_rsb" != "yes" ]; then
AC_MSG_ERROR([$PACKAGE_NAME requires librsb library])
fi
# check for octave functions
save_CXX="$CXX"
save_CXXFLAGS="$CXXFLAGS"
CXX=`${MKOCTFILE} -p CXX`
CXXFLAGS="$CXXFLAGS -I`$MKOCTFILE -p OCTINCLUDEDIR`"
# need to use interpreter->get_load_path in dev version of octave,
# prior to that methods of load_path were static
AC_CACHE_CHECK(
[for octave_value function iscomplex],
[octave_value_cv_iscomplex],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
#include <oct.h>
#include <octave.h>
],
[
octave_value().iscomplex();
])],
[octave_value_cv_iscomplex=yes],
[octave_value_cv_iscomplex=no])
])
if test "$octave_value_cv_iscomplex" = "yes" ; then
HAVE_OCTAVE_VALUE_ISCOMPLEX=-DHAVE_OCTAVE_VALUE_ISCOMPLEX
else
HAVE_OCTAVE_VALUE_ISCOMPLEX=
fi
AC_SUBST(HAVE_OCTAVE_VALUE_ISCOMPLEX)
CC=$save_CXX
CXXFLAGS=$save_CXXFLAGS
AC_SUBST(OCTAVE)
AC_SUBST(TARGETS)
AC_SUBST(SPARSERSB_CXXFLAGS)
......@@ -167,6 +197,7 @@ AC_SUBST(SPARSERSB_LDFLAGS)
AC_CONFIG_FILES([Makeconf])
AC_OUTPUT
AC_MSG_NOTICE([
$PACKAGE_NAME is configured with:
......
This diff is collapsed.
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