added patch changeset_0eea2a48fe2dca7bbb3681fcd5b511579cad6347.diff to "cherry-pick" 0eea2a48fe (Fix Cython 0.19 build error due to global wraparound=False)

2026-07-21 12:50:27 +08:00 · 2013-06-03 12:48:22 -04:00
parent 2eec6c3d94
commit ebb78755b3
3 changed files with 124 additions and 0 deletions
@@ -10,6 +10,10 @@ skimage (0.8.2-1) unstable; urgency=low
  * debian/control
    - boosted required cython version to 0.15
    - boosted policy cmopliance to 3.9.4
+  * debian/patches
+    - changeset_0eea2a48fe2dca7bbb3681fcd5b511579cad6347.diff -- resolves
+      incompatibility with cython 0.19 (thanks Julian Taylor for the
+      pointer)

 -- Yaroslav Halchenko <debian@onerussian.com>  Mon, 03 Jun 2013 10:28:31 -0400

@@ -0,0 +1,119 @@
+From: Josh Warner (Mac) <warner.joshua@mayo.edu>
+Subject: Fix Cython 0.19 build error due to global wraparound=False
+
+commit 0eea2a48fe2dca7bbb3681fcd5b511579cad6347
+Author: Josh Warner (Mac) <warner.joshua@mayo.edu>
+Date:   Wed Apr 24 21:47:37 2013 -0500
+
+    Fix Cython 0.19 build error due to global wraparound=False
+
+diff --git a/skimage/graph/_mcp.pyx b/skimage/graph/_mcp.pyx
+index 4e5f6d5..34904dc 100644
+--- a/skimage/graph/_mcp.pyx
+++ b/skimage/graph/_mcp.pyx
+@@ -1,7 +1,5 @@
+ #cython: cdivision=True
+-#cython: boundscheck=False
+ #cython: nonecheck=False
+-#cython: wraparound=False
+ """Cython implementation of Dijkstra's minimum cost path algorithm,
+ for use with data on a n-dimensional lattice.
+ 
+@@ -34,6 +32,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ """
+ 
+import cython
+ import numpy as np
+ import heap
+ 
+@@ -51,7 +50,8 @@ INDEX_D = np.intp
+ FLOAT_D = np.float64
+ 
+ 
+-
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ def _get_edge_map(shape):
+     """Return an array with edge points/lines/planes/hyperplanes marked.
+ 
+@@ -75,6 +75,9 @@ def _get_edge_map(shape):
+         edges[tuple(slices)] = 1
+     return edges
+ 
+
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ def _offset_edge_map(shape, offsets):
+     """Return an array with positions marked where offsets will step
+     out of bounds.
+@@ -117,6 +120,9 @@ def _offset_edge_map(shape, offsets):
+         neg[neg < mn] = 0
+     return pos_edges.astype(EDGE_D), neg_edges.astype(EDGE_D)
+ 
+
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ def make_offsets(d, fully_connected):
+     """Make a list of offsets from a center point defining a n-dim
+     neighborhood.
+@@ -160,6 +166,9 @@ def make_offsets(d, fully_connected):
+             offsets.append(indices)
+     return offsets
+ 
+
+@cython.boundscheck(True)
+@cython.wraparound(True)
+ def _unravel_index_fortran(flat_indices, shape):
+     """_unravel_index_fortran(flat_indices, shape)
+ 
+@@ -170,6 +179,9 @@ def _unravel_index_fortran(flat_indices, shape):
+     indices = [tuple(idx/strides % shape) for idx in flat_indices]
+     return indices
+ 
+
+@cython.boundscheck(True)
+@cython.wraparound(True)
+ def _ravel_index_fortran(indices, shape):
+     """_ravel_index_fortran(flat_indices, shape)
+ 
+@@ -180,6 +192,9 @@ def _ravel_index_fortran(indices, shape):
+     flat_indices = [np.sum(strides * idx) for idx in indices]
+     return flat_indices
+ 
+
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ def _normalize_indices(indices, shape):
+     """_normalize_indices(indices, shape)
+ 
+@@ -201,6 +216,16 @@ def _normalize_indices(indices, shape):
+         new_indices.append(new_index)
+     return new_indices
+ 
+
+@cython.boundscheck(True)
+@cython.wraparound(True)
+def _reverse(arr):
+    """Reverse index an array safely, with bounds/wraparound checks on."""
+    return arr[::-1]
+
+
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ cdef class MCP:
+     """MCP(costs, offsets=None, fully_connected=True)
+ 
+@@ -574,8 +599,11 @@ cdef class MCP:
+             for d in range(dim):
+                 position[d] -= offsets[offset, d]
+             traceback.append(tuple(position))
+-        return traceback[::-1]
+        return _reverse(traceback)
+
+ 
+@cython.boundscheck(False)
+@cython.wraparound(False)
+ cdef class MCP_Geometric(MCP):
+     """MCP_Geometric(costs, offsets=None, fully_connected=True)
+ 
@@ -0,0 +1 @@
+changeset_0eea2a48fe2dca7bbb3681fcd5b511579cad6347.diff
				`@@ -0,0 +1 @@`
				`changeset_0eea2a48fe2dca7bbb3681fcd5b511579cad6347.diff`