Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: seung-lab/cloud-volume
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18955eb2f44ddbfc560eedb67621a8e607e2f83b
Choose a base ref
..
head repository: seung-lab/cloud-volume
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 648090bf3ad32103978c68e60635b734b2cee1cb
Choose a head ref
Showing with 10 additions and 4 deletions.
  1. +1 −1 cloudvolume/__init__.py
  2. +8 −2 cloudvolume/skeleton.py
  3. +1 −1 setup.py
2 changes: 1 addition & 1 deletion cloudvolume/__init__.py
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@
from . import exceptions
from . import secrets

__version__ = '10.2.1'
__version__ = '10.2.2'

# Register plugins
from .datasource.precomputed import register as register_precomputed
10 changes: 8 additions & 2 deletions cloudvolume/skeleton.py
Original file line number Diff line number Diff line change
@@ -721,15 +721,21 @@ def downsample(self, factor):
[ Skeleton.from_path(path) for path in paths ]
).consolidate()
ds_skel.id = self.id
ds_skel.extra_attributes = self.extra_attributes

for attr in self.extra_attributes:
setattr(ds_skel, attr['id'],
np.zeros([ds_skel.vertices.shape[0], int(attr['num_components'])], dtype=attr['data_type'])
)

# TODO: I'm sure this could be sped up if need be.
index = {}
for i, vert in enumerate(self.vertices):
vert = tuple(vert)
index[vert] = i

bufs = [ getattr(ds_skel, attr['id']) for attr in ds_skel.extra_attributes ]
orig_bufs = [ getattr(self, attr['id']) for attr in ds_skel.extra_attributes ]
bufs = [ getattr(ds_skel, attr['id']) for attr in self.extra_attributes ]
orig_bufs = [ getattr(self, attr['id']) for attr in self.extra_attributes ]

for i, vert in enumerate(ds_skel.vertices):
reverse_i = index[tuple(vert)]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ def requirements():

setuptools.setup(
name="cloud-volume",
version="10.2.1",
version="10.2.2",
setup_requires=[
'numpy<1.17; python_version<"3.5"',
'numpy; python_version>="3.5"',