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.

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

feat: skeletonize (most) autapses and improve cross section analysis #179

Merged
merged 50 commits into from
Aug 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9a6b8c4
wip(skeletonizing): add support for fixing autapses in graphene volumes
william-silversmith Jan 16, 2024
08a8151
feat: add support for graphene timestamp
william-silversmith Jan 16, 2024
7f2e487
wip: ensure shape matches atomic chunks
william-silversmith Jan 17, 2024
2b892c0
fix: add back in xyzrange
william-silversmith May 13, 2024
dcfc938
fix(SkeletonTask): generalize frag_path for windows
william-silversmith May 14, 2024
f3e138f
fix(SkeletonTask): use agglomerate and timestamp correctly
william-silversmith May 14, 2024
971eb14
fix: merge error removed cross_sectional_area params
william-silversmith May 14, 2024
a3ab5bb
fix(SkeletonTask): apply timestamp in correct location
william-silversmith May 18, 2024
86a8a8f
fix: fixup the edges of the vcg with root vcg
william-silversmith May 22, 2024
7238b3a
feat: remove requirements for a queue parameter
william-silversmith May 24, 2024
3392897
redesign: use vol.info to get skeleton path
william-silversmith May 24, 2024
6ff5f7e
fix: several errors
william-silversmith May 24, 2024
9838867
feat: add fix_autapses to cli
william-silversmith May 24, 2024
cb3e543
fix: compensate for mip levels
william-silversmith May 24, 2024
3611bc8
fix: wrong path joining
william-silversmith May 24, 2024
3bc9755
fix: ensure mesh bounds are rectified after expansion
william-silversmith May 24, 2024
e6b9174
fix: wrong variable name in shard downsample
william-silversmith Jun 9, 2024
329db4b
fix(shards/image): fix situation where chunk.z == dataset.z
william-silversmith Jul 24, 2024
6208048
wip(skeletonizing): add support for fixing autapses in graphene volumes
william-silversmith Jan 16, 2024
894b2fa
feat: add support for graphene timestamp
william-silversmith Jan 16, 2024
3176128
wip: ensure shape matches atomic chunks
william-silversmith Jan 17, 2024
91bed59
fix: add back in xyzrange
william-silversmith May 13, 2024
bc215ce
fix(SkeletonTask): generalize frag_path for windows
william-silversmith May 14, 2024
f4a513f
fix(SkeletonTask): use agglomerate and timestamp correctly
william-silversmith May 14, 2024
2cfed74
fix: merge error removed cross_sectional_area params
william-silversmith May 14, 2024
548fe0b
fix(SkeletonTask): apply timestamp in correct location
william-silversmith May 18, 2024
2fb01ac
fix: fixup the edges of the vcg with root vcg
william-silversmith May 22, 2024
521c9d2
feat: remove requirements for a queue parameter
william-silversmith May 24, 2024
f50059b
redesign: use vol.info to get skeleton path
william-silversmith May 24, 2024
6f5e094
fix: several errors
william-silversmith May 24, 2024
80ed2c7
feat: add fix_autapses to cli
william-silversmith May 24, 2024
37e9dc6
fix: compensate for mip levels
william-silversmith May 24, 2024
fe9267f
fix: wrong path joining
william-silversmith May 24, 2024
e7809da
fix: ensure mesh bounds are rectified after expansion
william-silversmith May 24, 2024
67e18cc
fix: don't import view from CloudVolume
Jul 29, 2024
d8da603
fix: don't import view from cloudvolume
Jul 29, 2024
73202cd
Merge branch 'wms_autapse' of github.com:seung-lab/igneous into wms_a…
william-silversmith Jul 30, 2024
9f9c0b0
fix: intelligent frag path resolution
william-silversmith Jul 30, 2024
e028820
fix: handle binarization issue in repairing
william-silversmith Jul 30, 2024
52b5bb8
fix: smart path
william-silversmith Jul 31, 2024
12c3117
perf: skip downloading the "huge" bbox if no skeletons
Jul 31, 2024
be2b462
fix: ensure info file uploaded to frag path
william-silversmith Aug 2, 2024
1a7b16f
Merge branch 'wms_autapse' of github.com:seung-lab/igneous into wms_a…
william-silversmith Aug 2, 2024
586bdf1
fix: check for key
william-silversmith Aug 2, 2024
be59802
feat: support agglomeration for graphene for cross sections
william-silversmith Aug 6, 2024
32ed272
feat: support static root_ids for a graphene volume
william-silversmith Aug 6, 2024
7e915c0
fix: regression in LuminanceLevelsTask due to CloudVolume upgrade
william-silversmith Aug 8, 2024
42bcde1
refactor: simplify vcg code
william-silversmith Aug 10, 2024
c85eee9
feat: add encoding level support for jpegxl
william-silversmith Aug 13, 2024
27ce91b
fix: don't print error if max_mips is non-zero
william-silversmith Aug 14, 2024
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
Next Next commit
fix: several errors
william-silversmith committed May 24, 2024
commit 6ff5f7e3a41d576f166972296e4cddca0a09d81a
10 changes: 6 additions & 4 deletions igneous/tasks/skeleton.py
Original file line number Diff line number Diff line change
@@ -212,14 +212,16 @@ def voxel_connectivity_graph(
shape = bbox.size()[:3]
sgx, sgy, sgz = list(np.ceil(shape / vol.meta.graph_chunk_size).astype(int))

vcg = np.zeros(layer_2.shape, dtype=np.uint32, order="F")
vcg = np.zeros(layer_2.shape[:3], dtype=np.uint32, order="F")

clamp_box = Bbox([0,0,0], shape)

for gx,gy,gz in xyzrange([sgx, sgy, sgz]):
bbx = Bbox((gx,gy,gz), (gx+1, gy+1, gz+1))
bbx *= vol.meta.graph_chunk_size
bbx = Bbox.clamp(bbx, (0,0,0), shape)
bbx = Bbox.clamp(bbx, clamp_box)

cutout = np.asfortranarray(layer_2[bbx.to_slices()])
cutout = np.asfortranarray(layer_2[bbx.to_slices()][:,:,:,0])
vcg_cutout = cc3d.voxel_connectivity_graph(cutout, connectivity=26)
vcg[bbx.to_slices()] = vcg_cutout
del vcg_cutout
@@ -237,7 +239,7 @@ def voxel_connectivity_graph(
for gx,gy,gz in xyzrange([sgx, sgy, sgz]):
bbx = Bbox((gx,gy,gz), (gx+1, gy+1, gz+1))
bbx *= vol.meta.graph_chunk_size
bbx = Bbox.clamp(bbx, (0,0,0), shape)
bbx = Bbox.clamp(bbx, clamp_box)

slicearr = []
for i in range(3):