From e6008fcde5d39a52b6a7c3a41d47981ebc1d4923 Mon Sep 17 00:00:00 2001 From: Brendan Collins Date: Fri, 19 Jun 2026 04:09:23 -0700 Subject: [PATCH] test(fire): cover dask+cupy dispatch and metadata preservation Every fire function registers a dask+cupy backend, but only dnbr had a test that actually ran it. The other six (rdnbr, burn_severity_class, fireline_intensity, flame_length, rate_of_spread, kbdi) exercised that dispatch path with zero coverage. Only dnbr also checked that input attrs, coords, and dims survive the call. Adds a test_numpy_equals_dask_cupy and a test_output_preserves_metadata for each of the six. All 66 fire tests pass on a CUDA host. Tests only, no source change. --- .claude/sweep-test-coverage-state.csv | 1 + xrspatial/tests/test_fire.py | 122 ++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/.claude/sweep-test-coverage-state.csv b/.claude/sweep-test-coverage-state.csv index 9bc639431..fd447f042 100644 --- a/.claude/sweep-test-coverage-state.csv +++ b/.claude/sweep-test-coverage-state.csv @@ -2,6 +2,7 @@ module,last_inspected,issue,severity_max,categories_found,notes aspect,2026-06-02,2742;2829,HIGH,3;4,"#2742: degenerate shapes (1x1/Nx1/1xN) + geodesic boundary modes; tests added all 4 backends, GPU-validated. #2829: northness/eastness method='geodesic' branch was untested (planar only); added correctness (diagonal surface where planar!=geodesic) + 4-backend parity, GPU-validated. all-NaN planar/geodesic returns all-NaN (correct). Inf input -> silent -1/flat on spike cell: possible source bug, out of scope for test-only sweep, not filed. Dedup: rectangular-cell oracle #2781 + cell-size #2780 already merged, not duplicated." contour,2026-06-08,2704;2710;3044,MEDIUM,1;2,"Pass 2 (2026-06-08, deep-sweep test-coverage): re-swept on a CUDA host. Verified issue #2704 is CLOSED (fixed 2026-06-01 via #2749, kernel now uses np.isfinite at contour.py:73-74); the two prior xfail(strict) #2704 pins were already flipped to plain passing assertions in TestInfHandling (test_inf_corner_no_nan_coords / test_neg_inf_corner_no_nan_coords) -- no stale xfail remained. Found one MEDIUM Cat 1+2 gap: no cross-backend parity test fed NaN input -- TestBackendEquivalence uses elevation_raster_no_nans and test_partial_nan is numpy-only, so numpy-interior NaN-skip vs dask NaN-halo (da.overlap) parity at chunk edges was unpinned. Filed #3044, added TestNaNBackendParity (3 tests: dask, cupy, dask+cupy each assert _segments_by_level equality vs numpy on a partial-NaN ramp with a NaN edge row + interior NaN cell inside a non-edge chunk). All 3 RAN and PASSED on a CUDA host; full file 89 passed, 0 skipped. Probed and verified now-resolved: the prior-pass LOW items are no longer real gaps -- the levels=None all-NaN early-return IS asserted (result==[]) on all 4 backends (numpy L148/dask L163/cupy L178/dask+cupy L194) plus geopandas (test_geopandas_all_nan_keeps_crs). LOW (documented, NOT fixed): non-square cellsize (res[0]!=res[1]) still never exercised -- all tests use create_test_raster res (0.5,0.5); probed live that anisotropic coords transform correctly (y scaled 2.0, x scaled 0.5 -> crossing x=1.25, y spans 0..8), works, so it is a LOW coverage gap not a bug. Cat 3 1x1/Nx1/1xN remain rejected by the >=2x2 guard (tested). Test-only PR for #3044; contour.py untouched. | Pass 1 (2026-05-29): added TestInfHandling, TestCRSPropagation, TestNonDefaultDims to test_contour.py (5 passed + 2 strict-xfail on a CUDA host; full file 29 passed, 2 xfailed). All four backends (numpy / cupy / dask+numpy / dask+cupy) were already exercised with cross-backend segment-equality assertions (TestBackendEquivalence), and ran green locally on the CUDA host -- Cat 1 well covered, no new backend tests needed. Cat 2 HIGH (Inf): the marching-squares NaN-skip guard at contour.py:67 uses x!=x which does not catch infinity, so a finite level near a +/-inf corner leaks NaN coordinates into the output. Filed source bug #2704 and added two xfail(strict=True) tests pinning it (+inf and -inf) plus test_inf_far_level_no_crossing covering the safe path where the inf quad classifies as all-above (idx 15) and is skipped before any interpolation. Cat 5 MEDIUM: no test asserted gdf.crs propagation from agg.attrs['crs'] (contour.py:660) -- added test_geopandas_crs_from_attrs (to_epsg()==5070) + test_geopandas_no_crs_attr. Cat 5 MEDIUM: the index-to-coordinate transform (contour.py:644-654) reads agg.dims[0]/[1] coords but no test used non-y/x dims -- added test_lat_lon_dims_coordinate_transform + test_lat_lon_matches_yx_equivalent. PR #2710 (test-only, source untouched). LOW (documented, not fixed): non-square cellsize (cellsize_x != cellsize_y) never exercised -- all tests use res (0.5,0.5); levels=None early-return on all-NaN/all-equal works (probed) but only the explicit-levels all-NaN path is asserted. Cat 3 1x1/Nx1/1xN are rejected by the >=2x2 validation guard and that rejection is already tested (test_too_small, test_minimum_raster)." cost_distance,2026-06-16,3367,MEDIUM,1;2,"Pass (2026-06-16 deep-sweep test-coverage, CUDA host). cost_distance is heavily tested: 1122 test lines for 1354 src lines, all 4 backends parametrized + regression tests for #1191/#880/#1252/#1262/#3340/#3341/#3343/#3344. Found one MEDIUM Cat 1+2 gap: _cost_distance_dask f_min<=0 early return (all-impassable friction, finite max_cost -> da.full NaN preserving chunks) was unreached -- numpy equiv covered by test_source_on_impassable_cell, iterative dask by test_iterative_narrow_corridor, but the bounded map_overlap wrapper shortcut was not. Filed #3367, added test_dask_all_impassable_friction_returns_nan (all-zero friction, dask+numpy chunks(3,3), max_cost=5; asserts all-NaN, dask-backed, npartitions>1). RAN + PASSED; -W error::UserWarning confirms early return taken (no iterative warning). Full file 85 passed on CUDA host. LOW (documented, not fixed): non-square cellsize numeric correctness untested (_make_meta_raster uses res=(2,3) but test_metadata_preserved checks metadata only)." +fire,2026-06-19,,HIGH,1;5,"Cat1 HIGH: dask+cupy dispatch registered but untested for rdnbr/burn_severity_class/fireline_intensity/flame_length/rate_of_spread/kbdi (only dnbr had it). Cat5 MEDIUM: only dnbr asserted attrs/coords/dims preservation. Added 6 test_numpy_equals_dask_cupy + 6 test_output_preserves_metadata; all 66 fire tests pass on a CUDA host. Cat2 LOW (not fixed): Inf inputs untested (pure per-cell math, low risk)." focal,2026-06-10,3220;3219;3225,HIGH,1;2;3;4,"Deep-sweep 2026-06-10 on CUDA host, all 4 backends executed. Filed #3220 (coverage) and added 36 tests in PR branch: Inf inputs for mean/focal_stats (HIGH Cat2 - no Inf test existed anywhere), mean NaN input (HIGH Cat2 - default excludes=[nan] semantics never asserted), 1x1 + 1xN/Nx1 strips (HIGH Cat3), empty 0-row raster numpy-only (MEDIUM Cat3), mean passes=2 == mean(mean) and excludes sentinel -9999 behavioral tests (MEDIUM Cat4), dask+cupy non-default boundary modes for mean/apply/focal_stats (MEDIUM Cat1/4). Bugs surfaced, filed separately (NOT fixed here): #3219 hotspots silently returns all zeros on Inf input (nan global std passes the std==0 guard, all 4 backends); #3225 empty raster works on numpy but crashes cupy (raw CudaAPIError) and dask (map_overlap depth ValueError). hotspots+Inf and non-numpy empty behavior left unpinned until those are fixed. Backend matrix for the 4 public funcs was already solid (all 4 backends + parity); boundary modes covered except dask+cupy. Siblings filed #3214-3217 same day (dtype/docstring/apply-default-func) - no overlap." geotiff,2026-06-12,3266,MEDIUM,1,"Pass 22 (2026-06-12, deep-sweep test-coverage): delta audit of the ~20 commits since pass 21 (06-09..06-12, mostly pack/unpack fixes + #3241 GPU streaming writer + coregister #3254/#3248). Filed #3266 (tests). Cat 1 MEDIUM: pack=True gained working gpu/dask+gpu support in #3240, but three pack features were tested numpy+dask only: float32 width preservation (#3080, test_pack_float_width_3080.py), nodata kwarg fill (#3168, test_pack_nodata_kwarg_3168.py), band-subset per-band SCALE/OFFSET rewrite (#3161, test_pack_band_subset_3161.py). Live probe on this CUDA host: all six gpu/dask+gpu legs pass today (no source bug, pure coverage gap). Added one gpu/dask-gpu parametrized round-trip test per file (6 tests, requires_gpu, RUN+passing locally) and fixed two stale docstrings claiming unpack/pack is CPU-only (wrong since #3075/#3240). Verified NOT gaps this pass: #3128 int64 sentinel tests cover eager+dask+gpu; #3241 streaming writer landed with byte-identical band-first/band-last/BytesIO/small-buffer tests; #3104 scale-zero rejection has gpu legs; #3169 revived the dead compression-corpus oracle gate. Out of scope: coregister=True lives in accessor.py (excluded module); its multi-band + polar gaps are documented as experimental caveats in docs/source/reference/geotiff.rst (#3248). LOW (carried, documented not fixed): Inf as the declared nodata sentinel never tested. || PREVIOUS: Pass 21 (2026-06-09, deep-sweep test-coverage): filed #3114 (tests) + #3112 (source bug). Cat 1 HIGH: to_geotiff(pack=True) round-trip was tested only on numpy and dask+numpy (write/test_pack_3064.py); #3075 made unpack=True work on gpu and dask+gpu reads, but no test packed a GPU-read array back. Live probe on this CUDA host: BOTH GPU legs crash today -- eager gpu raises AttributeError (cupy has no astype, the known cupy 13.6/xarray 2025.12 where/astype incompat) and dask+gpu raises TypeError (numpy fill value inside cupy.where) -- both from _pack's out.fillna(nodata) in _attrs.py; _writers/gpu.py says the pre-dispatch re-pack is supposed to make every write path work. Source bug filed as #3112; test-only PR adds test_pack_round_trip_gpu (gpu + dask-gpu params, requires_gpu, xfail(strict=True) on #3112 so the fix flips them loudly) and fixes the stale module docstring claiming GPU rejects mask_and_scale. Ran on CUDA host: 13 passed, 2 xfailed. Verified NOT gaps this pass (probed before flagging): empty/zero-band writer guard is covered (test_basic.py 2075/2095 blocks incl. gpu + dask + streaming entry points); degenerate shapes covered on all 4 read backends (read/test_degenerate_shapes.py); overview_resampling all 7 modes parametrized; missing_sources raise/warn + invalid, band_nodata first/invalid, unpack on all 4 backends, masked/parse_coordinates/lock/cache/default_name/name-deprecation all exercised; attrs contract per-backend (attrs/test_contract.py). LOW (documented, not fixed): Inf as the declared nodata sentinel is never tested (only one nan+inf data round-trip in test_edge_cases.py). || PREVIOUS: Pass 20 (2026-06-06, deep-sweep test-coverage): filed #2984 and added test_writer.py degenerate-shape GPU write coverage (Cat 1 backend + Cat 3 geometric edge). Read side already covers 1x1/1xN/Nx1 on all 4 backends (read/test_degenerate_shapes.py) and the dask streaming writer covers them (integration/test_dask_pipeline.py); the GPU write path was the gap (smallest shape in gpu/test_writer.py was 2x2). Added test_write_geotiff_gpu_degenerate_round_trip (1x1/1xN/Nx1 x none/deflate) + test_to_geotiff_dask_gpu_degenerate_round_trip (dask+cupy via gpu=True). 9 new tests RUN+passing on a CUDA host. Verified paths work first (not a source bug); transform supplied explicitly via attrs. Wider tree audit (~92k test LOC vs ~33k source): rioxarray-compat (#2961), bbox NaN/Inf/rotated, 8-backend parity matrix, codec round-trips already covered -- no other real gaps. | Pass (2026-06-05 test-coverage sweep): mature module (~31k src / ~124k test LOC, 9 test dirs). Exhaustive existing coverage -- parity/test_backend_matrix.py runs all 4 backends + VRT + HTTP + fsspec; golden_corpus full-manifest parity; read_rioxarray_compat_2961 covers masked/mask_and_scale/parse_coordinates/default_name on eager+dask. Cat1+Cat3 gap found (MEDIUM): degenerate-shape READS (1x1/1xN/Nx1) were tested only on the eager numpy reader (test_edge_cases.py) and the dask streaming WRITE path (integration/test_dask_pipeline.py); the windowed dask READ (chunks=) and GPU READ (gpu=True) on a single-pixel dimension were never exercised (smallest dask-read source in read/test_tiling is 8x8/2x32, parity fixtures 32x32/64x64). Probed: paths work today, no source bug -- pure coverage gap. Added read/test_degenerate_shapes.py (18 tests): dask read x{chunks 1,3,4} x{1x1,1xN,Nx1} + coord/transform/crs parity + GPU read + dask+gpu read. GPU cells RAN and PASSED on this CUDA host (grid-size-1 launch validated). Fixture supplies explicit attrs['transform'] (writer cannot infer pixel size from a 1-element coord axis). Branch deep-sweep-test-coverage-geotiff-degenerate-read-01. NOTE: pre-existing union-merge CRLF/duplicate-record corruption in this CSV left untouched -- appended one clean record; DictReader last-write-wins picks this one." idw,2026-06-04,2919,HIGH,1;4,"cupy/dask+cupy backends untested (Cat1 HIGH); GPU k-reject error path untested (Cat4 MED). Added 6 GPU tests, validated on CUDA host. Inf-in-points (Cat2) and attrs-preservation (Cat5) are LOW, documented not fixed." diff --git a/xrspatial/tests/test_fire.py b/xrspatial/tests/test_fire.py index f0e8673fc..91d6d58fc 100644 --- a/xrspatial/tests/test_fire.py +++ b/xrspatial/tests/test_fire.py @@ -209,6 +209,26 @@ def test_numpy_equals_cupy(self): np.testing.assert_allclose(cp_r.data.get(), np_r.data, rtol=1e-5, equal_nan=True) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self): + rng = np.random.default_rng(42) + d = rng.uniform(-1, 1, (6, 8)).astype('f4') + p = rng.uniform(0.01, 1.0, (6, 8)).astype('f4') * 1000 + np_r = rdnbr(create_test_raster(d, 'numpy'), + create_test_raster(p, 'numpy')) + dc_r = rdnbr(create_test_raster(d, 'dask+cupy'), + create_test_raster(p, 'dask+cupy')) + np.testing.assert_allclose(dc_r.data.compute().get(), np_r.data, + rtol=1e-5, equal_nan=True) + + def test_output_preserves_metadata(self): + d = np.array([[0.4, 0.3], [0.5, 0.1]], dtype=np.float32) + p = np.array([[500.0, 200.0], [800.0, 100.0]], dtype=np.float32) + d_agg = create_test_raster(d) + result = rdnbr(d_agg, create_test_raster(p)) + general_output_checks(d_agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # Burn severity class @@ -269,6 +289,21 @@ def test_numpy_equals_cupy(self): cp_r = burn_severity_class(create_test_raster(data, 'cupy')) np.testing.assert_array_equal(cp_r.data.get(), np_r.data) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self): + rng = np.random.default_rng(99) + data = rng.uniform(-1, 1, (8, 10)).astype('f4') + np_r = burn_severity_class(create_test_raster(data, 'numpy')) + dc_r = burn_severity_class(create_test_raster(data, 'dask+cupy')) + np.testing.assert_array_equal(dc_r.data.compute().get(), np_r.data) + + def test_output_preserves_metadata(self): + vals = np.array([[-0.5, 0.3], [0.7, 0.1]], dtype=np.float32) + agg = create_test_raster(vals) + result = burn_severity_class(agg) + general_output_checks(agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # Fireline intensity @@ -326,6 +361,26 @@ def test_numpy_equals_cupy(self): np.testing.assert_allclose(cp_r.data.get(), np_r.data, rtol=1e-5, equal_nan=True) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self): + rng = np.random.default_rng(7) + f = rng.uniform(0, 5, (6, 8)).astype('f4') + s = rng.uniform(0, 1, (6, 8)).astype('f4') + np_r = fireline_intensity(create_test_raster(f, 'numpy'), + create_test_raster(s, 'numpy')) + dc_r = fireline_intensity(create_test_raster(f, 'dask+cupy'), + create_test_raster(s, 'dask+cupy')) + np.testing.assert_allclose(dc_r.data.compute().get(), np_r.data, + rtol=1e-5, equal_nan=True) + + def test_output_preserves_metadata(self): + f = np.array([[2.0, 0.5], [1.0, 0.3]], dtype=np.float32) + s = np.array([[0.1, 0.2], [0.3, 0.4]], dtype=np.float32) + f_agg = create_test_raster(f) + result = fireline_intensity(f_agg, create_test_raster(s)) + general_output_checks(f_agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # Flame length @@ -382,6 +437,19 @@ def test_numpy_equals_cupy(self, intensity_data): np.testing.assert_allclose(cp_r.data.get(), np_r.data, rtol=1e-5, equal_nan=True) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self, intensity_data): + np_r = flame_length(create_test_raster(intensity_data, 'numpy')) + dc_r = flame_length(create_test_raster(intensity_data, 'dask+cupy')) + np.testing.assert_allclose(dc_r.data.compute().get(), np_r.data, + rtol=1e-5, equal_nan=True) + + def test_output_preserves_metadata(self, intensity_data): + agg = create_test_raster(intensity_data) + result = flame_length(agg) + general_output_checks(agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # Rate of spread (Rothermel) @@ -514,6 +582,31 @@ def test_numpy_equals_cupy(self, ros_inputs): np.testing.assert_allclose(cp_r.data.get(), np_r.data, rtol=1e-4, equal_nan=True) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self, ros_inputs): + slope, wind, moisture = ros_inputs + np_r = rate_of_spread( + create_test_raster(slope, 'numpy'), + create_test_raster(wind, 'numpy'), + create_test_raster(moisture, 'numpy'), + ) + dc_r = rate_of_spread( + create_test_raster(slope, 'dask+cupy'), + create_test_raster(wind, 'dask+cupy'), + create_test_raster(moisture, 'dask+cupy'), + ) + np.testing.assert_allclose(dc_r.data.compute().get(), np_r.data, + rtol=1e-4, equal_nan=True) + + def test_output_preserves_metadata(self, ros_inputs): + slope, wind, moisture = ros_inputs + slope_agg = create_test_raster(slope) + result = rate_of_spread(slope_agg, + create_test_raster(wind), + create_test_raster(moisture)) + general_output_checks(slope_agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # KBDI @@ -629,6 +722,35 @@ def test_numpy_equals_cupy(self): np.testing.assert_allclose(cp_r.data.get(), np_r.data, rtol=1e-5, equal_nan=True) + @dask_array_available + @cuda_and_cupy_available + def test_numpy_equals_dask_cupy(self): + rng = np.random.default_rng(123) + prev = rng.uniform(0, 400, (6, 8)).astype('f4') + temp = rng.uniform(15, 40, (6, 8)).astype('f4') + precip = rng.uniform(0, 20, (6, 8)).astype('f4') + np_r = kbdi(create_test_raster(prev, 'numpy'), + create_test_raster(temp, 'numpy'), + create_test_raster(precip, 'numpy'), + annual_precip=1200.0) + dc_r = kbdi(create_test_raster(prev, 'dask+cupy'), + create_test_raster(temp, 'dask+cupy'), + create_test_raster(precip, 'dask+cupy'), + annual_precip=1200.0) + np.testing.assert_allclose(dc_r.data.compute().get(), np_r.data, + rtol=1e-5, equal_nan=True) + + def test_output_preserves_metadata(self): + prev = np.array([[100.0, 200.0], [300.0, 50.0]], dtype=np.float32) + temp = np.array([[30.0, 25.0], [35.0, 20.0]], dtype=np.float32) + precip = np.array([[0.0, 5.0], [2.0, 10.0]], dtype=np.float32) + prev_agg = create_test_raster(prev) + result = kbdi(prev_agg, + create_test_raster(temp), + create_test_raster(precip), + annual_precip=1500.0) + general_output_checks(prev_agg, result, verify_dtype=False) + # --------------------------------------------------------------------------- # Accessor smoke tests