Skip to content

Commit 9d8be64

Browse files
jeplerjepler
committed
ulab: Update to release tag 1.1.0
Disable certain classes of diagnostic when building ulab. We should submit patches upstream to (A) fix these errors and (B) upgrade their CI so that the problems are caught before we want to integrate with CircuitPython, but not right now.
1 parent 211d084 commit 9d8be64

3 files changed

Lines changed: 106 additions & 45 deletions

File tree

‎extmod/ulab‎

Submodule ulab updated 81 files

‎locale/circuitpython.pot‎

Lines changed: 104 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-11-10 15:30+0530\n"
11+
"POT-Creation-Date: 2020-11-23 10:10-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -855,6 +855,10 @@ msgstr ""
855855
msgid "FFT is defined for ndarrays only"
856856
msgstr ""
857857

858+
#: extmod/ulab/code/fft/fft.c
859+
msgid "FFT is implemented for linear arrays only"
860+
msgstr ""
861+
858862
#: ports/esp32s2/common-hal/socketpool/Socket.c
859863
msgid "Failed SSL handshake"
860864
msgstr ""
@@ -1951,7 +1955,7 @@ msgstr ""
19511955
msgid "WARNING: Your code filename has two extensions\n"
19521956
msgstr ""
19531957

1954-
#: shared-bindings/watchdog/WatchDogTimer.c
1958+
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
19551959
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
19561960
msgstr ""
19571961

@@ -2030,10 +2034,6 @@ msgstr ""
20302034
msgid "addresses is empty"
20312035
msgstr ""
20322036

2033-
#: extmod/ulab/code/vector/vectorise.c
2034-
msgid "arctan2 is implemented for scalars and ndarrays only"
2035-
msgstr ""
2036-
20372037
#: py/modbuiltins.c
20382038
msgid "arg is an empty sequence"
20392039
msgstr ""
@@ -2042,6 +2042,10 @@ msgstr ""
20422042
msgid "argsort argument must be an ndarray"
20432043
msgstr ""
20442044

2045+
#: extmod/ulab/code/numerical/numerical.c
2046+
msgid "argsort is not implemented for flattened arrays"
2047+
msgstr ""
2048+
20452049
#: py/runtime.c
20462050
msgid "argument has wrong type"
20472051
msgstr ""
@@ -2059,14 +2063,22 @@ msgstr ""
20592063
msgid "argument should be a '%q' not a '%q'"
20602064
msgstr ""
20612065

2062-
#: extmod/ulab/code/linalg/linalg.c
2066+
#: extmod/ulab/code/linalg/linalg.c extmod/ulab/code/numerical/numerical.c
20632067
msgid "arguments must be ndarrays"
20642068
msgstr ""
20652069

2070+
#: extmod/ulab/code/ndarray.c
2071+
msgid "array and index length must be equal"
2072+
msgstr ""
2073+
20662074
#: py/objarray.c shared-bindings/nvm/ByteArray.c
20672075
msgid "array/bytes required on right side"
20682076
msgstr ""
20692077

2078+
#: extmod/ulab/code/numerical/numerical.c
2079+
msgid "attempt to get (arg)min/(arg)max of empty sequence"
2080+
msgstr ""
2081+
20702082
#: extmod/ulab/code/numerical/numerical.c
20712083
msgid "attempt to get argmin/argmax of an empty sequence"
20722084
msgstr ""
@@ -2076,15 +2088,15 @@ msgid "attributes not supported yet"
20762088
msgstr ""
20772089

20782090
#: extmod/ulab/code/numerical/numerical.c
2079-
msgid "axis must be -1, 0, None, or 1"
2091+
msgid "axis is out of bounds"
20802092
msgstr ""
20812093

20822094
#: extmod/ulab/code/numerical/numerical.c
2083-
msgid "axis must be -1, 0, or 1"
2095+
msgid "axis must be None, or an integer"
20842096
msgstr ""
20852097

20862098
#: extmod/ulab/code/numerical/numerical.c
2087-
msgid "axis must be None, 0, or 1"
2099+
msgid "axis too long"
20882100
msgstr ""
20892101

