[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.4-1
Rafael Laboissiere
rafael at laboissiere.net
Wed May 8 18:01:07 UTC 2013
The following commit has been merged in the master branch:
commit bac4e27af0c144b4ae97ac8e2885f1fb9ecff9c3
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Tue Sep 25 17:37:02 2012 +0000
debian/patches/fix-sparse-unit-testing.patch: Add patch
diff --git a/debian/patches/fix-sparse-unit-testing.patch b/debian/patches/fix-sparse-unit-testing.patch
new file mode 100644
index 0000000..4e02246
--- /dev/null
+++ b/debian/patches/fix-sparse-unit-testing.patch
@@ -0,0 +1,171 @@
+Description: Fix unit testing in the Sparse.cc file
+ This patch is a combination of two commits taken from the upstream Mercurial
+ repository. Here are their descriptions:
+ .
+ # HG changeset patch
+ # User David Bateman <dbateman at free.fr>
+ # Date 1337385561 -7200
+ # Node ID f2e72944847b9ec7cec586faa4c72ea91eb53881
+ # Parent 997e05334f71269f16017ceb06a52cf33feced18
+ Ensure sparse constructors have valid ridx and data indices even if they are
+ zero matrices (bug #36104)
+ .
+ # HG changeset patch
+ # User John W. Eaton <jwe at octave.org>
+ # Date 1340304125 14400
+ # Node ID 4663cc835c65873fe12b599bcab11ba4a8f5fb87
+ # Parent f2e72944847b9ec7cec586faa4c72ea91eb53881
+ Special-case removing rows or columns from empty sparse matrices
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Origin: upstream,
+ http://hg.savannah.gnu.org/hgweb/octave/rev/f2e72944847b
+ http://hg.savannah.gnu.org/hgweb/octave/rev/4663cc835c65
+Forwarded: not-needed
+Last-Update: 2012-09-26
+
+--- octave-3.6.3.orig/liboctave/Sparse.cc
++++ octave-3.6.3/liboctave/Sparse.cc
+@@ -235,7 +235,7 @@ Sparse<T>::Sparse (const dim_vector& dv)
+ (*current_liboctave_error_handler)
+ ("Sparse::Sparse (const dim_vector&): dimension mismatch");
+ else
+- rep = new typename Sparse<T>::SparseRep (dv(0), dv(1));
++ rep = new typename Sparse<T>::SparseRep (dv(0), dv(1), 0);
+ }
+
+ template <class T>
+@@ -301,11 +301,10 @@ Sparse<T>::Sparse (const Array<T>& a, co
+ (*current_liboctave_error_handler)
+ ("sparse: column index %d out of bound %d", r.extent (nc), nc);
+
+- rep = new SparseRep (nr, nc);
++ rep = new typename Sparse<T>::SparseRep (nr, nc, (nzm > 0 ? nzm : 0));
+
+ dimensions = dim_vector (nr, nc);
+
+-
+ octave_idx_type n = a.numel (), rl = r.length (nr), cl = c.length (nc);
+ bool a_scalar = n == 1;
+ if (a_scalar)
+@@ -324,6 +323,7 @@ Sparse<T>::Sparse (const Array<T>& a, co
+ if (n == 1 && a(0) != T ())
+ {
+ change_capacity (nzm > 1 ? nzm : 1);
++ xcidx(0) = 0;
+ xridx(0) = r(0);
+ xdata(0) = a(0);
+ for (octave_idx_type j = 0; j < nc; j++)
+@@ -352,6 +352,7 @@ Sparse<T>::Sparse (const Array<T>& a, co
+ new_nz += rd[i-1] != rd[i];
+ // Allocate result.
+ change_capacity (nzm > new_nz ? nzm : new_nz);
++ xcidx (0) = 0;
+ xcidx (1) = new_nz;
+ octave_idx_type *rri = ridx ();
+ T *rrd = data ();
+@@ -494,6 +495,7 @@ Sparse<T>::Sparse (const Array<T>& a, co
+ new_nz += rd[i-1] != rd[i];
+ // Allocate result.
+ change_capacity (nzm > new_nz ? nzm : new_nz);
++ xcidx(0) = 0;
+ xcidx(1) = new_nz;
+ octave_idx_type *rri = ridx ();
+ T *rrd = data ();
+@@ -1238,16 +1240,31 @@ Sparse<T>::delete_elements (const idx_ve
+ gripe_del_index_out_of_range (false, idx_j.extent (nc), nc);
+ else if (idx_j.is_cont_range (nc, lb, ub))
+ {
+- const Sparse<T> tmp = *this;
+- octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), new_nz = nz - (ubi - lbi);
+- *this = Sparse<T> (nr, nc - (ub - lb), new_nz);
+- copy_or_memcpy (lbi, tmp.data (), data ());
+- copy_or_memcpy (lbi, tmp.ridx (), ridx ());
+- copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi);
+- copy_or_memcpy (nz - ubi, tmp.ridx () + ubi, xridx () + lbi);
+- copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1);
+- mx_inline_sub (nc - ub, xcidx () + lb + 1,
+- tmp.cidx () + ub + 1, ubi - lbi);
++ if (lb == 0 && ub == nc)
++ {
++ // Delete all rows and columns.
++ *this = Sparse<T> (nr, 0);
++ }
++ else if (nz == 0)
++ {
++ // No elements to preserve; adjust dimensions.
++ *this = Sparse<T> (nr, nc - (ub - lb));
++ }
++ else
++ {
++ const Sparse<T> tmp = *this;
++ octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub),
++ new_nz = nz - (ubi - lbi);
++
++ *this = Sparse<T> (nr, nc - (ub - lb), new_nz);
++ copy_or_memcpy (lbi, tmp.data (), data ());
++ copy_or_memcpy (lbi, tmp.ridx (), ridx ());
++ copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi);
++ copy_or_memcpy (nz - ubi, tmp.ridx () + ubi, xridx () + lbi);
++ copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1);
++ mx_inline_sub (nc - ub, xcidx () + lb + 1,
++ tmp.cidx () + ub + 1, ubi - lbi);
++ }
+ }
+ else
+ *this = index (idx_i, idx_j.complement (nc));
+@@ -1260,24 +1277,40 @@ Sparse<T>::delete_elements (const idx_ve
+ gripe_del_index_out_of_range (false, idx_i.extent (nr), nr);
+ else if (idx_i.is_cont_range (nr, lb, ub))
+ {
+- // This is more memory-efficient than the approach below.
+- const Sparse<T> tmpl = index (idx_vector (0, lb), idx_j);
+- const Sparse<T> tmpu = index (idx_vector (ub, nr), idx_j);
+- *this = Sparse<T> (nr - (ub - lb), nc, tmpl.nnz () + tmpu.nnz ());
+- for (octave_idx_type j = 0, k = 0; j < nc; j++)
++ if (lb == 0 && ub == nr)
+ {
+- for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); i++)
+- {
+- xdata(k) = tmpl.data(i);
+- xridx(k++) = tmpl.ridx(i);
+- }
+- for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); i++)
++ // Delete all rows and columns.
++ *this = Sparse<T> (0, nc);
++ }
++ else if (nz == 0)
++ {
++ // No elements to preserve; adjust dimensions.
++ *this = Sparse<T> (nr - (ub - lb), nc);
++ }
++ else
++ {
++ // This is more memory-efficient than the approach below.
++ const Sparse<T> tmpl = index (idx_vector (0, lb), idx_j);
++ const Sparse<T> tmpu = index (idx_vector (ub, nr), idx_j);
++ *this = Sparse<T> (nr - (ub - lb), nc,
++ tmpl.nnz () + tmpu.nnz ());
++ for (octave_idx_type j = 0, k = 0; j < nc; j++)
+ {
+- xdata(k) = tmpu.data(i);
+- xridx(k++) = tmpu.ridx(i) + lb;
+- }
++ for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1);
++ i++)
++ {
++ xdata(k) = tmpl.data(i);
++ xridx(k++) = tmpl.ridx(i);
++ }
++ for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1);
++ i++)
++ {
++ xdata(k) = tmpu.data(i);
++ xridx(k++) = tmpu.ridx(i) + lb;
++ }
+
+- xcidx(j+1) = k;
++ xcidx(j+1) = k;
++ }
+ }
+ }
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 5b50072..aa42290 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ use_system_gl2ps
drop_version_from_mkoctfile_function_call
mkoctfile-mpi.diff
rcond.patch
+fix-sparse-unit-testing.patch
--
Debian packaging for octave
More information about the Pkg-octave-commit
mailing list