Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distributed labeling #94

Merged
merged 47 commits into from
Feb 10, 2019
Merged

Distributed labeling #94

Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ee2e2e7
Initial work on proper distributed labeling
jni Feb 2, 2019
3424123
Merge 'dask/master' into 'jni/ndlabel'
jakirkham Feb 4, 2019
e74e00b
Use vindex (blech)
jni Feb 4, 2019
5087807
Initial untested implementation
jni Feb 4, 2019
d05e004
_label_adj_graph working
jni Feb 4, 2019
f69e943
Almost working except relabeling
jni Feb 4, 2019
80be2a4
Add missing imports
jni Feb 4, 2019
4ec7d04
Fix indexing
jni Feb 4, 2019
12cc094
Fix imports and total count
jni Feb 4, 2019
3d53d7e
Specify the chunking in `_relabel_components`
jakirkham Feb 4, 2019
e6668f2
Fix some flake8 errors
jakirkham Feb 4, 2019
a7d0aa2
Drop transpose of `all_mappings`
jakirkham Feb 4, 2019
45b31a9
Use NumPy's `in1d` instead of `isin`
jakirkham Feb 4, 2019
1e19d4b
Handle empty adjacency graph for singleton chunk
jakirkham Feb 4, 2019
187ca9c
Drop unused `i` from `numblocks` `for`-loop
jakirkham Feb 5, 2019
580318a
Merge 'dask/master' into 'jni/ndlabel'
jakirkham Feb 5, 2019
fc0ce5b
Fix connected components dtype
jakirkham Feb 5, 2019
cb5f746
Fix non-zero increment's type to be `LABEL_DTYPE`
jakirkham Feb 5, 2019
fe9286d
Make sure relabeling array matches label type
jakirkham Feb 5, 2019
67f8a8c
Get right index for connected component array
jakirkham Feb 5, 2019
2f7297b
Fix incorrect labeling between multiply-matched labels
jni Feb 5, 2019
5724775
Fix test to test equivalent labeling, not identical labeling
jni Feb 5, 2019
163323b
Major cleanup of the new label code
jni Feb 5, 2019
e5428a1
Drop `partial` from `block_ndi_label_delayed`
jakirkham Feb 5, 2019
30cc7d5
Drop `partial` from `connected_components_delayed`
jakirkham Feb 5, 2019
2b2a84e
Bump Dask requirement to 0.18.2
jakirkham Feb 5, 2019
d4cfb6a
Force `total` to a `LABEL_DTYPE` scalar
jakirkham Feb 5, 2019
d3e1008
Force `0` in `da.where` to `LABEL_DTYPE`
jakirkham Feb 5, 2019
a932549
Make `n` an array in `block_ndi_label_delayed`
jakirkham Feb 5, 2019
5d844fa
Ensure `n` is a `LABEL_DTYPE` scalar
jakirkham Feb 5, 2019
9750837
Update tests of `label` for multiple chunks
jakirkham Feb 6, 2019
88e722e
Test `label` with the "U" case
jakirkham Feb 6, 2019
a19a282
Convert `_utils` module to `_utils` package
jakirkham Feb 6, 2019
2ff9cdd
Create module stub for label utility functions
jakirkham Feb 6, 2019
a4c7189
Refactor label utility functions
jakirkham Feb 6, 2019
eb0ec64
Drop underscores from externally used functions
jakirkham Feb 6, 2019
33ae86e
Mark some internal utility functions as private
jakirkham Feb 6, 2019
859b395
Drop import alias
jakirkham Feb 6, 2019
1dfc825
Use `slices_from_chunks` in `label`
jakirkham Feb 6, 2019
26f4bdf
Revert "Bump Dask requirement to 0.18.2"
jakirkham Feb 6, 2019
b2b5a40
Tweak docstring initial line
jakirkham Feb 6, 2019
0d59162
Drop unused import
jakirkham Feb 6, 2019
2208336
Implement `_unique_axis_0` by with structured view
jakirkham Feb 9, 2019
4868e71
Use our `_unique_axis_0` implementation
jakirkham Feb 9, 2019
314a9e9
Adjust whitespace in docstrings
jakirkham Feb 9, 2019
39979da
Generalize `_unique_axis`
jakirkham Feb 9, 2019
e16bae4
Minor indentation fix in docstring
jni Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Minor indentation fix in docstring
  • Loading branch information
@jni
jni committed Feb 10, 2019
commit e16bae4dd920cf73245b4dacdbd39a0d7c8ef331
2 changes: 1 addition & 1 deletion dask_image/ndmeasure/_utils/_label.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def _across_block_label_grouping(face, structure):
Examples
--------
>>> face = numpy.array([[1, 1, 0, 2, 2, 0, 8],
... [0, 7, 7, 7, 7, 0, 9]])
... [0, 7, 7, 7, 7, 0, 9]])
>>> structure = numpy.ones((3, 3), dtype=bool)
>>> _across_block_label_grouping(face, structure)
array([[1, 2, 8],
Expand Down