Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning][].
- Added `shortest_path` parameter to `get_transformation_between_coordinate_systems`
- Added `get_pyramid_levels()` utils API
- Improved ergonomics of `concatenate()` when element names are non-unique #720
- Improved performance of writing images with multiscales #577

## [0.2.3] - 2024-09-25

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ docs = [
test = [
"pytest",
"pytest-cov",
"pytest-mock",
]
torch = [
"torch"
Expand Down
6 changes: 5 additions & 1 deletion src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
from pathlib import Path
from typing import Any, Literal, Optional, Union

import dask.array as da
import numpy as np
import zarr
from datatree import DataTree
Expand DownExpand Up@@ -195,15 +196,18 @@ def _get_group_for_writing_transformations() -> zarr.Group:
# coords = iterate_pyramid_levels(raster_data, "coords")
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=format)
storage_options = [{"chunks": chunk} for chunk in chunks]
write_multi_scale_ngff(
dask_delayed = write_multi_scale_ngff(
pyramid=data,
group=group_data,
fmt=format,
axes=parsed_axes,
coordinate_transformations=None,
storage_options=storage_options,
**metadata,
compute=False,
)
# Compute all pyramid levels at once to allow Dask to optimize the computational graph.
da.compute(*dask_delayed)
assert transformations is not None
overwrite_coordinate_transformations_raster(
group=_get_group_for_writing_transformations(), transformations=transformations, axes=tuple(input_axes)
Expand Down
87 changes: 87 additions & 0 deletions tests/io/test_pyramids_performance.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
from pathlib import Path
from typing import TYPE_CHECKING, Union

import dask
import dask.array
import numpy as np
import pytest
import xarray as xr
import zarr
from datatree import DataTree

from spatialdata import SpatialData
from spatialdata._io import write_image
from spatialdata._io.format import CurrentRasterFormat
from spatialdata.models import Image2DModel

if TYPE_CHECKING:
import _pytest.fixtures


@pytest.fixture
def sdata_with_image(request: "_pytest.fixtures.SubRequest", tmp_path: Path) -> SpatialData:
params = request.param if request.param is not None else {}
width = params.get("width", 2048)
chunksize = params.get("chunk_size", 1024)
scale_factors = params.get("scale_factors", (2,))
# Create a disk-backed Dask array for scale 0.
npg = np.random.default_rng(0)
array = npg.integers(low=0, high=2**16, size=(1, width, width))
array_path = tmp_path / "image.zarr"
dask.array.from_array(array).rechunk(chunksize).to_zarr(array_path)
array_backed = dask.array.from_zarr(array_path)
# Create an in-memory SpatialData with disk-backed scale 0.
image = Image2DModel.parse(array_backed, dims=("c", "y", "x"), scale_factors=scale_factors, chunks=chunksize)
return SpatialData(images={"image": image})


def count_chunks(array: Union[xr.DataArray, xr.Dataset, DataTree]) -> int:
if isinstance(array, DataTree):
array = array.ds
# From `chunksizes`, we get only the number of chunks per axis.
# By multiplying them, we get the total number of chunks in 2D/3D.
return np.prod([len(chunk_sizes) for chunk_sizes in array.chunksizes.values()])


@pytest.mark.parametrize(
("sdata_with_image",),
[
({"width": 32, "chunk_size": 16, "scale_factors": (2,)},),
({"width": 64, "chunk_size": 16, "scale_factors": (2, 2)},),
({"width": 128, "chunk_size": 16, "scale_factors": (2, 2, 2)},),
({"width": 256, "chunk_size": 16, "scale_factors": (2, 2, 2, 2)},),
],
indirect=["sdata_with_image"],
)
def test_write_image_multiscale_performance(sdata_with_image: SpatialData, tmp_path: Path, mocker):
# Writing multiscale images with several pyramid levels should be efficient.
# Specifically, it should not read the input image more often than necessary
# (see issue https://github.com/scverse/spatialdata/issues/577).
# Instead of measuring the time (which would have high variation if not using big datasets),
# we watch the number of read and write accesses and compare to the theoretical number.
zarr_chunk_write_spy = mocker.spy(zarr.core.Array, "__setitem__")
zarr_chunk_read_spy = mocker.spy(zarr.core.Array, "__getitem__")

image_name, image = next(iter(sdata_with_image.images.items()))
element_type_group = zarr.group(store=tmp_path / "sdata.zarr", path="/images")

write_image(
image=image,
group=element_type_group,
name=image_name,
format=CurrentRasterFormat(),
)

# The number of chunks of scale level 0
num_chunks_scale0 = count_chunks(image.scale0 if isinstance(image, DataTree) else image)
# The total number of chunks of all scale levels
num_chunks_all_scales = (
sum(count_chunks(pyramid) for pyramid in image.children.values())
if isinstance(image, DataTree)
else count_chunks(image)
)

actual_num_chunk_writes = zarr_chunk_write_spy.call_count
actual_num_chunk_reads = zarr_chunk_read_spy.call_count
assert actual_num_chunk_writes == num_chunks_all_scales
assert actual_num_chunk_reads == num_chunks_scale0