Update ulab from upstream again

This commit is contained in:
Jeff Epler 2020-02-27 14:14:05 -06:00
parent 645df931ae
commit 39cfe32c34
4 changed files with 35 additions and 43 deletions

@ -1 +1 @@
Subproject commit 6b9ea24b2e57e200d9e2e0f41f6836b1fd73c348 Subproject commit 42d831e1e65b1c75ed90de11b87a1c4a0ebe6152

View File

@ -107,14 +107,15 @@ endif
ifeq ($(MICROPY_PY_ULAB),1) ifeq ($(MICROPY_PY_ULAB),1)
SRC_MOD += $(addprefix extmod/ulab/code/, \ SRC_MOD += $(addprefix extmod/ulab/code/, \
filter.c \ create.c \
fft.c \ fft.c \
filter.c \
linalg.c \ linalg.c \
ndarray.c \ ndarray.c \
numerical.c \ numerical.c \
poly.c \ poly.c \
vectorise.c \
ulab.c \ ulab.c \
vectorise.c \
) )
CFLAGS_MOD += -DMICROPY_PY_ULAB=1 -DMODULE_ULAB_ENABLED=1 CFLAGS_MOD += -DMICROPY_PY_ULAB=1 -DMODULE_ULAB_ENABLED=1
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-sign-compare -Wno-missing-prototypes -Wno-unused-parameter -Wno-missing-declarations -Wno-error -Wno-shadow -Wno-maybe-uninitialized -DCIRCUITPY $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-sign-compare -Wno-missing-prototypes -Wno-unused-parameter -Wno-missing-declarations -Wno-error -Wno-shadow -Wno-maybe-uninitialized -DCIRCUITPY

View File

@ -129,8 +129,6 @@ Array type codes
Basic Array defining functions Basic Array defining functions
------------------------------ ------------------------------
See also `ulab.linalg.eye` and `ulab.numerical.linspace` for other useful
array defining functions.
.. method:: ones(shape, \*, dtype=float) .. method:: ones(shape, \*, dtype=float)
@ -158,6 +156,33 @@ array defining functions.
Return a new square array of size, with the diagonal elements set to 1 Return a new square array of size, with the diagonal elements set to 1
and the other elements set to 0. and the other elements set to 0.
.. method:: linspace(start, stop, \*, dtype=float, num=50, endpoint=True)
.. param: start
First value in the array
.. param: stop
Final value in the array
.. param int: num
Count of values in the array
.. param: dtype
Type of values in the array
.. param bool: endpoint
Whether the ``stop`` value is included. Note that even when
endpoint=True, the exact ``stop`` value may not be included due to the
inaccuracy of floating point arithmetic.
Return a new 1-D array with ``num`` elements ranging from ``start`` to ``stop`` linearly.
:mod:`ulab.vector` --- Element-by-element functions :mod:`ulab.vector` --- Element-by-element functions
=================================================== ===================================================
@ -288,14 +313,6 @@ much more efficient than expressing the same operation as a Python loop.
Computes the eigenvalues and eigenvectors of a square matrix Computes the eigenvalues and eigenvectors of a square matrix
.. method:: eye(size, \*, dtype=float)
:param int: size - The number of rows and columns in the matrix
Returns a square matrix with all the diagonal elements set to 1 and all
other elements set to 0
.. method:: inv(m) .. method:: inv(m)
:param ~ulab.array m: a square matrix :param ~ulab.array m: a square matrix
@ -387,32 +404,6 @@ operate over the flattened array (None), rows (0), or columns (1).
Returns a new array that reverses the order of the elements along the Returns a new array that reverses the order of the elements along the
given axis, or along all axes if axis is None. given axis, or along all axes if axis is None.
.. method:: linspace(start, stop, \*, dtype=float, num=50, endpoint=True)
.. param: start
First value in the array
.. param: stop
Final value in the array
.. param int: num
Count of values in the array
.. param: dtype
Type of values in the array
.. param bool: endpoint
Whether the ``stop`` value is included. Note that even when
endpoint=True, the exact ``stop`` value may not be included due to the
inaccuracy of floating point arithmetic.
Return a new 1-D array with ``num`` elements ranging from ``start`` to ``stop`` linearly.
.. method:: max(array, \*, axis=None) .. method:: max(array, \*, axis=None)
Return the maximum element of the 1D array, as an array with 1 element Return the maximum element of the 1D array, as an array with 1 element

View File

@ -12,7 +12,7 @@ ulab.array([1,2,3], dtype=ulab.uint16)
ulab.array([1,2,3], dtype=ulab.float) ulab.array([1,2,3], dtype=ulab.float)
ulab.zeros(3) ulab.zeros(3)
ulab.ones(3) ulab.ones(3)
a = ulab.linalg.eye(3) a = ulab.eye(3)
a.shape a.shape
a.size a.size
a.itemsize a.itemsize
@ -33,7 +33,7 @@ a[0]
a[:] a[:]
a[0] = 0 a[0] = 0
a[:] = ulab.zeros((3,3)) a[:] = ulab.zeros((3,3))
a = ulab.linalg.eye(3) a = ulab.eye(3)
ulab.vector.acos(a) ulab.vector.acos(a)
ulab.vector.acosh(a) ulab.vector.acosh(a)
ulab.vector.asin(a) ulab.vector.asin(a)
@ -62,8 +62,8 @@ ulab.linalg.inv(a)
ulab.linalg.eig(a) ulab.linalg.eig(a)
ulab.linalg.det(a) ulab.linalg.det(a)
ulab.filter.convolve(ulab.array([1,2,3]), ulab.array([1,10,100,1000])) ulab.filter.convolve(ulab.array([1,2,3]), ulab.array([1,10,100,1000]))
ulab.numerical.linspace(0, 10, num=3) ulab.linspace(0, 10, num=3)
a = ulab.numerical.linspace(0, 10, num=256, endpoint=True) a = ulab.linspace(0, 10, num=256, endpoint=True)
ulab.fft.spectrum(a) ulab.fft.spectrum(a)
p, q = ulab.fft.fft(a) p, q = ulab.fft.fft(a)
ulab.fft.ifft(p) ulab.fft.ifft(p)