Skip to content

Commit 4f4b9bd

Browse files
authored
Merge pull request #5859 from jepler/update-ulab
update to ulab 4.0.0
2 parents 8d7474b + af353c9 commit 4f4b9bd

File tree

3 files changed

+59
-15
lines changed

3 files changed

+59
-15
lines changed

extmod/ulab

Submodule ulab updated 99 files

locale/circuitpython.pot

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2624,7 +2624,7 @@ msgstr ""
26242624
msgid "attributes not supported yet"
26252625
msgstr ""
26262626

2627-
#: extmod/ulab/code/numpy/numerical.c
2627+
#: extmod/ulab/code/ulab_tools.c
26282628
msgid "axis is out of bounds"
26292629
msgstr ""
26302630

@@ -2680,11 +2680,11 @@ msgstr ""
26802680
msgid "branch not in range"
26812681
msgstr ""
26822682

2683-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2683+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
26842684
msgid "buffer is smaller than requested size"
26852685
msgstr ""
26862686

2687-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2687+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
26882688
msgid "buffer size must be a multiple of element size"
26892689
msgstr ""
26902690

@@ -2776,6 +2776,10 @@ msgstr ""
27762776
msgid "can't convert '%q' object to %q implicitly"
27772777
msgstr ""
27782778

2779+
#: extmod/ulab/code/numpy/vector.c
2780+
msgid "can't convert complex to float"
2781+
msgstr ""
2782+
27792783
#: py/obj.c
27802784
msgid "can't convert to %q"
27812785
msgstr ""
@@ -2870,6 +2874,14 @@ msgstr ""
28702874
msgid "cannot cast output with casting rule"
28712875
msgstr ""
28722876

2877+
#: extmod/ulab/code/ndarray.c
2878+
msgid "cannot convert complex to dtype"
2879+
msgstr ""
2880+
2881+
#: extmod/ulab/code/ndarray.c
2882+
msgid "cannot convert complex type"
2883+
msgstr ""
2884+
28732885
#: py/objtype.c
28742886
msgid "cannot create '%q' instances"
28752887
msgstr ""
@@ -3061,6 +3073,10 @@ msgstr ""
30613073
msgid "divisor must be 4"
30623074
msgstr ""
30633075

3076+
#: extmod/ulab/code/numpy/vector.c
3077+
msgid "dtype must be float, or complex"
3078+
msgstr ""
3079+
30643080
#: py/objdeque.c
30653081
msgid "empty"
30663082
msgstr ""
@@ -3164,7 +3180,7 @@ msgstr ""
31643180
msgid "first argument must be a function"
31653181
msgstr ""
31663182

3167-
#: extmod/ulab/code/ulab_create.c
3183+
#: extmod/ulab/code/numpy/create.c
31683184
msgid "first argument must be a tuple of ndarrays"
31693185
msgstr ""
31703186

@@ -3229,6 +3245,10 @@ msgstr ""
32293245
msgid "function is defined for ndarrays only"
32303246
msgstr ""
32313247

3248+
#: extmod/ulab/code/numpy/carray/carray.c
3249+
msgid "function is implemented for ndarrays only"
3250+
msgstr ""
3251+
32323252
#: py/argcheck.c
32333253
#, c-format
32343254
msgid "function missing %d required positional arguments"
@@ -3342,22 +3362,26 @@ msgstr ""
33423362
msgid "input and output shapes are not compatible"
33433363
msgstr ""
33443364

3345-
#: extmod/ulab/code/ulab_create.c
3365+
#: extmod/ulab/code/numpy/create.c
33463366
msgid "input argument must be an integer, a tuple, or a list"
33473367
msgstr ""
33483368

33493369
#: extmod/ulab/code/numpy/fft/fft_tools.c
33503370
msgid "input array length must be power of 2"
33513371
msgstr ""
33523372

3353-
#: extmod/ulab/code/ulab_create.c
3373+
#: extmod/ulab/code/numpy/create.c
33543374
msgid "input arrays are not compatible"
33553375
msgstr ""
33563376

33573377
#: extmod/ulab/code/numpy/poly.c
33583378
msgid "input data must be an iterable"
33593379
msgstr ""
33603380