20902102
#: py/builtinevex.c
@@ -2288,6 +2300,10 @@ msgid ""
22882300
"can't switch from manual field specification to automatic field numbering"
22892301
msgstr ""
22902302

2303+
#: extmod/ulab/code/ndarray_operators.c
2304+
msgid "cannot cast output with casting rule"
2305+
msgstr ""
2306+
22912307
#: py/objtype.c
22922308
msgid "cannot create '%q' instances"
22932309
msgstr ""
@@ -2304,10 +2320,6 @@ msgstr ""
23042320
msgid "cannot perform relative import"
23052321
msgstr ""
23062322

2307-
#: extmod/ulab/code/ndarray.c
2308-
msgid "cannot reshape array (incompatible input/output shape)"
2309-
msgstr ""
2310-
23112323
#: py/emitnative.c
23122324
msgid "casting"
23132325
msgstr ""
@@ -2380,10 +2392,6 @@ msgstr ""
23802392
msgid "convolve arguments must not be empty"
23812393
msgstr ""
23822394

2383-
#: extmod/ulab/code/ndarray.c
2384-
msgid "could not broadast input array from shape"
2385-
msgstr ""
2386-
23872395
#: extmod/ulab/code/poly/poly.c
23882396
msgid "could not invert Vandermonde matrix"
23892397
msgstr ""
@@ -2392,6 +2400,10 @@ msgstr ""
23922400
msgid "couldn't determine SD card version"
23932401
msgstr ""
23942402

2403+
#: extmod/ulab/code/numerical/numerical.c
2404+
msgid "cross is defined for 1D arrays of length 3"
2405+
msgstr ""
2406+
23952407
#: extmod/ulab/code/approx/approx.c
23962408
msgid "data must be iterable"
23972409
msgstr ""
@@ -2400,10 +2412,6 @@ msgstr ""
24002412
msgid "data must be of equal length"
24012413
msgstr ""
24022414

2403-
#: extmod/ulab/code/numerical/numerical.c
2404-
msgid "ddof must be smaller than length of data set"
2405-
msgstr ""
2406-
24072415
#: py/parsenum.c
24082416
msgid "decimal numbers not supported"
24092417
msgstr ""
@@ -2433,6 +2441,10 @@ msgstr ""
24332441
msgid "diff argument must be an ndarray"
24342442
msgstr ""
24352443

2444+
#: extmod/ulab/code/numerical/numerical.c
2445+
msgid "differentiation order out of range"
2446+
msgstr ""
2447+
24362448
#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c
24372449
#: shared-bindings/math/__init__.c
24382450
msgid "division by zero"
@@ -2548,6 +2560,10 @@ msgstr ""
25482560
msgid "first argument must be a function"
25492561
msgstr ""
25502562

2563+
#: extmod/ulab/code/ulab_create.c
2564+
msgid "first argument must be a tuple of ndarrays"
2565+
msgstr ""
2566+
25512567
#: extmod/ulab/code/ndarray.c
25522568
msgid "first argument must be an iterable"
25532569
msgstr ""
@@ -2601,8 +2617,8 @@ msgstr ""
26012617
msgid "function has the same sign at the ends of interval"
26022618
msgstr ""
26032619

2604-
#: extmod/ulab/code/compare/compare.c
2605-
msgid "function is implemented for scalars and ndarrays only"
2620+
#: extmod/ulab/code/ndarray.c
2621+
msgid "function is defined for ndarrays only"
26062622
msgstr ""
26072623

26082624
#: py/argcheck.c
@@ -2672,6 +2688,7 @@ msgstr ""
26722688
msgid "index is out of bounds"
26732689
msgstr ""
26742690

2691+
#: extmod/ulab/code/numerical/numerical.c
26752692
#: ports/esp32s2/common-hal/pulseio/PulseIn.c py/obj.c
26762693
msgid "index out of range"
26772694
msgstr ""
@@ -2696,6 +2713,10 @@ msgstr ""
26962713
msgid "inline assembler must be a function"
26972714
msgstr ""
26982715

