Skip to content

Commit e7703e8

Browse files
authored
Merge pull request #6567 from jepler/update-ulab-509
update ulab to 5.0.9
2 parents 4ab92d3 + ab3e786 commit e7703e8

File tree

5 files changed

+59
-22
lines changed

5 files changed

+59
-22
lines changed

extmod/ulab

Submodule ulab updated 109 files

locale/circuitpython.pot

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,6 +2352,10 @@ msgstr ""
23522352
msgid "array and index length must be equal"
23532353
msgstr ""
23542354

2355+
#: extmod/ulab/code/numpy/io/io.c
2356+
msgid "array has too many dimensions"
2357+
msgstr ""
2358+
23552359
#: py/objarray.c shared-bindings/alarm/SleepMemory.c
23562360
#: shared-bindings/nvm/ByteArray.c
23572361
msgid "array/bytes required on right side"
@@ -2719,6 +2723,10 @@ msgstr ""
27192723
msgid "convolve arguments must not be empty"
27202724
msgstr ""
27212725

2726+
#: extmod/ulab/code/numpy/io/io.c
2727+
msgid "corrupted file"
2728+
msgstr ""
2729+
27222730
#: extmod/ulab/code/numpy/poly.c
27232731
msgid "could not invert Vandermonde matrix"
27242732
msgstr ""
@@ -2810,6 +2818,10 @@ msgstr ""
28102818
msgid "empty"
28112819
msgstr ""
28122820

2821+
#: extmod/ulab/code/numpy/io/io.c
2822+
msgid "empty file"
2823+
msgstr ""
2824+
28132825
#: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
28142826
msgid "empty heap"
28152827
msgstr ""
@@ -2913,7 +2925,7 @@ msgstr ""
29132925
msgid "first argument must be a tuple of ndarrays"
29142926
msgstr ""
29152927

2916-
#: extmod/ulab/code/numpy/vector.c
2928+
#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
29172929
msgid "first argument must be an ndarray"
29182930
msgstr ""
29192931

@@ -3061,7 +3073,7 @@ msgstr ""
30613073
msgid "incorrect padding"
30623074
msgstr ""
30633075

3064-
#: extmod/ulab/code/ndarray.c
3076+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
30653077
msgid "index is out of bounds"
30663078
msgstr ""
30673079

@@ -3128,6 +3140,10 @@ msgstr ""
31283140
msgid "input matrix is singular"
31293141
msgstr ""
31303142

3143+
#: extmod/ulab/code/numpy/create.c
3144+
msgid "input must be 1- or 2-d"
3145+
msgstr ""
3146+
31313147
#: extmod/ulab/code/numpy/carray/carray.c
31323148
msgid "input must be a 1D ndarray"
31333149
msgstr ""
@@ -3136,11 +3152,7 @@ msgstr ""
31363152
msgid "input must be a dense ndarray"
31373153
msgstr ""
31383154

3139-
#: extmod/ulab/code/numpy/create.c
3140-
msgid "input must be a tensor of rank 2"
3141-
msgstr ""
3142-
3143-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
3155+
#: extmod/ulab/code/user/user.c
31443156
msgid "input must be an ndarray"
31453157
msgstr ""
31463158

@@ -3341,7 +3353,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
33413353
msgstr ""
33423354

33433355
#: extmod/ulab/code/ndarray.c
3344-
msgid "maximum number of dimensions is 4"
3356+
msgid "maximum number of dimensions is "
33453357
msgstr ""
33463358

33473359
#: py/runtime.c
@@ -3590,7 +3602,7 @@ msgstr ""
35903602
msgid "off"
35913603
msgstr ""
35923604

3593-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
3605+
#: extmod/ulab/code/utils/utils.c
35943606
msgid "offset is too large"
35953607
msgstr ""
35963608

@@ -3740,6 +3752,7 @@ msgid "pow() with 3 arguments requires integers"
37403752
msgstr ""
37413753

37423754
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3755+
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37433756
#: supervisor/shared/safe_mode.c
37443757
msgid "pressing boot button at start up.\n"
37453758
msgstr ""
@@ -4175,6 +4188,14 @@ msgstr ""
41754188
msgid "unsupported types for %q: '%q', '%q'"
41764189
msgstr ""
41774190

4191+
#: extmod/ulab/code/numpy/io/io.c
4192+
msgid "usecols is too high"
4193+
msgstr ""
4194+
4195+
#: extmod/ulab/code/numpy/io/io.c
4196+
msgid "usecols keyword must be specified"
4197+
msgstr ""
4198+
41784199
#: py/objint.c
41794200
#, c-format
41804201
msgid "value must fit in %d byte(s)"
@@ -4216,14 +4237,28 @@ msgstr ""
42164237
msgid "wrong axis specified"
42174238
msgstr ""
42184239

4219-
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
4240+
#: extmod/ulab/code/numpy/io/io.c
4241+
msgid "wrong dtype"
4242+
msgstr ""
4243+
4244+
#: extmod/ulab/code/numpy/transform.c
4245+
msgid "wrong index type"
4246+
msgstr ""
4247+
4248+
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
4249+
#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
4250+
#: extmod/ulab/code/numpy/vector.c
42204251
msgid "wrong input type"
42214252
msgstr ""
42224253

42234254
#: extmod/ulab/code/numpy/transform.c
42244255
msgid "wrong length of condition array"
42254256
msgstr ""
42264257

4258+
#: extmod/ulab/code/numpy/transform.c
4259+
msgid "wrong length of index array"
4260+
msgstr ""
4261+
42274262
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
42284263
msgid "wrong number of arguments"
42294264
msgstr ""

ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ LONGINT_IMPL = MPZ
1313
CIRCUITPY_LTO_PARTITION = one
1414

1515
CIRCUITPY_AESIO = 0
16+
CIRCUITPY_FLOPPYIO = 0
17+
CIRCUITPY_GIFIO = 0
1618
CIRCUITPY_ONEWIREIO = 0
1719
CIRCUITPY_PARALLELDISPLAY = 0
1820
CIRCUITPY_SDCARDIO = 0

ports/broadcom/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Select the board to build for.
2-
BOARD=raspberrypi_pi4
2+
BOARD?=raspberrypi_pi4b
33

44
ifeq ($(BOARD),)
5-
$(error You must provide a BOARD parameter)
5+
$(error You must provide a BOARD parameter)
66
else
7-
ifeq ($(wildcard boards/$(BOARD)/.),)
8-
$(error Invalid BOARD specified)
9-
endif
7+
ifeq ($(wildcard boards/$(BOARD)/.),)
8+
$(error Invalid BOARD "$(BOARD)" specified)
9+
endif
1010
endif
1111

1212
# If the build directory is not given, make it reflect the board name.

tests/unix/extra_coverage.py.exp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ hashlib json math qrio
3838
rainbowio re sys termios
3939
traceback ubinascii uctypes uerrno
4040
uheapq uio ujson ulab
41-
ulab.fft ulab.linalg ulab.numpy ulab.scipy
42-
ulab.scipy.linalg ulab.scipy.optimize
43-
ulab.scipy.signal ulab.scipy.special
44-
ulab.utils uos urandom ure
45-
uselect ustruct utime utimeq
46-
uzlib zlib
41+
ulab.numpy ulab.numpy.fft ulab.numpy.linalg
42+
ulab.scipy ulab.scipy.linalg
43+
ulab.scipy.optimize ulab.scipy.signal
44+
ulab.scipy.special ulab.utils uos
45+
urandom ure uselect ustruct
46+
utime utimeq uzlib zlib
4747
ime
4848

4949
utime utimeq

0 commit comments

Comments
 (0)