diff --git a/doc/source/conf.py b/doc/source/conf.py index e59a4382b..83fa388e8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -106,7 +106,7 @@ release = version # non-false value, then it is used: #today = '' # Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' +today_fmt = '%B %d, %Y' # List of documents that shouldn't be included in the build. #unused_docs = [] @@ -227,11 +227,11 @@ html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -#html_use_smartypants = True +html_use_smartypants = True # Custom sidebar templates, maps document names to template names. html_sidebars = { @@ -249,7 +249,7 @@ html_sidebars = { #html_use_modindex = True # If false, no index is generated. -#html_use_index = True +html_use_index = True # If true, the index is split into individual pages for each letter. #html_split_index = False @@ -266,7 +266,7 @@ html_sidebars = { # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -#html_use_opensearch = '' +html_use_opensearch = 'objects.inv' # If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). #html_file_suffix = '' diff --git a/skimage/draw/setup.py b/skimage/draw/setup.py index 6e0cb1b51..f53e65a5e 100644 --- a/skimage/draw/setup.py +++ b/skimage/draw/setup.py @@ -13,7 +13,7 @@ def configuration(parent_package='', top_path=None): cython(['_draw.pyx'], working_path=base_path) - config.add_extension('_draw', sources=['_draw.c'], + config.add_extension('_draw', sources=['_draw.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs(), '../_shared']) return config diff --git a/skimage/feature/setup.py b/skimage/feature/setup.py index 868eebd26..ceaec48c2 100755 --- a/skimage/feature/setup.py +++ b/skimage/feature/setup.py @@ -26,16 +26,17 @@ def configuration(parent_package='', top_path=None): config.add_extension('_cascade', sources=['_cascade.cpp'], include_dirs=[get_numpy_include_dirs()], + libraries=['m'], language="c++") config.add_extension('corner_cy', sources=['corner_cy.c'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('censure_cy', sources=['censure_cy.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('orb_cy', sources=['orb_cy.c'], + config.add_extension('orb_cy', sources=['orb_cy.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('brief_cy', sources=['brief_cy.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('_texture', sources=['_texture.c'], + config.add_extension('_texture', sources=['_texture.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs(), '../_shared']) config.add_extension('_hessian_det_appx', sources=['_hessian_det_appx.c'], include_dirs=[get_numpy_include_dirs()]) diff --git a/skimage/filters/setup.py b/skimage/filters/setup.py index e3aed4b0d..0ed434c39 100644 --- a/skimage/filters/setup.py +++ b/skimage/filters/setup.py @@ -21,7 +21,7 @@ def configuration(parent_package='', top_path=None): include_dirs=[get_numpy_include_dirs()]) config.add_extension('_multiotsu', sources=['_multiotsu.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('rank.generic_cy', sources=['rank/generic_cy.c'], + config.add_extension('rank.generic_cy', sources=['rank/generic_cy.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension( 'rank.percentile_cy', sources=['rank/percentile_cy.c'], diff --git a/skimage/io/setup.py b/skimage/io/setup.py index a16512b02..171a88d6f 100644 --- a/skimage/io/setup.py +++ b/skimage/io/setup.py @@ -19,7 +19,7 @@ def configuration(parent_package='', top_path=None): working_path=base_path) config.add_extension('_plugins._colormixer', - sources=['_plugins/_colormixer.c'], + sources=['_plugins/_colormixer.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_plugins._histograms', diff --git a/skimage/measure/setup.py b/skimage/measure/setup.py index 4ef48285c..07f7563db 100644 --- a/skimage/measure/setup.py +++ b/skimage/measure/setup.py @@ -22,7 +22,7 @@ def configuration(parent_package='', top_path=None): include_dirs=[get_numpy_include_dirs()]) config.add_extension('_find_contours_cy', sources=['_find_contours_cy.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('_moments_cy', sources=['_moments_cy.c'], + config.add_extension('_moments_cy', sources=['_moments_cy.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_marching_cubes_classic_cy', sources=['_marching_cubes_classic_cy.c'], diff --git a/skimage/restoration/setup.py b/skimage/restoration/setup.py index fcc2598e5..813d6f9c0 100644 --- a/skimage/restoration/setup.py +++ b/skimage/restoration/setup.py @@ -26,10 +26,11 @@ def configuration(parent_package='', top_path=None): 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()]) - config.add_extension('_denoise_cy', sources=['_denoise_cy.c'], + config.add_extension('_denoise_cy', sources=['_denoise_cy.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_nl_means_denoising', sources=['_nl_means_denoising.c'], + libraries=['m'], include_dirs=[get_numpy_include_dirs(), '../_shared']) diff --git a/skimage/segmentation/setup.py b/skimage/segmentation/setup.py index 01e54ac20..3392e11d1 100644 --- a/skimage/segmentation/setup.py +++ b/skimage/segmentation/setup.py @@ -21,6 +21,7 @@ def configuration(parent_package='', top_path=None): config.add_extension('_felzenszwalb_cy', sources=['_felzenszwalb_cy.c'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_quickshift_cy', sources=['_quickshift_cy.c'], + libraries=['m'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_slic', sources=['_slic.c'], include_dirs=[get_numpy_include_dirs()]) diff --git a/skimage/transform/setup.py b/skimage/transform/setup.py index eae7604d1..5045e4c77 100644 --- a/skimage/transform/setup.py +++ b/skimage/transform/setup.py @@ -16,14 +16,14 @@ def configuration(parent_package='', top_path=None): '_warps_cy.pyx', '_radon_transform.pyx'], working_path=base_path) - config.add_extension('_hough_transform', sources=['_hough_transform.c'], + config.add_extension('_hough_transform', sources=['_hough_transform.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('_warps_cy', sources=['_warps_cy.c'], + config.add_extension('_warps_cy', sources=['_warps_cy.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs(), '../_shared']) config.add_extension('_radon_transform', - sources=['_radon_transform.c'], + sources=['_radon_transform.c'], libraries=['m'], include_dirs=[get_numpy_include_dirs()]) return config