Remove unused cmorph extension

The C morphology module has been superseded by wrapping scipy.ndimage.
This commit is contained in:
Juan Nunez-Iglesias
2015-01-22 11:38:37 +11:00
parent 658a83d46c
commit 1439341461
4 changed files with 6 additions and 12 deletions
-3
View File
@@ -79,9 +79,6 @@ Library:
Extension: skimage.graph._spath
Sources:
skimage/graph/_spath.pyx
Extension: skimage.morphology.cmorph
Sources:
skimage/morphology/cmorph.pyx
Extension: skimage.graph.heap
Sources:
skimage/graph/heap.pyx
+1 -1
View File
@@ -16,7 +16,7 @@ followed by the moving window is given hereunder
/--------------------------/
\-------------------------- ...
We compare cmorph.dilate to this histogram based method to show how
We compare grey.dilate to this histogram based method to show how
computational costs increase with respect to image size or structuring element
size. This implementation gives better results for large structuring elements.
+5 -5
View File
@@ -5,7 +5,7 @@ from numpy.testing import run_module_suite, assert_equal, assert_raises
import skimage
from skimage import img_as_ubyte, img_as_float
from skimage import data, util, morphology
from skimage.morphology import cmorph, disk
from skimage.morphology import grey, disk
from skimage.filters import rank
from skimage._shared._warnings import expected_warnings
@@ -118,7 +118,7 @@ def test_random_sizes():
assert_equal(image16.shape, out16.shape)
def test_compare_with_cmorph_dilate():
def test_compare_with_grey_dilation():
# compare the result of maximum filter with dilate
image = (np.random.rand(100, 100) * 256).astype(np.uint8)
@@ -128,11 +128,11 @@ def test_compare_with_cmorph_dilate():
for r in range(1, 20, 1):
elem = np.ones((r, r), dtype=np.uint8)
rank.maximum(image=image, selem=elem, out=out, mask=mask)
cm = cmorph._dilate(image=image, selem=elem)
cm = grey.dilation(image=image, selem=elem)
assert_equal(out, cm)
def test_compare_with_cmorph_erode():
def test_compare_with_grey_erosion():
# compare the result of maximum filter with erode
image = (np.random.rand(100, 100) * 256).astype(np.uint8)
@@ -142,7 +142,7 @@ def test_compare_with_cmorph_erode():
for r in range(1, 20, 1):
elem = np.ones((r, r), dtype=np.uint8)
rank.minimum(image=image, selem=elem, out=out, mask=mask)
cm = cmorph._erode(image=image, selem=elem)
cm = grey.erosion(image=image, selem=elem)
assert_equal(out, cm)
-3
View File
@@ -12,14 +12,11 @@ def configuration(parent_package='', top_path=None):
config = Configuration('morphology', parent_package, top_path)
config.add_data_dir('tests')
cython(['cmorph.pyx'], working_path=base_path)
cython(['_watershed.pyx'], working_path=base_path)
cython(['_skeletonize_cy.pyx'], working_path=base_path)
cython(['_convex_hull.pyx'], working_path=base_path)
cython(['_greyreconstruct.pyx'], working_path=base_path)
config.add_extension('cmorph', sources=['cmorph.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('_watershed', sources=['_watershed.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('_skeletonize_cy', sources=['_skeletonize_cy.c'],