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 trig. methods #309

Merged
merged 9 commits into from
Feb 4, 2022
Merged

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

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
71df26d
Convert Data.sin from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
3f80e8a
Convert Data.cos from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
ce55ad0
Convert Data.tan from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
59a571f
Convert Data.sinh from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
5a482fc
Convert Data.cosh from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
1832c86
Convert Data.tanh from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
42b9fd4
Convert Data.arctan from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
dd426af
Convert Data.arcsinh from use of func() to use of Dask built-in
sadielbartholomew Feb 2, 2022
49ef9f6
Add comments RE why Data.func is used for restricted-domain methods
sadielbartholomew Feb 3, 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
57 changes: 45 additions & 12 deletions cf/data/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6696,7 +6696,10 @@ def arctan(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

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

d.override_units(_units_radians, inplace=True)

return d

Expand Down Expand Up @@ -6784,7 +6787,9 @@ def arctanh(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

# preserve_invalid necessary because arctanh has a restricted domain
# Data.func is used instead of the Dask built-in in this case because
# arctanh has a restricted domain therefore it is necessary to use our
# custom logic implemented via the `preserve_invalid` keyword to func.
d.func(
np.arctanh,
units=_units_radians,
Expand Down Expand Up @@ -6837,7 +6842,9 @@ def arcsin(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

# preserve_invalid necessary because arcsin has a restricted domain
# Data.func is used instead of the Dask built-in in this case because
# arcsin has a restricted domain therefore it is necessary to use our
# custom logic implemented via the `preserve_invalid` keyword to func.
d.func(
np.arcsin,
units=_units_radians,
Expand Down Expand Up @@ -6888,7 +6895,10 @@ def arcsinh(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

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

d.override_units(_units_radians, inplace=True)

return d

Expand Down Expand Up @@ -6936,7 +6946,9 @@ def arccos(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

# preserve_invalid necessary because arccos has a restricted domain
# Data.func is used instead of the Dask built-in in this case because
# arccos has a restricted domain therefore it is necessary to use our
# custom logic implemented via the `preserve_invalid` keyword to func.
d.func(
np.arccos,
units=_units_radians,
Expand Down Expand Up @@ -6989,7 +7001,9 @@ def arccosh(self, inplace=False):
"""
d = _inplace_enabled_define_and_cleanup(self)

# preserve_invalid necessary because arccosh has a restricted domain
# Data.func is used instead of the Dask built-in in this case because
# arccosh has a restricted domain therefore it is necessary to use our
# custom logic implemented via the `preserve_invalid` keyword to func.
d.func(
np.arccosh,
units=_units_radians,
Expand Down Expand Up @@ -8585,7 +8599,10 @@ def cos(self, inplace=False, i=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

Expand Down Expand Up @@ -11840,7 +11857,10 @@ def sin(self, inplace=False, i=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

Expand Down Expand Up @@ -11898,7 +11918,11 @@ def sinh(self, inplace=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

@daskified(_DASKIFIED_VERBOSE)
Expand Down Expand Up @@ -11953,7 +11977,10 @@ def cosh(self, inplace=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

Expand Down Expand Up @@ -12012,7 +12039,10 @@ def tanh(self, inplace=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

Expand Down Expand Up @@ -12223,7 +12253,10 @@ def tan(self, inplace=False, i=False):
if d.Units.equivalent(_units_radians):
d.Units = _units_radians

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

d.override_units(_units_1, inplace=True)

return d

Expand Down