xarray-spatial 0.10.14__tar.gz → 0.10.15__tar.gz

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15}/CHANGELOG.md

@@ -2,6 +2,12 @@
 -----------
 
 
+### Version 0.10.15 - 2026-06-29
+
+#### Bug fixes and improvements
+- terrain: map the generate_terrain dask backends over an empty skeleton so from_template grids no longer drop out of the task graph (#3575)
+
+
 ### Version 0.10.14 - 2026-06-28
 
 #### New features

{xarray_spatial-0.10.14/xarray_spatial.egg-info → xarray_spatial-0.10.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xarray-spatial
-Version: 0.10.14
+Version: 0.10.15
 Summary: xarray-based spatial analysis tools
 Home-page: https://github.com/xarray-contrib/xarray-spatial
 Author: Xarray-Spatial Developers

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15/xarray_spatial.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xarray-spatial
-Version: 0.10.14
+Version: 0.10.15
 Summary: xarray-based spatial analysis tools
 Home-page: https://github.com/xarray-contrib/xarray-spatial
 Author: Xarray-Spatial Developers

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15}/xarray_spatial.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "0.10.14",
+  "tag": "0.10.15",
   "distance": 0,
-  "node": "g6383eada5f919f5761fab1f3e95fc565a3d402a0",
+  "node": "g76ebd7e2bb92d00c19f2b12b4bc1c3986edbb4ed",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-06-29"

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15}/xrspatial/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.10.14'
-__version_tuple__ = version_tuple = (0, 10, 14)
+__version__ = version = '0.10.15'
+__version_tuple__ = version_tuple = (0, 10, 15)
 
-__commit_id__ = commit_id = 'g6383eada5'
+__commit_id__ = commit_id = 'g76ebd7e2b'

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15}/xrspatial/terrain.py

