From bd2a61baf86d75cf95b97066ab8a92f796083ea3 Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Sun, 25 Aug 2013 12:42:12 +0200 Subject: [PATCH 1/2] Add PyAMG to the optional dependencies list --- DEPENDS.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEPENDS.txt b/DEPENDS.txt index 227283e2..04b745c2 100644 --- a/DEPENDS.txt +++ b/DEPENDS.txt @@ -42,6 +42,10 @@ functionality is only available with the following installed: The ``freeimage`` plugin provides support for reading various types of image file formats, including multi-page TIFFs. +* `PyAMG `__ + The ``pyamg`` module is used for the fast `cg_mg` mode of random + walker segmentation. + Testing requirements -------------------- * `Nose `__ From 13e83be692bff2bf2c51050b920c11ed9f8c5bf7 Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Sun, 25 Aug 2013 12:44:19 +0200 Subject: [PATCH 2/2] Update PyAMG URL (no longer in Google Code) --- skimage/segmentation/random_walker_segmentation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/segmentation/random_walker_segmentation.py b/skimage/segmentation/random_walker_segmentation.py index bd143ed6..9ef3a8fc 100644 --- a/skimage/segmentation/random_walker_segmentation.py +++ b/skimage/segmentation/random_walker_segmentation.py @@ -214,7 +214,7 @@ def random_walker(data, labels, beta=130, mode='bf', tol=1.e-3, copy=True, - 'cg_mg' (conjugate gradient with multigrid preconditioner): a preconditioner is computed using a multigrid solver, then the solution is computed with the Conjugate Gradient method. This mode - requires that the pyamg module (http://code.google.com/p/pyamg/) is + requires that the pyamg module (http://pyamg.org/) is installed. For images of size > 512x512, this is the recommended (fastest) mode. @@ -379,7 +379,7 @@ def random_walker(data, labels, beta=130, mode='bf', tol=1.e-3, copy=True, if mode == 'cg_mg': if not amg_loaded: warnings.warn( - """pyamg (http://code.google.com/p/pyamg/)) is needed to use + """pyamg (http://pyamg.org/)) is needed to use this mode, but is not installed. The 'cg' mode will be used instead.""") X = _solve_cg(lap_sparse, B, tol=tol,