diff --git a/skimage/__init__.py b/skimage/__init__.py index bb688da5..14dcf341 100644 --- a/skimage/__init__.py +++ b/skimage/__init__.py @@ -30,7 +30,7 @@ measure morphology Morphological operations, e.g. opening or skeletonization. restoration - Deconvolution algorithms. + Restoration algorithms. segmentation Splitting an image into self-similar regions. transform diff --git a/skimage/exposure/setup.py b/skimage/exposure/setup.py index b90b082c..d0c534dd 100644 --- a/skimage/exposure/setup.py +++ b/skimage/exposure/setup.py @@ -13,19 +13,6 @@ def configuration(parent_package='', top_path=None): config = Configuration('exposure', parent_package, top_path) config.add_data_dir('tests') - cython(['_unwrap_1d.pyx'], working_path=base_path) - cython(['_unwrap_2d.pyx'], working_path=base_path) - cython(['_unwrap_3d.pyx'], working_path=base_path) - - config.add_extension('_unwrap_1d', sources=['_unwrap_1d.c'], - include_dirs=[get_numpy_include_dirs()]) - unwrap_sources_2d = ['_unwrap_2d.c', 'unwrap_2d_ljmu.c'] - config.add_extension('_unwrap_2d', sources=unwrap_sources_2d, - include_dirs=[get_numpy_include_dirs()]) - unwrap_sources_3d = ['_unwrap_3d.c', 'unwrap_3d_ljmu.c'] - config.add_extension('_unwrap_3d', sources=unwrap_sources_3d, - include_dirs=[get_numpy_include_dirs()]) - return config if __name__ == '__main__': diff --git a/skimage/restoration/__init__.py b/skimage/restoration/__init__.py index 324b0932..147aff0e 100644 --- a/skimage/restoration/__init__.py +++ b/skimage/restoration/__init__.py @@ -19,7 +19,9 @@ References """ from .deconvolution import wiener, unsupervised_wiener, richardson_lucy +from .unwrap import unwrap_phase __all__ = ['wiener', - "unsupervised_wiener", - "richardson_lucy"] + 'unsupervised_wiener', + 'richardson_lucy', + 'unwrap_phase'] diff --git a/skimage/exposure/_unwrap_1d.pyx b/skimage/restoration/_unwrap_1d.pyx similarity index 100% rename from skimage/exposure/_unwrap_1d.pyx rename to skimage/restoration/_unwrap_1d.pyx diff --git a/skimage/exposure/_unwrap_2d.pyx b/skimage/restoration/_unwrap_2d.pyx similarity index 100% rename from skimage/exposure/_unwrap_2d.pyx rename to skimage/restoration/_unwrap_2d.pyx diff --git a/skimage/exposure/_unwrap_3d.pyx b/skimage/restoration/_unwrap_3d.pyx similarity index 100% rename from skimage/exposure/_unwrap_3d.pyx rename to skimage/restoration/_unwrap_3d.pyx diff --git a/skimage/exposure/tests/test_unwrap.py b/skimage/restoration/tests/test_unwrap.py similarity index 100% rename from skimage/exposure/tests/test_unwrap.py rename to skimage/restoration/tests/test_unwrap.py diff --git a/skimage/exposure/unwrap.py b/skimage/restoration/unwrap.py similarity index 100% rename from skimage/exposure/unwrap.py rename to skimage/restoration/unwrap.py diff --git a/skimage/exposure/unwrap_2d_ljmu.c b/skimage/restoration/unwrap_2d_ljmu.c similarity index 100% rename from skimage/exposure/unwrap_2d_ljmu.c rename to skimage/restoration/unwrap_2d_ljmu.c diff --git a/skimage/exposure/unwrap_3d_ljmu.c b/skimage/restoration/unwrap_3d_ljmu.c similarity index 100% rename from skimage/exposure/unwrap_3d_ljmu.c rename to skimage/restoration/unwrap_3d_ljmu.c