@@ -378,6 +378,13 @@ def _terrain_dask_numpy(data, seed, x_range_scaled, y_range_scaled, zfactor,
     """
     height, width = data.shape
 
+    # The chunk functions below regenerate every cell from coordinates and
+    # never read the incoming block values.  Map over an uninitialised
+    # skeleton with the same shape/chunking so the (NaN-filled) template the
+    # caller passed in — e.g. from_template()'s da.full — drops out of the
+    # graph instead of being memset and then thrown away.
+    skeleton = da.empty_like(data, dtype=np.float32)
+
     # --- worley pre-pass: get global min/max to avoid per-chunk seams ---
     w_norm_range = None
     if worley_blend > 0:
@@ -417,7 +424,7 @@ def _terrain_dask_numpy(data, seed, x_range_scaled, y_range_scaled, zfactor,
             return _worley_numpy_xy(w_p, x_arr, y_arr)
 
         raw_worley = da.map_blocks(
-            _chunk_worley_raw, data, dtype=np.float32,
+            _chunk_worley_raw, skeleton, dtype=np.float32,
             meta=np.array((), dtype=np.float32),
         )
         (raw_worley,) = dask.persist(raw_worley)
@@ -452,7 +459,7 @@ def _terrain_dask_numpy(data, seed, x_range_scaled, y_range_scaled, zfactor,
         out *= zfactor
         return out
 
-    return da.map_blocks(_chunk_terrain, data, dtype=np.float32,
+    return da.map_blocks(_chunk_terrain, skeleton, dtype=np.float32,
                          meta=np.array((), dtype=np.float32),
                          **_dask_task_name_kwargs('xrspatial.terrain'))
 
@@ -634,9 +641,13 @@ def _terrain_dask_cupy(data, seed, x_range_scaled, y_range_scaled, zfactor,
     computes global worley noise range so normalization is consistent across
     chunk boundaries.
     """
-    data = data * 0
     height, width = data.shape
 
+    # See _terrain_dask_numpy: the chunk functions regenerate every cell from
+    # coordinates and never read block values, so map over an uninitialised
+    # skeleton instead of materialising (and discarding) the template's fill.
+    skeleton = da.empty_like(data, dtype=cupy.float32)
+
     # --- worley pre-pass: get global min/max to avoid per-chunk seams ---
     w_norm_range = None
     if worley_blend > 0:
@@ -691,7 +702,7 @@ def _terrain_dask_cupy(data, seed, x_range_scaled, y_range_scaled, zfactor,
             return w_noise
 
         raw_worley = da.map_blocks(
-            _chunk_worley_raw, data, dtype=cupy.float32,
+            _chunk_worley_raw, skeleton, dtype=cupy.float32,
             meta=cupy.array((), dtype=cupy.float32),
         )
         (raw_worley,) = dask.persist(raw_worley)
@@ -719,7 +730,7 @@ def _terrain_dask_cupy(data, seed, x_range_scaled, y_range_scaled, zfactor,
         )
         return out
 
-    data = da.map_blocks(_chunk_terrain, data, dtype=cupy.float32,
+    data = da.map_blocks(_chunk_terrain, skeleton, dtype=cupy.float32,
                          meta=cupy.array((), dtype=cupy.float32),
                          **_dask_task_name_kwargs('xrspatial.terrain'))
 

{xarray_spatial-0.10.14 → xarray_spatial-0.10.15}/xrspatial/tests/test_terrain.py

@@ -530,6 +530,63 @@ def test_terrain_all_nan_template_dask_cupy_matches_numpy():
                                rtol=1e-4, atol=1e-4)
 
 
+# =====================================================================
+# Issue #3574: the dask backends regenerate every cell from coordinates
+# and must not materialize the template's values.  Mapping over a
+# da.empty_like skeleton drops the template (e.g. from_template's
+# da.full(nan)) out of the graph entirely.
+# =====================================================================
+
+def _poisoned_template(backend='dask'):
+    """A dask template whose blocks raise if they are ever computed.
+
+    generate_terrain regenerates terrain from coordinates and never reads
+    these values, so its result must compute without tripping the poison.
+    """
+    def _boom(block):
+        raise AssertionError("template values were materialized")
+
+    if has_cuda_and_cupy() and 'cupy' in backend:
+        import cupy
+        base = da.zeros((50, 50), chunks=(10, 10), dtype=cupy.float32,
+                        meta=cupy.array((), dtype=cupy.float32))
+        poisoned = da.map_blocks(_boom, base, dtype=cupy.float32,
+                                 meta=cupy.array((), dtype=cupy.float32))
+    else:
+        base = da.zeros((50, 50), chunks=(10, 10), dtype=np.float32)
+        poisoned = da.map_blocks(_boom, base, dtype=np.float32,
+                                 meta=np.array((), dtype=np.float32))
+    return xr.DataArray(poisoned, dims=['y', 'x'])
+
+
+@dask_array_available
+@pytest.mark.parametrize("worley_blend", [0.0, 0.2])
+def test_terrain_dask_does_not_materialize_template(worley_blend):
+    """The template's values must never be read; mapping over an empty
+    skeleton keeps them out of the graph (both map_blocks call sites)."""
+    terrain = generate_terrain(_poisoned_template(), worley_blend=worley_blend)
+    result = terrain.compute()  # raises if the template were materialized
+    assert np.isfinite(result.data).all()
+
+
+@dask_array_available
+def test_terrain_dask_skeleton_matches_numpy():
+    """Swapping the template for an empty skeleton must not change output."""
+    expected = generate_terrain(create_test_arr()).data
+    actual = generate_terrain(_poisoned_template()).compute().data
+    np.testing.assert_allclose(actual, expected, rtol=1e-5, atol=1e-7)
+
+
+@cuda_and_cupy_available
+@dask_array_available
+@pytest.mark.parametrize("worley_blend", [0.0, 0.2])
+def test_terrain_dask_cupy_does_not_materialize_template(worley_blend):
+    terrain = generate_terrain(_poisoned_template(backend='dask+cupy'),
+                               worley_blend=worley_blend)
+    result = terrain.compute()
+    assert np.isfinite(result.data.get()).all()
+
+
 # ---------------------------------------------------------------------------
 # Fused numpy fast path (worley off) -- independent correctness anchor
 # ---------------------------------------------------------------------------