Skip to content

Commit 6f5b443

Browse files
committed
fix #234 : implemented support for np.__array_ufunc__
merged ufuncs.py content into npufuncs.py
1 parent 40c8dd9 commit 6f5b443

File tree

7 files changed

+600
-456
lines changed

7 files changed

+600
-456
lines changed

doc/source/changes/version_0_32.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ New features
4949
Miscellaneous improvements
5050
^^^^^^^^^^^^^^^^^^^^^^^^^^
5151

52-
* improved something.
52+
* made it possible to pass LArray objects to Numpy ufuncs directly (e.g. np.sqrt(ndtest(3)), closes :issue:`234`).
5353

5454

5555
Fixes

larray/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
from larray.core.session import Session, local_arrays, global_arrays, arrays
1313
from larray.core.constants import nan, inf, pi, e, euler_gamma
1414
from larray.core.metadata import Metadata
15-
from larray.core.ufuncs import wrap_elementwise_array_func, maximum, minimum, where
16-
from larray.core.npufuncs import (sin, cos, tan, arcsin, arccos, arctan, hypot, arctan2, degrees,
15+
from larray.core.npufuncs import (wrap_elementwise_array_func, maximum, minimum, where,
16+
sin, cos, tan, arcsin, arccos, arctan, hypot, arctan2, degrees,
1717
radians, unwrap, sinh, cosh, tanh, arcsinh, arccosh, arctanh,
1818
angle, real, imag, conj,
1919
round, around, round_, rint, fix, floor, ceil, trunc,

larray/core/array.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
from larray.core.constants import nan
5858
from larray.core.metadata import Metadata
5959
from larray.core.expr import ExprNode
60+
from larray.core.npufuncs import SupportsNumpyUfuncs
6061
from larray.core.group import (Group, IGroup, LGroup, remove_nested_groups, _to_key, _to_keys,
6162
_translate_sheet_name, _translate_group_key_hdf)
6263
from larray.core.axis import Axis, AxisReference, AxisCollection, X, _make_axis
@@ -700,7 +701,7 @@ def _handle_meta(meta, title):
700701
return Metadata(meta)
701702

702703

703-
class LArray(ABCLArray):
704+
class LArray(ABCLArray, SupportsNumpyUfuncs):
704705
r"""
705706
A LArray object represents a multidimensional, homogeneous array of fixed-size items with labeled axes.
706707

0 commit comments

Comments
 (0)