Merge pull request #240 from tonysyu/rename-duplicates

BUG: Rename modules with duplicate function names.

skimage/feature/__init__.py

@@ -1,5 +1,5 @@
-from .hog import hog
-from .greycomatrix import greycomatrix, greycoprops
+from ._hog import hog
+from ._greycomatrix import greycomatrix, greycoprops
 from .peak import peak_local_max
-from .harris import harris
+from ._harris import harris
 from .template import match_template

skimage/feature/_greycomatrix.py

@@ -5,7 +5,7 @@ properties to characterize image textures.
 
 import numpy as np
 
-from ._greycomatrix import _glcm_loop
+from ._greycomatrix_cy import _glcm_loop
 
 
 def greycomatrix(image, distances, angles, levels=256, symmetric=False,

skimage/feature/setup.py

@@ -12,10 +12,10 @@ def configuration(parent_package='', top_path=None):
     config = Configuration('feature', parent_package, top_path)
     config.add_data_dir('tests')
 
-    cython(['_greycomatrix.pyx'], working_path=base_path)
+    cython(['_greycomatrix_cy.pyx'], working_path=base_path)
     cython(['_template.pyx'], working_path=base_path)
 
-    config.add_extension('_greycomatrix', sources=['_greycomatrix.c'],
+    config.add_extension('_greycomatrix_cy', sources=['_greycomatrix_cy.c'],
                          include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_template', sources=['_template.c'],
                          include_dirs=[get_numpy_include_dirs()])

skimage/filter/__init__.py

@@ -1,7 +1,7 @@
 from .lpi_filter import *
 from .ctmf import median_filter
-from .canny import canny
+from ._canny import canny
 from .edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt
-from .tv_denoise import tv_denoise
-from .rank_order import rank_order
+from ._tv_denoise import tv_denoise
+from ._rank_order import rank_order
 from .thresholding import threshold_otsu, threshold_adaptive

skimage/morphology/__init__.py

@@ -2,5 +2,5 @@ from .grey import *
 from .selem import *
 from .ccomp import label
 from .watershed import watershed, is_local_maximum
-from .skeletonize import skeletonize, medial_axis
+from ._skeletonize import skeletonize, medial_axis
 from .convex_hull import convex_hull_image

skimage/morphology/_skeletonize.py

@@ -5,7 +5,7 @@ Algorithms for computing the skeleton of a binary image
 import numpy as np
 from scipy import ndimage
 
-from ._skeletonize import _skeletonize_loop, _table_lookup_index
+from ._skeletonize_cy import _skeletonize_loop, _table_lookup_index
 
 # --------- Skeletonization by morphological thinning ---------
 

skimage/morphology/setup.py

@@ -15,7 +15,7 @@ def configuration(parent_package='', top_path=None):
     cython(['ccomp.pyx'], working_path=base_path)
     cython(['cmorph.pyx'], working_path=base_path)
     cython(['_watershed.pyx'], working_path=base_path)
-    cython(['_skeletonize.pyx'], working_path=base_path)
+    cython(['_skeletonize_cy.pyx'], working_path=base_path)
     cython(['_pnpoly.pyx'], working_path=base_path)
     cython(['_convex_hull.pyx'], working_path=base_path)
 
@@ -25,7 +25,7 @@ def configuration(parent_package='', top_path=None):
                          include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_watershed', sources=['_watershed.c'],
                          include_dirs=[get_numpy_include_dirs()])
-    config.add_extension('_skeletonize', sources=['_skeletonize.c'],
+    config.add_extension('_skeletonize_cy', sources=['_skeletonize_cy.c'],
                          include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_pnpoly', sources=['_pnpoly.c'],
                          include_dirs=[get_numpy_include_dirs()])