2716+
#: extmod/ulab/code/ndarray.c
2717+
msgid "input and output shapes are not compatible"
2718+
msgstr ""
2719+
26992720
#: extmod/ulab/code/ulab_create.c
27002721
msgid "input argument must be an integer or a 2-tuple"
27012722
msgstr ""
@@ -2704,6 +2725,10 @@ msgstr ""
27042725
msgid "input array length must be power of 2"
27052726
msgstr ""
27062727

2728+
#: extmod/ulab/code/ulab_create.c
2729+
msgid "input arrays are not compatible"
2730+
msgstr ""
2731+
27072732
#: extmod/ulab/code/poly/poly.c
27082733
msgid "input data must be an iterable"
27092734
msgstr ""
@@ -2716,6 +2741,22 @@ msgstr ""
27162741
msgid "input matrix is singular"
27172742
msgstr ""
27182743

2744+
#: extmod/ulab/code/user/user.c
2745+
msgid "input must be a dense ndarray"
2746+
msgstr ""
2747+
2748+
#: extmod/ulab/code/ulab_create.c
2749+
msgid "input must be a tensor of rank 2"
2750+
msgstr ""
2751+
2752+
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c
2753+
msgid "input must be an ndarray"
2754+
msgstr ""
2755+
2756+
#: extmod/ulab/code/filter/filter.c
2757+
msgid "input must be one-dimensional"
2758+
msgstr ""
2759+
27192760
#: extmod/ulab/code/linalg/linalg.c
27202761
msgid "input must be square matrix"
27212762
msgstr ""
@@ -2728,6 +2769,10 @@ msgstr ""
27282769
msgid "input vectors must be of equal length"
27292770
msgstr ""
27302771

2772+
#: extmod/ulab/code/poly/poly.c
2773+
msgid "inputs are not iterable"
2774+
msgstr ""
2775+
27312776
#: py/parsenum.c
27322777
msgid "int() arg 2 must be >= 2 and <= 36"
27332778
msgstr ""
@@ -2896,6 +2941,10 @@ msgstr ""
28962941
msgid "max_length must be > 0"
28972942
msgstr ""
28982943

2944+
#: extmod/ulab/code/ndarray.c
2945+
msgid "maximum number of dimensions is 4"
2946+
msgstr ""
2947+
28992948
#: py/runtime.c
29002949
msgid "maximum recursion depth exceeded"
29012950
msgstr ""
@@ -2945,10 +2994,6 @@ msgstr ""
29452994
msgid "must use keyword argument for key function"
29462995
msgstr ""
29472996

2948-
#: extmod/ulab/code/numerical/numerical.c
2949-
msgid "n must be between 0, and 9"
2950-
msgstr ""
2951-
29522997
#: py/runtime.c
29532998
msgid "name '%q' is not defined"
29542999
msgstr ""
@@ -3031,6 +3076,10 @@ msgstr ""
30313076
msgid "non-keyword arg after keyword arg"
30323077
msgstr ""
30333078

3079+
#: extmod/ulab/code/linalg/linalg.c
3080+
msgid "norm is defined for 1D and 2D arrays"
3081+
msgstr ""
3082+
30343083
#: shared-bindings/_bleio/UUID.c
30353084
msgid "not a 128-bit UUID"
30363085
msgstr ""
@@ -3043,10 +3092,6 @@ msgstr ""
30433092
msgid "not enough arguments for format string"
30443093
msgstr ""
30453094

3046-
#: extmod/ulab/code/poly/poly.c
3047-
msgid "number of arguments must be 2, or 3"
3048-
msgstr ""
3049-
30503095
#: extmod/ulab/code/ulab_create.c
30513096
msgid "number of points must be at least 2"
30523097
msgstr ""
@@ -3099,6 +3144,10 @@ msgstr ""
30993144
msgid "odd-length string"
31003145
msgstr ""
31013146

