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.

Sign up for GitHub

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

Add image is close test helper #1244

Merged
merged 1 commit into from
Jul 4, 2023
Merged

Add image is close test helper #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions datashader/tests/test_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,20 @@ def assert_eq_ndarray(data, b, close=False):
np.testing.assert_equal(data, b)


def assert_image_close(image0, image1, tolerance):
def to_rgba_xr(image):
data = image.data
if cupy and isinstance(data, cupy.ndarray):
data = cupy.asnumpy(data)
shape = data.shape
data = data.view(np.uint8).reshape(shape + (4,))
return xr.DataArray(data, dims=image.dims + ("rgba",), coords=image.coords)

da0 = to_rgba_xr(image0)
da1 = to_rgba_xr(image1)
xr.testing.assert_allclose(da0, da1, atol=tolerance, rtol=0)


def floats(n):
"""Returns contiguous list of floats from initial point"""
while True:
Expand Down
9 changes: 2 additions & 7 deletions datashader/tests/test_transfer_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import PIL
import pytest
import datashader.transfer_functions as tf
from datashader.tests.test_pandas import assert_eq_ndarray, assert_eq_xr
from datashader.tests.test_pandas import assert_eq_ndarray, assert_eq_xr, assert_image_close

coords = dict([('x_axis', [3, 4, 5]), ('y_axis', [0, 1, 2])])
dims = ['y_axis', 'x_axis']
Expand Down Expand Up @@ -170,12 +170,7 @@ def test_shade(agg, attr, span):

img = tf.shade(x, cmap=cmap, how='eq_hist', rescale_discrete_levels=True)
sol = tf.Image(eq_hist_sol_rescale_discrete_levels[attr], coords=coords, dims=dims)
if cupy and attr=='a' and isinstance(agg.a.data, cupy.ndarray):
# cupy eq_hist has slightly different numerics hence slightly different RGBA results
sol = sol.copy(deep=True)
sol[2, 0] = sol[2, 0] - 0x100

assert_eq_xr(img, sol)
assert_image_close(img, sol, tolerance=1)

img = tf.shade(x, cmap=cmap,
how=lambda x, mask: np.where(mask, np.nan, x ** 2))
Expand Down