djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3694 from jepler/update-ulab2

Browse Source 
ulab: Update to release tag 1.1.0
This commit is contained in:
Scott Shawcroft 2020-11-23 15:17:46 -08:00 committed by GitHub
commit f8dcb25170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 110 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/ulab

@ -1 +1 @@
Subproject commit 8242b84753355433b61230ab6631c06e5ac77f35
Subproject commit aa7e741530df471d206a4a321823a37a913a0eb8

147
locale/circuitpython.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-11-10 15:30+0530\n"
"POT-Creation-Date: 2020-11-23 10:10-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -855,6 +855,10 @@ msgstr ""
msgid "FFT is defined for ndarrays only"
msgstr ""
#: extmod/ulab/code/fft/fft.c
msgid "FFT is implemented for linear arrays only"
msgstr ""
#: ports/esp32s2/common-hal/socketpool/Socket.c
msgid "Failed SSL handshake"
msgstr ""
@ -1951,7 +1955,7 @@ msgstr ""
msgid "WARNING: Your code filename has two extensions\n"
msgstr ""
#: shared-bindings/watchdog/WatchDogTimer.c
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
msgstr ""
@ -2030,10 +2034,6 @@ msgstr ""
msgid "addresses is empty"
msgstr ""
#: extmod/ulab/code/vector/vectorise.c
msgid "arctan2 is implemented for scalars and ndarrays only"
msgstr ""
#: py/modbuiltins.c
msgid "arg is an empty sequence"
msgstr ""
@ -2042,6 +2042,10 @@ msgstr ""
msgid "argsort argument must be an ndarray"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "argsort is not implemented for flattened arrays"
msgstr ""
#: py/runtime.c
msgid "argument has wrong type"
msgstr ""
@ -2059,14 +2063,22 @@ msgstr ""
msgid "argument should be a '%q' not a '%q'"
msgstr ""
#: extmod/ulab/code/linalg/linalg.c
#: extmod/ulab/code/linalg/linalg.c extmod/ulab/code/numerical/numerical.c
msgid "arguments must be ndarrays"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "array and index length must be equal"
msgstr ""
#: py/objarray.c shared-bindings/nvm/ByteArray.c
msgid "array/bytes required on right side"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "attempt to get (arg)min/(arg)max of empty sequence"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "attempt to get argmin/argmax of an empty sequence"
msgstr ""
@ -2076,15 +2088,15 @@ msgid "attributes not supported yet"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "axis must be -1, 0, None, or 1"
msgid "axis is out of bounds"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "axis must be -1, 0, or 1"
msgid "axis must be None, or an integer"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "axis must be None, 0, or 1"
msgid "axis too long"
msgstr ""
#: py/builtinevex.c
@ -2288,6 +2300,10 @@ msgid ""
"can't switch from manual field specification to automatic field numbering"
msgstr ""
#: extmod/ulab/code/ndarray_operators.c
msgid "cannot cast output with casting rule"
msgstr ""
#: py/objtype.c
msgid "cannot create '%q' instances"
msgstr ""
@ -2304,10 +2320,6 @@ msgstr ""
msgid "cannot perform relative import"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "cannot reshape array (incompatible input/output shape)"
msgstr ""
#: py/emitnative.c
msgid "casting"
msgstr ""
@ -2380,10 +2392,6 @@ msgstr ""
msgid "convolve arguments must not be empty"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "could not broadast input array from shape"
msgstr ""
#: extmod/ulab/code/poly/poly.c
msgid "could not invert Vandermonde matrix"
msgstr ""
@ -2392,6 +2400,10 @@ msgstr ""
msgid "couldn't determine SD card version"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "cross is defined for 1D arrays of length 3"
msgstr ""
#: extmod/ulab/code/approx/approx.c
msgid "data must be iterable"
msgstr ""
@ -2400,10 +2412,6 @@ msgstr ""
msgid "data must be of equal length"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "ddof must be smaller than length of data set"
msgstr ""
#: py/parsenum.c
msgid "decimal numbers not supported"
msgstr ""
@ -2433,6 +2441,10 @@ msgstr ""
msgid "diff argument must be an ndarray"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "differentiation order out of range"
msgstr ""
#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c
#: shared-bindings/math/__init__.c
msgid "division by zero"
@ -2548,6 +2560,10 @@ msgstr ""
msgid "first argument must be a function"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "first argument must be a tuple of ndarrays"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "first argument must be an iterable"
msgstr ""
@ -2601,8 +2617,8 @@ msgstr ""
msgid "function has the same sign at the ends of interval"
msgstr ""
#: extmod/ulab/code/compare/compare.c
msgid "function is implemented for scalars and ndarrays only"
#: extmod/ulab/code/ndarray.c
msgid "function is defined for ndarrays only"
msgstr ""
#: py/argcheck.c
@ -2672,6 +2688,7 @@ msgstr ""
msgid "index is out of bounds"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
#: ports/esp32s2/common-hal/pulseio/PulseIn.c py/obj.c
msgid "index out of range"
msgstr ""
@ -2696,6 +2713,10 @@ msgstr ""
msgid "inline assembler must be a function"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "input and output shapes are not compatible"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "input argument must be an integer or a 2-tuple"
msgstr ""
@ -2704,6 +2725,10 @@ msgstr ""
msgid "input array length must be power of 2"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "input arrays are not compatible"
msgstr ""
#: extmod/ulab/code/poly/poly.c
msgid "input data must be an iterable"
msgstr ""
@ -2716,6 +2741,22 @@ msgstr ""
msgid "input matrix is singular"
msgstr ""
#: extmod/ulab/code/user/user.c
msgid "input must be a dense ndarray"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "input must be a tensor of rank 2"
msgstr ""
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c
msgid "input must be an ndarray"
msgstr ""
#: extmod/ulab/code/filter/filter.c
msgid "input must be one-dimensional"
msgstr ""
#: extmod/ulab/code/linalg/linalg.c
msgid "input must be square matrix"
msgstr ""
@ -2728,6 +2769,10 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/poly/poly.c
msgid "inputs are not iterable"
msgstr ""
#: py/parsenum.c
msgid "int() arg 2 must be >= 2 and <= 36"
msgstr ""
@ -2896,6 +2941,10 @@ msgstr ""
msgid "max_length must be > 0"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "maximum number of dimensions is 4"
msgstr ""
#: py/runtime.c
msgid "maximum recursion depth exceeded"
msgstr ""
@ -2945,10 +2994,6 @@ msgstr ""
msgid "must use keyword argument for key function"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "n must be between 0, and 9"
msgstr ""
#: py/runtime.c
msgid "name '%q' is not defined"
msgstr ""
@ -3031,6 +3076,10 @@ msgstr ""
msgid "non-keyword arg after keyword arg"
msgstr ""
#: extmod/ulab/code/linalg/linalg.c
msgid "norm is defined for 1D and 2D arrays"
msgstr ""
#: shared-bindings/_bleio/UUID.c
msgid "not a 128-bit UUID"
msgstr ""
@ -3043,10 +3092,6 @@ msgstr ""
msgid "not enough arguments for format string"
msgstr ""
#: extmod/ulab/code/poly/poly.c
msgid "number of arguments must be 2, or 3"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "number of points must be at least 2"
msgstr ""
@ -3099,6 +3144,10 @@ msgstr ""
msgid "odd-length string"
msgstr ""
#: extmod/ulab/code/ulab_create.c
msgid "offset is too large"
msgstr ""
#: py/objstr.c py/objstrunicode.c
msgid "offset out of bounds"
msgstr ""
@ -3121,6 +3170,14 @@ msgstr ""
msgid "operands could not be broadcast together"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "operation is implemented for 1D Boolean arrays only"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "operation is not implemented for flattened array"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "operation is not implemented on ndarrays"
msgstr ""
@ -3255,6 +3312,10 @@ msgstr ""
msgid "requested length %d but object has length %d"
msgstr ""
#: extmod/ulab/code/ndarray_operators.c
msgid "results cannot be cast to specified type"
msgstr ""
#: py/compile.c
msgid "return annotation must be an identifier"
msgstr ""
@ -3273,8 +3334,8 @@ msgstr ""
msgid "rgb_pins[%d] is not on the same port as clock"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "right hand side must be an ndarray, or a scalar"
#: extmod/ulab/code/numerical/numerical.c
msgid "roll argument must be an ndarray"
msgstr ""
#: py/objstr.c
@ -3300,7 +3361,7 @@ msgid "script compilation not supported"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "shape must be a 2-tuple"
msgid "shape must be a tuple"
msgstr ""
#: py/objstr.c
@ -3343,10 +3404,6 @@ msgstr ""
msgid "sort argument must be an ndarray"
msgstr ""
#: extmod/ulab/code/numerical/numerical.c
msgid "sorted axis can't be longer than 65535"
msgstr ""
#: extmod/ulab/code/filter/filter.c
msgid "sos array must be of shape (n_section, 6)"
msgstr ""
@ -3452,6 +3509,10 @@ msgstr ""
msgid "timestamp out of range for platform time_t"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "tobytes can be invoked for dense arrays only"
msgstr ""
#: shared-module/struct/__init__.c
msgid "too many arguments provided with the given format"
msgstr ""
@ -3627,12 +3688,12 @@ msgstr ""
msgid "window must be <= interval"
msgstr ""
#: extmod/ulab/code/linalg/linalg.c
msgid "wrong argument type"
#: extmod/ulab/code/numerical/numerical.c
msgid "wrong axis index"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "wrong index type"
#: extmod/ulab/code/ulab_create.c
msgid "wrong axis specified"
msgstr ""
#: extmod/ulab/code/vector/vectorise.c

2
ports/stm/boards/meowbit_v121/mpconfigboard.mk
View File

@ -20,3 +20,5 @@ LD_COMMON = boards/common_default.ld
LD_FILE = boards/STM32F401xe_boot.ld
# For debugging - also comment BOOTLOADER_OFFSET and BOARD_VTOR_DEFER
# LD_FILE = boards/STM32F401xe_fs.ld
CIRCUITPY_ULAB = 0

2
ports/stm/boards/thunderpack/mpconfigboard.mk
View File

@ -15,3 +15,5 @@ MCU_PACKAGE = UFQFPN48
LD_COMMON = boards/common_nvm.ld
LD_FILE = boards/STM32F411_nvm.ld
CIRCUITPY_ULAB = 0

2
py/py.mk
View File

@ -109,7 +109,7 @@ ifeq ($(CIRCUITPY_ULAB),1)
SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*.c))
SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*/*.c))
CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-float-equal -Wno-sign-compare -DCIRCUITPY
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-missing-declarations -Wno-missing-prototypes -Wno-unused-parameter -Wno-float-equal -Wno-sign-compare -Wno-cast-align -Wno-shadow -DCIRCUITPY
endif
# External modules written in C.