3147+
#: extmod/ulab/code/ulab_create.c
3148+
msgid "offset is too large"
3149+
msgstr ""
3150+
31023151
#: py/objstr.c py/objstrunicode.c
31033152
msgid "offset out of bounds"
31043153
msgstr ""
@@ -3121,6 +3170,14 @@ msgstr ""
31213170
msgid "operands could not be broadcast together"
31223171
msgstr ""
31233172

3173+
#: extmod/ulab/code/ndarray.c
3174+
msgid "operation is implemented for 1D Boolean arrays only"
3175+
msgstr ""
3176+
3177+
#: extmod/ulab/code/numerical/numerical.c
3178+
msgid "operation is not implemented for flattened array"
3179+
msgstr ""
3180+
31243181
#: extmod/ulab/code/numerical/numerical.c
31253182
msgid "operation is not implemented on ndarrays"
31263183
msgstr ""
@@ -3255,6 +3312,10 @@ msgstr ""
32553312
msgid "requested length %d but object has length %d"
32563313
msgstr ""
32573314

3315+
#: extmod/ulab/code/ndarray_operators.c
3316+
msgid "results cannot be cast to specified type"
3317+
msgstr ""
3318+
32583319
#: py/compile.c
32593320
msgid "return annotation must be an identifier"
32603321
msgstr ""
@@ -3273,8 +3334,8 @@ msgstr ""
32733334
msgid "rgb_pins[%d] is not on the same port as clock"
32743335
msgstr ""
32753336

3276-
#: extmod/ulab/code/ndarray.c
3277-
msgid "right hand side must be an ndarray, or a scalar"
3337+
#: extmod/ulab/code/numerical/numerical.c
3338+
msgid "roll argument must be an ndarray"
32783339
msgstr ""
32793340

32803341
#: py/objstr.c
@@ -3300,7 +3361,7 @@ msgid "script compilation not supported"
33003361
msgstr ""
33013362

33023363
#: extmod/ulab/code/ndarray.c
3303-
msgid "shape must be a 2-tuple"
3364+
msgid "shape must be a tuple"
33043365
msgstr ""
33053366

33063367
#: py/objstr.c
@@ -3343,10 +3404,6 @@ msgstr ""
33433404
msgid "sort argument must be an ndarray"
33443405
msgstr ""
33453406

3346-
#: extmod/ulab/code/numerical/numerical.c
3347-
msgid "sorted axis can't be longer than 65535"
3348-
msgstr ""
3349-
33503407
#: extmod/ulab/code/filter/filter.c
33513408
msgid "sos array must be of shape (n_section, 6)"
33523409
msgstr ""
@@ -3452,6 +3509,10 @@ msgstr ""
34523509
msgid "timestamp out of range for platform time_t"
34533510
msgstr ""
34543511

3512+
#: extmod/ulab/code/ndarray.c
3513+
msgid "tobytes can be invoked for dense arrays only"
3514+
msgstr ""
3515+
34553516
#: shared-module/struct/__init__.c
34563517
msgid "too many arguments provided with the given format"
34573518
msgstr ""
@@ -3627,12 +3688,12 @@ msgstr ""
36273688
msgid "window must be <= interval"
36283689
msgstr ""
36293690

3630-
#: extmod/ulab/code/linalg/linalg.c
3631-
msgid "wrong argument type"
3691+
#: extmod/ulab/code/numerical/numerical.c
3692+
msgid "wrong axis index"
36323693
msgstr ""
36333694

3634-
#: extmod/ulab/code/ndarray.c
3635-
msgid "wrong index type"
3695+
#: extmod/ulab/code/ulab_create.c
3696+
msgid "wrong axis specified"
36363697
msgstr ""
36373698

36383699
#: extmod/ulab/code/vector/vectorise.c

‎py/py.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ifeq ($(CIRCUITPY_ULAB),1)
109109
SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*.c))
110110
SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*/*.c))
111111
CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1
112-
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-float-equal -Wno-sign-compare -DCIRCUITPY
112+
$(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
113113
endif
114114

115115
# External modules written in C.

0 commit comments

Comments
 (0)