[Python-modules-commits] r23413 - in packages/scipy/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, January 27, 2013 @ 16:54:00
  Author: jtaylor-guest
Revision: 23413

add patch to fix uninitialized uses in f2py linalg code

Added:
  packages/scipy/trunk/debian/patches/fix-f2py-dependencies.patch
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/patches/series

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2013-01-27 16:53:54 UTC (rev 23412)
+++ packages/scipy/trunk/debian/changelog	2013-01-27 16:54:00 UTC (rev 23413)
@@ -9,12 +9,13 @@
       - kolmogorov.diff,
       - up_minpack_ints.diff
       - kde.diff
-    - new patches:
+    - new patches for python3.3 compatibility and test fixing:
       - BUG-remove-inline-statement-rejected-by-cython.patch
       - BUG-fix-dependency-on-dict-ordering-in-test.patch
       - fix-test_basic.py-cephes_vs_amos_mass_te.patch
       - python3.3-incdir.diff
       - fix-dbg-crash.patch
+      - fix-f2py-dependencies.patch
   * add autopkgtests
   * run fast tests during build
   * update debian/copyright to dep5

Added: packages/scipy/trunk/debian/patches/fix-f2py-dependencies.patch
===================================================================
--- packages/scipy/trunk/debian/patches/fix-f2py-dependencies.patch	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/fix-f2py-dependencies.patch	2013-01-27 16:54:00 UTC (rev 23413)
@@ -0,0 +1,104 @@
+Description: add dependencies to variables
+ fixes unintialized uses due to random dict ordering in python3.3
+Origin: https://github.com/scipy/scipy/pull/404
+Author: Ralf Gommers <ralf.gommers at googlemail.com>
+Date:   Fri Jan 25 12:36:09 2013 -0800
+
+--- a/scipy/linalg/flapack.pyf.src
++++ b/scipy/linalg/flapack.pyf.src
+@@ -1470,7 +1470,7 @@ subroutine <prefix2>sbevx(ab,ldab,comput
+   !*          If JOBZ = 'V', the N-by-N orthogonal matrix used in the
+   !*                         reduction to tridiagonal form.
+   !*          If JOBZ = 'N', the array Q is not referenced.
+-  integer intent(hide),depend(n) :: ldq=(compute_v?n:1)
++  integer intent(hide),depend(n,compute_v) :: ldq=(compute_v?n:1)
+   <ftype2> dimension(ldq,ldq),intent(hide),depend(ldq) :: q
+ 
+ 
+@@ -1495,8 +1495,8 @@ subroutine <prefix2>sbevx(ab,ldab,comput
+ 
+   <ftype2> dimension(n),intent(out),depend(n) :: w
+ 
+-  <ftype2> dimension(ldz,mmax),intent(out) :: z
+-  integer intent(hide),depend(n) :: ldz=(compute_v?n:1)
++  <ftype2> dimension(ldz,mmax),depend(ldz,mmax),intent(out) :: z
++  integer intent(hide),depend(n,compute_v) :: ldz=(compute_v?n:1)
+ 
+   ! We use the mmax parameter to fix the size of z
+   ! (only if eigenvalues are requested)
+@@ -1507,12 +1507,12 @@ subroutine <prefix2>sbevx(ab,ldab,comput
+   ! number of eigenvalues in the interval in advance.
+   ! As default we use the maximum value
+   ! but the user should use an appropriate mmax.
+-  integer intent(in),depend(n) :: mmax=(compute_v?(range==2?(iu-il+1):n):1)
++  integer intent(in),depend(n,iu,il,compute_v,range) :: mmax=(compute_v?(range==2?(iu-il+1):n):1)
+   integer intent(out) :: m
+ 
+-  <ftype2> dimension(7*n),intent(hide) :: work
+-  integer dimension(5*n),intent(hide) :: iwork
+-  integer dimension((compute_v?n:1)),intent(out) :: ifail
++  <ftype2> dimension(7*n),depend(n),intent(hide) :: work
++  integer dimension(5*n),depend(n),intent(hide) :: iwork
++  integer dimension((compute_v?n:1)),depend(n,compute_v),intent(out) :: ifail
+   integer intent(out):: info
+ end subroutine <prefix2>sbevx
+ 
+@@ -1590,7 +1590,7 @@ subroutine <prefix2c>hbevx(ab,ldab,compu
+   !*          If JOBZ = 'V', the N-by-N orthogonal matrix used in the
+   !*                         reduction to tridiagonal form.
+   !*          If JOBZ = 'N', the array Q is not referenced.
+-  integer intent(hide),depend(n) :: ldq=(compute_v?n:1)
++  integer intent(hide),depend(n,compute_v) :: ldq=(compute_v?n:1)
+   <ftype2c> dimension(ldq,ldq),intent(hide),depend(ldq) :: q
+ 
+ 
+@@ -1615,8 +1615,8 @@ subroutine <prefix2c>hbevx(ab,ldab,compu
+ 
+   <ftype2> dimension(n),intent(out),depend(n) :: w
+ 
+-  <ftype2c> dimension(ldz,mmax),intent(out) :: z
+-  integer intent(hide),depend(n) :: ldz=(compute_v?n:1)
++  <ftype2c> dimension(ldz,mmax),depend(ldz,mmax),intent(out) :: z
++  integer intent(hide),depend(n,compute_v) :: ldz=(compute_v?n:1)
+ 
+   ! We use the mmax parameter to fix the size of z
+   ! (only if eigenvalues are requested)
+@@ -1627,13 +1627,13 @@ subroutine <prefix2c>hbevx(ab,ldab,compu
+   ! number of eigenvalues in the interval in advance.
+   ! As default we use the maximum value
+   ! but the user should use an appropriate mmax.
+-  integer intent(in),depend(n) :: mmax=(compute_v?(range==2?(iu-il+1):n):1)
++  integer intent(in),depend(n,iu,il,compute_v,range) :: mmax=(compute_v?(range==2?(iu-il+1):n):1)
+   integer intent(out) :: m
+ 
+-  <ftype2c> dimension(n),intent(hide) :: work
+-  <ftype2> dimension(7*n),intent(hide) :: rwork
+-  integer dimension(5*n),intent(hide) :: iwork
+-  integer dimension((compute_v?n:1)),intent(out) :: ifail
++  <ftype2c> dimension(n),depend(n),intent(hide) :: work
++  <ftype2> dimension(7*n),depend(n),intent(hide) :: rwork
++  integer dimension(5*n),depend(n),intent(hide) :: iwork
++  integer dimension((compute_v?n:1)),depend(n,compute_v),intent(out) :: ifail
+   integer intent(out):: info
+ end subroutine <prefix2c>hbevx
+ 
+--- a/scipy/sparse/linalg/eigen/arpack/arpack.pyf.src
++++ b/scipy/sparse/linalg/eigen/arpack/arpack.pyf.src
+@@ -29,7 +29,7 @@ python module _arpack ! in
+             character :: howmny
+             logical dimension(ncv) :: select
+             <_rd> dimension(nev),intent(out),depend(nev) :: d
+-            <_rd> dimension(n,nev),intent(out),depend(nev) :: z
++            <_rd> dimension(n,nev),intent(out),depend(n,nev) :: z
+             integer optional,check(shape(z,0)==ldz),depend(z) :: ldz=shape(z,0)
+             <_rd> :: sigma
+             character :: bmat
+@@ -121,7 +121,7 @@ python module _arpack ! in
+             character :: howmny
+             logical dimension(ncv) :: select
+             <_cd> dimension(nev),depend(nev),intent(out) :: d
+-            <_cd> dimension(n,nev), depend(nev),intent(out) :: z
++            <_cd> dimension(n,nev), depend(n,nev),intent(out) :: z
+             integer optional,check(shape(z,0)==ldz),depend(z) :: ldz=shape(z,0)
+             <_cd> :: sigma
+             <_cd> dimension(3 * ncv),depend(ncv) :: workev

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2013-01-27 16:53:54 UTC (rev 23412)
+++ packages/scipy/trunk/debian/patches/series	2013-01-27 16:54:00 UTC (rev 23413)
@@ -4,4 +4,5 @@
 BUG-remove-inline-statement-rejected-by-cython.patch
 fix-test_basic.py-cephes_vs_amos_mass_te.patch
 python3.3-incdir.diff
-fix-dbg-crash.patch
\ No newline at end of file
+fix-dbg-crash.patch
+fix-f2py-dependencies.patch