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

LAMA to Dask: func -> built-in conversion for non-trig. methods #308

Merged
merged 12 commits into from
Feb 2, 2022
Merged

LAMA to Dask: func -> built-in conversion for non-trig. methods #308

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2dcc8a9
Convert Data.exp from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
5c50bc4
Convert Data.floor from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
9ad5fe6
Convert Data.rint from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
07f6b0f
Convert Data.round from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
854d9ec
Convert Data.trunc from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
4f39970
Convert Data.ceil from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
cf3c850
Convert Data.log from use of func() to use of Dask built-in
sadielbartholomew Feb 1, 2022
0349624
Fix #303 by reinstating Data.log test which passes after np.->da.log
sadielbartholomew Feb 1, 2022
27ad428
Update cf/data/data.py: improve units change in Data.log
sadielbartholomew Feb 2, 2022
58577e9
Update cf/test/test_Data.py: test units in Data.log unit test
sadielbartholomew Feb 2, 2022
70258a9
Convert error message from format-string to f-string
sadielbartholomew Feb 2, 2022
5956404
Update test_Data_log comment to indicate specific units testing
sadielbartholomew Feb 2, 2022
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
52 changes: 38 additions & 14 deletions cf/data/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2824,6 +2824,7 @@ def can_compute(self, functions=None, log_levels=None, override=False):

@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def ceil(self, inplace=False, i=False):
"""The ceiling of the data, element-wise.

Expand Down Expand Up @@ -2855,7 +2856,10 @@ def ceil(self, inplace=False, i=False):
[-1. -1. -1. -1. 0. 1. 2. 2. 2.]

"""
return self.func(np.ceil, inplace=inplace)
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()
d._set_dask(da.ceil(dx), reset_mask_hardness=False)
return d

@daskified(_DASKIFIED_VERBOSE)
@_inplace_enabled(default=False)
Expand Down Expand Up @@ -9219,7 +9223,8 @@ def exp(self, inplace=False, i=False):
if d.Units:
sadielbartholomew marked this conversation as resolved.
Show resolved Hide resolved
d.Units = _units_1

d.func(np.exp, inplace=True)
dx = d._get_dask()
d._set_dask(da.exp(dx), reset_mask_hardness=False)

return d

Expand Down Expand Up @@ -10137,6 +10142,7 @@ def flatten(self, axes=None, inplace=False):

@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def floor(self, inplace=False, i=False):
"""Return the floor of the data array.

Expand All @@ -10163,7 +10169,10 @@ def floor(self, inplace=False, i=False):
[-2. -2. -2. -1. 0. 1. 1. 1. 1.]

"""
return self.func(np.floor, inplace=inplace)
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()
d._set_dask(da.floor(dx), reset_mask_hardness=False)
return d

@_deprecated_kwarg_check("i")
def outerproduct(self, e, inplace=False, i=False):
Expand Down Expand Up @@ -11022,6 +11031,7 @@ def isclose(self, y, rtol=None, atol=None):

@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def rint(self, inplace=False, i=False):
"""Round the data to the nearest integer, element-wise.

Expand Down Expand Up @@ -11050,7 +11060,10 @@ def rint(self, inplace=False, i=False):
[-2. -2. -1. -1. 0. 1. 1. 2. 2.]

"""
return self.func(np.rint, inplace=inplace)
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()
d._set_dask(da.rint(dx), reset_mask_hardness=False)
return d

def root_mean_square(
self,
Expand Down Expand Up @@ -11133,6 +11146,7 @@ def root_mean_square(

@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def round(self, decimals=0, inplace=False, i=False):
"""Evenly round elements of the data array to the given number
of decimals.
Expand Down Expand Up @@ -11176,7 +11190,10 @@ def round(self, decimals=0, inplace=False, i=False):
[-0., -0., -0., -0., 0., 0., 0., 0., 0.]

"""
return self.func(np.round, inplace=inplace, decimals=decimals)
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()
d._set_dask(da.round(dx, decimals=decimals), reset_mask_hardness=False)
return d

def stats(
self,
Expand Down Expand Up @@ -11999,9 +12016,7 @@ def tanh(self, inplace=False):

return d

# TODOASK: daskified except in the case of arbitrary base (not e, 2 or 10)
# which requires `__itruediv__` to be daskified.
# @daskified(_DASKIFIED_VERBOSE)
@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def log(self, base=None, inplace=False, i=False):
Expand All @@ -12021,16 +12036,21 @@ def log(self, base=None, inplace=False, i=False):

"""
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()

if base is None:
d.func(np.log, units=_units_1, inplace=True)
dx = da.log(dx)
elif base == 10:
d.func(np.log10, units=_units_1, inplace=True)
dx = da.log10(dx)
elif base == 2:
d.func(np.log2, units=_units_1, inplace=True)
dx = da.log2(dx)
else:
d.func(np.log, units=_units_1, inplace=True)
d /= np.log(base)
dx = da.log(dx)
dx /= da.log(base)

d._set_dask(dx, reset_mask_hardness=False)

d._Units = _units_1 # all logarithm outputs are unitless
sadielbartholomew marked this conversation as resolved.
Show resolved Hide resolved

return d

Expand Down Expand Up @@ -12302,6 +12322,7 @@ def transpose(self, axes=None, inplace=False, i=False):

@daskified(_DASKIFIED_VERBOSE)
@_deprecated_kwarg_check("i")
@_inplace_enabled(default=False)
def trunc(self, inplace=False, i=False):
"""Return the truncated values of the data array.

Expand Down Expand Up @@ -12332,7 +12353,10 @@ def trunc(self, inplace=False, i=False):
[-1. -1. -1. -1. 0. 1. 1. 1. 1.]

"""
return self.func(np.trunc, inplace=inplace)
d = _inplace_enabled_define_and_cleanup(self)
dx = d._get_dask()
d._set_dask(da.trunc(dx), reset_mask_hardness=False)
return d

@classmethod
def empty(
Expand Down
14 changes: 6 additions & 8 deletions cf/test/test_Data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,14 +3391,12 @@ def test_Data_log(self):
self.assertEqual(d.shape, b.shape)

# Test an arbitrary base, using 4 (not a special managed case like 10)
# TODODASK: reinstate this assertion once mask property is
# daskified.
# a = np.array([[4, 16, 4**3.5], [0, 1, 0.25]])
# b = np.log(a) / np.log(4) # the numpy way, using log rules from school
# c = cf.Data(a, "s")
# d = c.log(base=4)
# self.assertTrue((d.array == b).all())
# self.assertEqual(d.shape, b.shape)
a = np.array([[4, 16, 4 ** 3.5], [0, 1, 0.25]])
b = np.log(a) / np.log(4) # the numpy way, using log rules from school
c = cf.Data(a, "s")
d = c.log(base=4)
self.assertTrue((d.array == b).all())
self.assertEqual(d.shape, b.shape)
sadielbartholomew marked this conversation as resolved.
Show resolved Hide resolved

# Text values outside of the restricted domain for a log
a = np.array([0, -1, -2])
Expand Down