3381+
#: extmod/ulab/code/numpy/vector.c
3382+
msgid "input dtype must be float or complex"
3383+
msgstr ""
3384+
33613385
#: extmod/ulab/code/numpy/linalg/linalg.c
33623386
msgid "input matrix is asymmetric"
33633387
msgstr ""
@@ -3367,18 +3391,26 @@ msgstr ""
33673391
msgid "input matrix is singular"
33683392
msgstr ""
33693393

3394+
#: extmod/ulab/code/numpy/carray/carray.c
3395+
msgid "input must be a 1D ndarray"
3396+
msgstr ""
3397+
33703398
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
33713399
msgid "input must be a dense ndarray"
33723400
msgstr ""
33733401

3374-
#: extmod/ulab/code/ulab_create.c
3402+
#: extmod/ulab/code/numpy/create.c
33753403
msgid "input must be a tensor of rank 2"
33763404
msgstr ""
33773405

3378-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c
3406+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
33793407
msgid "input must be an ndarray"
33803408
msgstr ""
33813409

3410+
#: extmod/ulab/code/numpy/carray/carray.c
3411+
msgid "input must be an ndarray, or a scalar"
3412+
msgstr ""
3413+
33823414
#: extmod/ulab/code/scipy/signal/signal.c
33833415
msgid "input must be one-dimensional"
33843416
msgstr ""
@@ -3749,7 +3781,11 @@ msgstr ""
37493781
msgid "not enough arguments for format string"
37503782
msgstr ""
37513783

3752-
#: extmod/ulab/code/ulab_create.c
3784+
#: extmod/ulab/code/numpy/carray/carray_tools.c
3785+
msgid "not implemented for complex dtype"
3786+
msgstr ""
3787+
3788+
#: extmod/ulab/code/numpy/create.c
37533789
msgid "number of points must be at least 2"
37543790
msgstr ""
37553791

@@ -3807,15 +3843,15 @@ msgstr ""
38073843
msgid "odd-length string"
38083844
msgstr ""
38093845

3810-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
3846+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
38113847
msgid "offset is too large"
38123848
msgstr ""
38133849

38143850
#: shared-bindings/dualbank/__init__.c
38153851
msgid "offset must be >= 0"
38163852
msgstr ""
38173853

3818-
#: extmod/ulab/code/ulab_create.c
3854+
#: extmod/ulab/code/numpy/create.c
38193855
msgid "offset must be non-negative and no greater than buffer length"
38203856
msgstr ""
38213857

@@ -4294,7 +4330,7 @@ msgstr ""
42944330
msgid "too many arguments provided with the given format"
42954331
msgstr ""
42964332

4297-
#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c
4333+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
42984334
msgid "too many dimensions"
42994335
msgstr ""
43004336

@@ -4495,15 +4531,19 @@ msgstr ""
44954531
msgid "wrong axis index"
44964532
msgstr ""
44974533

4498-
#: extmod/ulab/code/ulab_create.c
4534+
#: extmod/ulab/code/numpy/create.c
44994535
msgid "wrong axis specified"
45004536
msgstr ""
45014537

45024538
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
45034539
msgid "wrong input type"
45044540
msgstr ""
45054541

4506-
#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c
4542+
#: extmod/ulab/code/numpy/transform.c
4543+
msgid "wrong length of condition array"
4544+
msgstr ""
4545+
4546+
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
45074547
msgid "wrong number of arguments"
45084548
msgstr ""
45094549

py/circuitpy_mpconfig.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,10 @@ extern const struct _mp_obj_module_t nvm_module;
337337
#endif
338338
#endif
339339

340+
#ifndef ULAB_SUPPORTS_COMPLEX
341+
#define ULAB_SUPPORTS_COMPLEX (0)
342+
#endif
343+
340344
#if CIRCUITPY_ULAB
341345
// ulab requires reverse special methods
342346
#if defined(MICROPY_PY_REVERSE_SPECIAL_METHODS) && !MICROPY_PY_REVERSE_SPECIAL_METHODS

0 commit comments

Comments
 (0)