Commit 96153631 authored by Rafael Laboissiere's avatar Rafael Laboissiere

New upstream version 1.0.2

parent 4692ae65
Name: sparsersb
Version: 1.0.1
Date: 2016-08-01
Version: 1.0.2
Date: 2016-10-03
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.
......
Summary of important user-visible changes for releases of the sparsersb package
===============================================================================
sparsersb-1.0.1 Release Date: 2016-08-05
sparsersb-1.0.2 Release Date: 2016-10-03
===============================================================================
** Thought to be used with the latest librsb-1.2.0.
** - builds even if octave built with --enable-64, but limited to matrices
** which would fit when using a normal setup.
===============================================================================
sparsersb-1.0.1 Release Date: 2016-08-01
===============================================================================
** Thought to be used with the latest librsb-1.2.0.
** Changed sparsersb's `configure --help':
......
......@@ -8,13 +8,13 @@ Author: Michele MARTONE
Build / use instructions (using pkg):
To use the configure auto-detected librsb from within Octave:
> pkg -local -verbose install sparsersb-1.0.1.tar.gz
> pkg -local -verbose install sparsersb-1.0.2.tar.gz
> pkg load sparsersb
> help sparsersb
Alternatively:
tar czf sparsersb-1.0.1.tar.gz
cd sparsersb-1.0.1/src
tar czf sparsersb-1.0.2.tar.gz
cd sparsersb-1.0.2/src
./configure
make
make check
......@@ -26,7 +26,7 @@ and use it; e.g.:
or setting:
export LIBRSB_TARBALL=$HOME/librsb-1.2.0.tar.gz
before entering in Octave and building with pkg:
> pkg -local -verbose install sparsersb-1.0.1.tar.gz
> pkg -local -verbose install sparsersb-1.0.2.tar.gz
On many systems, you will have to build librsb with the PIC (-fPIC on GCC)
option or you will get link time problems.
......
......@@ -10,33 +10,34 @@
-- Loadable Function: V = sparsersb (S, QS)
-- Loadable Function: sparsersb (A,"save",MTXFILENAME)
-- Loadable Function: [S, NROWS, NCOLS, NNZ, REPINFO, FIELD, SYMMETRY]
= sparsersb (MTXFILENAME, MTXTYPESTRING)
= sparsersb (MTXFILENAME, MTXTYPESTRING)
-- Loadable Function: sparsersb (S,"render", FILENAME[, RWIDTH,
RHEIGHT])
-- Loadable Function: [O =] sparsersb (S,"autotune"[, TRANSA, NRHS,
MAXR, TMAX, TN, SF])
Create or manipulate sparse matrices using the RSB format provided
by librsb, as similarly as possible to `sparse'.
by librsb, as similarly as possible to 'sparse'.
If A is a full matrix, convert it to a sparse matrix
representation, removing all zero values in the process.
Given the integer index vectors I and J, and a 1-by-`nnz' vector
of real or complex values SV, construct the sparse matrix
`S(I(K),J(K)) = SV(K)' with overall dimensions M and N.
Given the integer index vectors I and J, and a 1-by-'nnz' vector of
real or complex values SV, construct the sparse matrix
'S(I(K),J(K)) = SV(K)' with overall dimensions M and N.
The argument `NZMAX' is ignored but accepted for compatibility
with MATLAB and `sparsersb'.
The argument 'NZMAX' is ignored but accepted for compatibility with
MATLAB and 'sparsersb'.
If M or N are not specified their values are derived from the
maximum index in the vectors I and J as given by `M = max (I)', `N
maximum index in the vectors I and J as given by 'M = max (I)', 'N
= max (J)'.
Can load a matrix from a Matrix Market matrix file named
MTXFILENAME. The optional argument MTXTYPESTRING can specify
either real ("D") or complex ("Z") type. Default is real. In the
MTXFILENAME. The optional argument MTXTYPESTRING can specify
either real ("D") or complex ("Z") type. Default is real. In the
case MTXFILENAME is "?", a string listing the available numerical
types with BLAS-style characters will be returned. If the file
types with BLAS-style characters will be returned. If the file
turns out to contain a Matrix Market dense vector, this will be
loaded.
......@@ -56,54 +57,56 @@
two values are specified for the same I, J indices, only the last
value will be used.
`sparsersb (M, N)' will create an empty MxN sparse matrix and is
equivalent to `sparsersb ([], [], [], M, N)'.
'sparsersb (M, N)' will create an empty MxN sparse matrix and is
equivalent to 'sparsersb ([], [], [], M, N)'.
If M or N are not specified, then `M = max (I)', `N = max (J)'.
If M or N are not specified, then 'M = max (I)', 'N = max (J)'.
If OPN is a string representing a valid librsb option name and OPV
is a string representing a valid librsb option value, these will
be passed to the `rsb_lib_set_opt_str()' function.
is a string representing a valid librsb option value, these will be
passed to the 'rsb_lib_set_opt_str()' function.
If MIF is a string specifying a valid librsb matrix info string
(valid for librsb's `rsb_mtx_get_info_from_string()'), then the
corresponding value will be returned for matrix `A', in string
`V'. If MIF is the an empty string (""), matrix structure
information will be returned.
(valid for librsb's 'rsb_mtx_get_info_from_string()'), then the
corresponding value will be returned for matrix 'A', in string 'V'.
If MIF is the an empty string (""), matrix structure information
will be returned.
If A is a sparsersb matrix and QS is a string, QS will be
interpreted as a query string about matrix A. String `V' will be
returned. See librsb's `rsb_mtx_get_info_str()'. *Note*: this
interpreted as a query string about matrix A. String 'V' will be
returned. See librsb's 'rsb_mtx_get_info_str()'. *Note*: this
feature is still incomplete, and whatever the value of QS, a
general information string will be returned.
If S is a sparsersb matrix and the "render" keyword is specified,
and FILENAME is a string, A will be rendered as an Encapsulated
Postscript file FILENAME. Optionally, width and height can be
specified in `RWIDTH, RHEIGHT'. Defaults are 512.
If S is a sparsersb matrix and the "autotune" keyword is
specified, autotuning of the matrix will take place, with SpMV and
autotuning parameters. After the "autotune" string, the remaining
parameters are optional. Parameter TRANSA specifies whether to
tune for untransposed ("N") or transposed ("T"); NRHS the number
of right hand sides; MAXR the number of tuning rounds; TMAX the
threads to use. If giving an output argument O, that will be
assigned to the autotuned matrix, and the input one A will remain
unchanged. See librsb documentation for `rsb_tune_spmm' to learn
more.
Please note that on `sparsersb' type variables are available most,
but not all of the operators available for `full' or `sparse'
typed variables.
See also: full, sparse
Postscript file FILENAME. Optionally, width and height can be
specified in 'RWIDTH, RHEIGHT'. Defaults are 512.
If S is a sparsersb matrix and the "autotune" keyword is specified,
autotuning of the matrix will take place, with SpMV and autotuning
parameters. After the "autotune" string, the remaining parameters
are optional. Parameter TRANSA specifies whether to tune for
untransposed ("N") or transposed ("T"); NRHS the number of right
hand sides; MAXR the number of tuning rounds; TMAX the threads to
use. If giving an output argument O, that will be assigned to the
autotuned matrix, and the input one A will remain unchanged. See
librsb documentation for 'rsb_tune_spmm' to learn more.
Long (64 bit) index support is partial: if Octave has been
configured for 64 bit indices, sparsersb will correctly handle and
convert matrices/indices that would fit in a 32 bit indices setup,
failing on 'larger' ones.
Please note that on 'sparsersb' type variables are available most,
but not all of the operators available for 'full' or 'sparse' typed
variables.
See also: full, sparse.
Additional help for built-in functions and operators is
available in the on-line version of the manual. Use the command
`doc <topic>' to search the manual index.
available in the online version of the manual. Use the command
'doc <topic>' to search the manual index.
Help and information about Octave is also available on the WWW
at http://www.octave.org and via the help@octave.org
......
OCTAVE = @OCTAVE@
CXXFLAGS = @CXXFLAGS@
MKOCTFILE = @MKOCTFILE@ -v
SPARSERSB_CXXFLAGS = @SPARSERSB_CXXFLAGS@
......
......@@ -47,32 +47,37 @@ clean:
# tar czf $(PACKAGE_NAME).tgz $(PACKAGE_NAME)
# tar tzf $(PACKAGE_NAME).tgz
# This is expected to work on author's machine.
SPARSERSB_VERNAME=sparsersb-1.0.1
SPARSERSB_ARCHIVES=~/src/sparsersb-archives
dist:
sh autogen.sh
rm -f $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar
hg archive -t tar $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar --exclude '*.hgignore' -X ".hg*"
cd ../.. && tar rf $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar --add-file $(SPARSERSB_VERNAME)/src/configure
cd ../.. && tar f $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar \
--delete $(SPARSERSB_VERNAME)/.hg_archival.txt --delete $(SPARSERSB_VERNAME)/.hgtags --delete $(SPARSERSB_VERNAME)/.hgignore
gzip -f $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar
tar tvzf $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar.gz
cd && octave --no-gui --eval 'pkg -local -verbose -verbose install $(SPARSERSB_VERNAME).tar.gz'
cd && octave --no-gui --eval 'pkg load generate_html; generate_package_html ("sparsersb", "sparsersb-html", "octave-forge") ' && tar czf $(SPARSERSB_ARCHIVES)/sparsersb-html.tar.gz sparsersb-html
gpg -sbav -u EF1258B8 $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar.gz
gpg -sbav -u EF1258B8 $(SPARSERSB_ARCHIVES)/sparsersb-html.tar.gz
md5sum $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar.gz > $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar.gz.md5
md5sum $(SPARSERSB_ARCHIVES)/sparsersb-html.tar.gz > $(SPARSERSB_ARCHIVES)/sparsersb-html.tar.gz.md5
ls -l $(SPARSERSB_ARCHIVES)/$(SPARSERSB_VERNAME).tar.gz* $(SPARSERSB_ARCHIVES)/sparsersb-html.tar.gz*
SPARSERSB=sparsersb-1.0.2
ARCHIVE=$(HOME)/src/sparsersb-archives
GPGSIGNCMD=gpg -sbav -u 1DBB555AEA359B8AAF0C6B88E0E669C8EF1258B8
# This is expected to work on author's machine.
commit:
cd .. ; hg commit -u michelemartone
cd .. ; hg push
dist: tarball html-doc
tarball:
rm -f $(ARCHIVE)/$(SPARSERSB).tar
hg archive -t tar $(ARCHIVE)/$(SPARSERSB).tar --exclude '*.hgignore' -X ".hg*"
rm -f ../../$(SPARSERSB)
ln -s `pwd`/.. ../../$(SPARSERSB)
cd ../.. && tar rf $(ARCHIVE)/$(SPARSERSB).tar --add-file $(SPARSERSB)/src/configure
cd ../.. && tar f $(ARCHIVE)/$(SPARSERSB).tar \
--delete $(SPARSERSB)/.hg_archival.txt --delete $(SPARSERSB)/.hgtags --delete $(SPARSERSB)/.hgignore
#tar tvf $(SPARSERSB).tar
gzip -f $(ARCHIVE)/$(SPARSERSB).tar
tar tvzf $(ARCHIVE)/$(SPARSERSB).tar.gz
$(GPGSIGNCMD) $(ARCHIVE)/$(SPARSERSB).tar.gz
gpg --verify $(ARCHIVE)/$(SPARSERSB).tar.gz.asc
html-doc:
rm -fR ./octfiles-tmp ./sparsersb-html $(SPARSERSB)
mkdir -p ./octfiles-tmp
#tar xvzf $(ARCHIVE)/$(SPARSERSB).tar.gz
$(OCTAVE) --norc --eval 'pkg prefix ./octfiles-tmp ; echo on; diary sparsersb-diary-install.log; more off; pkg install -verbose '$(ARCHIVE)/$(SPARSERSB).tar.gz'; echo off; pkg load generate_html; generate_package_html ("sparsersb", "sparsersb-html", "octave-forge")'
tar czf $(ARCHIVE)/sparsersb-html.tar.gz sparsersb-html
$(GPGSIGNCMD) $(ARCHIVE)/sparsersb-html.tar.gz
ls -l $(ARCHIVE)/sparsersb-html.tar.gz $(ARCHIVE)/$(SPARSERSB).tar.gz
md5sum $(ARCHIVE)/sparsersb-html.tar.gz $(ARCHIVE)/$(SPARSERSB).tar.gz
cd $(ARCHIVE)/
doc: $(SPARSERSB_OCT)
$(OCTAVE) -q --eval 'help sparsersb' | grep -v 'is a function from the' > ../doc/sparsersb.txt
#
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for octave sparsersb package 1.0.1.
# Generated by GNU Autoconf 2.69 for octave sparsersb package 1.0.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='octave sparsersb package'
PACKAGE_TARNAME='octave-sparsersb-package'
PACKAGE_VERSION='1.0.1'
PACKAGE_STRING='octave sparsersb package 1.0.1'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='octave sparsersb package 1.0.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures octave sparsersb package 1.0.1 to adapt to many kinds of systems.
\`configure' configures octave sparsersb package 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1301,7 +1301,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of octave sparsersb package 1.0.1:";;
short | recursive ) echo "Configuration of octave sparsersb package 1.0.2:";;
esac
cat <<\_ACEOF
......@@ -1398,7 +1398,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
octave sparsersb package configure 1.0.1
octave sparsersb package configure 1.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1696,7 +1696,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by octave sparsersb package $as_me 1.0.1, which was
It was created by octave sparsersb package $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2900,6 +2900,19 @@ $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
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
{ $as_echo "$as_me:${as_lineno-$LINENO}: Adding -D RSBOI_DETECTED_LONG_IDX to SPARSERSB_CXXFLAGS ..." >&5
$as_echo "$as_me: Adding -D RSBOI_DETECTED_LONG_IDX to SPARSERSB_CXXFLAGS ..." >&6;}
SPARSERSB_CXXFLAGS="$SPARSERSB_CXXFLAGS -D RSBOI_DETECTED_LONG_IDX=1"
fi
if test x"$SPARSERSB_LDFLAGS" != "x" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using user set SPARSERSB_LDFLAGS..." >&5
$as_echo "$as_me: Using user set SPARSERSB_LDFLAGS..." >&6;}
......@@ -4021,7 +4034,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by octave sparsersb package $as_me 1.0.1, which was
This file was extended by octave sparsersb package $as_me 1.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -4074,7 +4087,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
octave sparsersb package config.status 1.0.1
octave sparsersb package config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67])
AC_INIT([octave sparsersb package], [1.0.1])
AC_INIT([octave sparsersb package], [1.0.2])
dnl AC_CONFIG_HEADERS([config.h])
# Checks for programs.
......@@ -107,6 +107,18 @@ else
fi
fi
if test -x `which $OCTAVE-cli` ; then
OCTAVE_CLI="$OCTAVE-cli";
else
OCTAVE_CLI="$OCTAVE";
fi
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
AC_MSG_NOTICE([Adding -D RSBOI_DETECTED_LONG_IDX to SPARSERSB_CXXFLAGS ...])
SPARSERSB_CXXFLAGS="$SPARSERSB_CXXFLAGS -D RSBOI_DETECTED_LONG_IDX=1"
fi
if [test x"$SPARSERSB_LDFLAGS" != "x" ]; then
AC_MSG_NOTICE([Using user set SPARSERSB_LDFLAGS...])
else
......
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