Commit Graph

7427 Commits

Author SHA1 Message Date
dan 086d8c667b imports now inside of the file 2015-05-29 23:03:12 +02:00
dan 3c82d9505f plain python multiblock lbp implemented with test coverage 2015-05-29 22:58:39 +02:00
K.-Michael Aye 56fc42ad47 removing obsolete (or not found?) link
`intensity_range` does not seem to exist or is not found. Removing obsolete reference in doctext.
2015-05-29 12:06:46 -06:00
Josh Warner 3faa32149a Merge pull request #1526 from arve0/installation_instructions
Add dask[array], improve CI builds, update install instructions
2015-05-29 10:38:09 -05:00
Juan Nunez-Iglesias e497e5c4f5 Merge pull request #1530 from LeeKamentsky/master
Watershed fixes for issue #803 (incorrect propagation in plateaus)
2015-05-29 16:58:36 +10:00
Juan Nunez-Iglesias 06ad9e3c9a Merge pull request #1483 from ozak/ravel-not-flatten
Use ravel instead of flatten in Minimum Cost Path code to improve memory efficiency.
2015-05-29 16:20:26 +10:00
Lee Kamentsky 54f8265603 Issue #803 order the structuring element by distance to get diagonals processed last 2015-05-28 13:28:21 -04:00
kpk09 a9bdaaf274 proposed fix and test for broken watershed on flat areas (https://github.com/scikit-image/scikit-image/issues/803) 2015-05-28 13:28:16 -04:00
arve0 04cbaa1579 expect PIL open fp 2015-05-28 16:06:32 +02:00
arve0 89521548a6 update install instructions 2015-05-28 14:45:29 +02:00
arve0 dedff0efa8 smarter requirements in test env 2015-05-28 14:44:00 +02:00
Steven Silvester fb66edd753 Merge pull request #1532 from JDWarner/fix_appveyor
FIX: Use direct, secure link to wheelhouse to fix AppVeyor builds
2015-05-28 04:09:03 -05:00
Josh Warner (Mac) ba79a7c827 FIX: Use direct, secure link for pip wheelhouse. 2015-05-27 17:05:37 -05:00
arve0 ddedb9de08 use travis python 2.7 and wheel house 2015-05-27 23:29:13 +02:00
bennlich 84831fce87 Fix bug when shape parameter is passed in from color images 2015-05-27 14:13:19 -07:00
arve0 d9908f74ad trust http wheel house 2015-05-26 01:18:54 +02:00
Ömer Özak b455d851b1 Use np.ravel instead of np.copy
This should decrease memory usage and
increase speed without affecting anything else
2015-05-25 18:21:53 -04:00
arve0 c52dc414c6 install binaries -> then resolve deps
requirements.txt should hold all dependencies all deps are not in wheel house

- first install binaries from wheel house
- then install the rest of the deps
2015-05-25 17:04:50 +02:00
arve0 bf31af6728 update appveyor requirements.txt
- cython 0.20 in wheel house is below scikit-image requirement (>=0.21)
  - cython 0.21 will be installed anyhow, save time not installing
    cython twice
- dask[arrary] is added to /requirements.txt, and should not be needed
  here
2015-05-25 17:04:39 +02:00
arve0 b6aa358439 clean up setup.py according to 9cfaf4a
- cython added to setup_requirements
  - setuptools will call easy_install to install it
  - all other build requirements, excluding numpy, will be resolved by pip
- do not parse requirements.txt
  - requirements should be the real runtime requirements
- fail gracefully when missing numpy
  - scipy will be resolved by pip from install_requires
2015-05-25 12:43:36 +02:00
arve0 2166041fee deps: cython not runtime, add dask, six >= 1.4
- cython is not a runtime dependency
- dask is a runtime dependency
- scikit-image depends on six.moves.urllib
2015-05-25 12:41:13 +02:00
bennlich 5ee137f904 Always maximally constrain bounding_shape when creating ellipse 2015-05-22 17:28:55 -07:00
Stefan van der Walt a65b8af4bf Merge pull request #1493 from cowlicks/chunk-map
Add parallel function mapping
2015-05-21 14:09:07 -07:00
Blake Griffith 2ebcadbb96 Correct link in DEPENDS.txt 2015-05-21 14:17:06 -05:00
Stefan van der Walt bbf3f1c97b Merge pull request #1519 from ahojnnes/nogil
Release the GIL from Cython
2015-05-21 10:59:05 -07:00
Blake Griffith 14a185810e Remove dask install from travis_script.sh 2015-05-21 12:12:38 -05:00
Blake Griffith d6c028a9b3 Move dask intall to travis_befor_install.sh 2015-05-21 12:12:10 -05:00
Johannes Schönberger 990892fcde Replace libc.math.NAN with numpy.math.NAN for MSVC 2015-05-21 08:27:00 -07:00
Josh Warner 4e1e861c21 Merge pull request #1523 from warmspringwinds/ellipse-doc-correction
DOC: corrected ellipse documentation
2015-05-21 02:02:25 -05:00
dan ff1322938e pep line width violation corrected 2015-05-21 07:58:56 +02:00
Johannes Schönberger 6e500b1733 Do not acquire GIL for shared functions 2015-05-20 20:29:19 -07:00
Johannes Schönberger fcdffd7e3d Do not acquire GIL for draw functions 2015-05-20 20:26:57 -07:00
Johannes Schönberger a2ddba21a5 Do not acquire GIL for hessian_matrix_det 2015-05-20 20:22:02 -07:00
Johannes Schönberger 4a95345489 Do not acquire GIL for texture functions 2015-05-20 17:51:41 -07:00
Johannes Schönberger 9cd7ca5881 Do not acquire GIL for BRIEF 2015-05-20 17:39:46 -07:00
dan bcb5b34fef more formal documentation 2015-05-21 02:06:27 +02:00
dan 98c4e2366e ellipse documentation was corrected 2015-05-21 01:30:17 +02:00
Johannes Schönberger bca458bc1c Do not acquire GIL for CENSURE 2015-05-20 09:04:58 -07:00
Johannes Schönberger a489b85b22 Do not acquire GIL for corner detectors 2015-05-20 07:45:04 -07:00
Johannes Schönberger c52c7f4bfb Do not acquire GIL for ORB 2015-05-20 07:38:47 -07:00
Johannes Schönberger aa38f2485b Do not acquire GIL for rank filters 2015-05-20 07:26:24 -07:00
Johannes Schönberger a7c0b11eda Do not acquire GIL for median_filter 2015-05-20 07:10:51 -07:00
Johannes Schönberger 8e6542c86c Do not acquire GIL for heap 2015-05-19 23:03:46 -07:00
Stefan van der Walt 1a32745645 Merge pull request #1517 from ahojnnes/parallel-decoration
Add decorator to test parallel execution of unit tests
2015-05-19 23:00:00 -07:00
Johannes Schönberger 0758fc9cd6 Do not acquire GIL for felzenswalb 2015-05-19 22:52:35 -07:00
Johannes Schönberger 2d0b4dc37a Do not acquire GIL for quickshift 2015-05-19 22:43:46 -07:00
Johannes Schönberger 785176b4c2 Do not acquire GIL for slic 2015-05-19 22:40:19 -07:00
Stefan van der Walt 07f95e400f Merge pull request #1511 from grlee77/ssim_ndim
ENH: structural_similarity: n-dimensional and multichannel support
2015-05-19 19:04:23 -07:00
Johannes Schönberger 7337a3e14b Do not acquire GIL for hough_line 2015-05-19 18:57:20 -07:00
Steven Silvester 26fa9c75d0 Merge pull request #1499 from stefanv/doc_style
Sync doc theme with website
2015-05-19 20:46:10 -05:00