Skip to content

Commit 5cc42d5

Browse files
dhalbertdhalbert
authored
Merge pull request #8126 from jepler/update-ulab-6.3.2
update ulab to 6.3.2
2 parents fd83a09 + 3181914 commit 5cc42d5

File tree

18 files changed

+117
-20
lines changed

18 files changed

+117
-20
lines changed

‎extmod/ulab

‎locale/circuitpython.pot

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2765,6 +2765,10 @@ msgstr ""
27652765
msgid "cannot create instance"
27662766
msgstr ""
27672767

2768+
#: extmod/ulab/code/ndarray.c
2769+
msgid "cannot delete array elements"
2770+
msgstr ""
2771+
27682772
#: py/runtime.c
27692773
msgid "cannot import name %q"
27702774
msgstr ""
@@ -3222,6 +3226,14 @@ msgstr ""
32223226
msgid "inline assembler must be a function"
32233227
msgstr ""
32243228

3229+
#: extmod/ulab/code/numpy/vector.c
3230+
msgid "input and output dimensions differ"
3231+
msgstr ""
3232+
3233+
#: extmod/ulab/code/numpy/vector.c
3234+
msgid "input and output shapes differ"
3235+
msgstr ""
3236+
32253237
#: extmod/ulab/code/numpy/create.c
32263238
msgid "input argument must be an integer, a tuple, or a list"
32273239
msgstr ""
@@ -3550,6 +3562,10 @@ msgstr ""
35503562
msgid "native yield"
35513563
msgstr ""
35523564

3565+
#: extmod/ulab/code/ndarray.c
3566+
msgid "ndarray length overflows"
3567+
msgstr ""
3568+
35533569
#: py/runtime.c
35543570
#, c-format
35553571
msgid "need more than %d values to unpack"
@@ -3648,6 +3664,10 @@ msgstr ""
36483664
msgid "not implemented for complex dtype"
36493665
msgstr ""
36503666

3667+
#: extmod/ulab/code/numpy/bitwise.c
3668+
msgid "not supported for input types"
3669+
msgstr ""
3670+
36513671
#: extmod/ulab/code/numpy/create.c
36523672
msgid "number of points must be at least 2"
36533673
msgstr ""
@@ -3758,8 +3778,8 @@ msgstr ""
37583778
msgid "opcode"
37593779
msgstr ""
37603780

3761-
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/compare.c
3762-
#: extmod/ulab/code/numpy/vector.c
3781+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
3782+
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
37633783
msgid "operands could not be broadcast together"
37643784
msgstr ""
37653785

@@ -3796,10 +3816,26 @@ msgstr ""
37963816
msgid "out array is too small"
37973817
msgstr ""
37983818

3819+
#: extmod/ulab/code/numpy/vector.c
3820+
msgid "out keyword is not supported for complex dtype"
3821+
msgstr ""
3822+
3823+
#: extmod/ulab/code/numpy/vector.c
3824+
msgid "out keyword is not supported for function"
3825+
msgstr ""
3826+
37993827
#: extmod/ulab/code/utils/utils.c
38003828
msgid "out must be a float dense array"
38013829
msgstr ""
38023830

3831+
#: extmod/ulab/code/numpy/vector.c
3832+
msgid "out must be an ndarray"
3833+
msgstr ""
3834+
3835+
#: extmod/ulab/code/numpy/vector.c
3836+
msgid "out must be of float dtype"
3837+
msgstr ""
3838+
38033839
#: shared-bindings/bitmaptools/__init__.c
38043840
msgid "out of range of target"
38053841
msgstr ""

‎ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,16 @@ LONGINT_IMPL = MPZ
1313
CIRCUITPY__EVE = 1
1414
CIRCUITPY_CANIO = 1
1515
CIRCUITPY_SYNTHIO = 0
16+
CIRCUITPY_GIFIO = 0
1617

1718
CIRCUITPY_LTO_PARTITION = one
19+
20+
# We don't have room for the fonts for terminalio for certain languages,
21+
# so turn off terminalio, and if it's off and displayio is on,
22+
# force a clean build.
23+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
24+
# ifeq, because it's not set yet.
25+
ifneq (,$(filter $(TRANSLATION),ja ko ru))
26+
CIRCUITPY_TERMINALIO = 0
27+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
28+
endif

‎ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,13 @@ LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
1414
CIRCUITPY_SYNTHIO = 0
15+
16+
# We don't have room for the fonts for terminalio for certain languages,
17+
# so turn off terminalio, and if it's off and displayio is on,
18+
# force a clean build.
19+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
20+
# ifeq, because it's not set yet.
21+
ifneq (,$(filter $(TRANSLATION),ja ko ru))
22+
CIRCUITPY_TERMINALIO = 0
23+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
24+
endif

‎ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ
1212

1313
# No I2S on SAMD51G
1414
CIRCUITPY_AUDIOBUSIO = 0
15+
CIRCUITPY_FLOPPYIO = 0
16+
CIRCUITPY_GIFIO = 0
1517

1618
CIRCUITPY_BITBANG_APA102 = 1

‎ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
14+
CIRCUITPY_FLOPPYIO = 0
1415
CIRCUITPY_SYNTHIO = 0
16+
17+
# We don't have room for the fonts for terminalio for certain languages,
18+
# so turn off terminalio, and if it's off and displayio is on,
19+
# force a clean build.
20+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
21+
# ifeq, because it's not set yet.
22+
ifneq (,$(filter $(TRANSLATION),ja ko ru))
23+
CIRCUITPY_TERMINALIO = 0
24+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
25+
endif

‎ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
14+
CIRCUITPY_FLOPPYIO = 0
1415
CIRCUITPY_SYNTHIO = 0
16+
17+
# We don't have room for the fonts for terminalio for certain languages,
18+
# so turn off terminalio, and if it's off and displayio is on,
19+
# force a clean build.
20+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
21+
# ifeq, because it's not set yet.
22+
ifneq (,$(filter $(TRANSLATION),ja ko ru))
23+
CIRCUITPY_TERMINALIO = 0
24+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
25+
endif

‎ports/atmel-samd/boards/pybadge/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY_AESIO = 0
14+
CIRCUITPY_FLOPPYIO = 0
1415
CIRCUITPY_FRAMEBUFFERIO = 0
1516
CIRCUITPY_GIFIO = 0
1617
CIRCUITPY_KEYPAD = 1

‎ports/atmel-samd/boards/pygamer/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY_AESIO = 0
14+
CIRCUITPY_FLOPPYIO = 0
1415
CIRCUITPY_FRAMEBUFFERIO = 0
1516
CIRCUITPY_GIFIO = 0
1617
CIRCUITPY_KEYPAD = 1

‎ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ CHIP_FAMILY = samd51
99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
1111
LONGINT_IMPL = MPZ
12+
CIRCUITPY_FLOPPYIO = 0
13+
CIRCUITPY_FRAMEBUFFERIO = 0
1214
CIRCUITPY_SYNTHIO = 0

‎ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ
1212

1313
# No I2S on SAMD51G
1414
CIRCUITPY_AUDIOBUSIO = 0
15+
CIRCUITPY_FLOPPYIO = 0
16+
CIRCUITPY_FRAMEBUFFERIO = 0
1517

1618
CIRCUITPY_BITBANG_APA102 = 1

‎ports/atmel-samd/mpconfigport.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ CIRCUITPY_PS2IO ?= 1
106106
CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
107107
CIRCUITPY_SAMD ?= 1
108108
CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
109+
CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1
109110
CIRCUITPY_WATCHDOG ?= 1
110111

111112
endif # samd51
@@ -131,6 +132,7 @@ CIRCUITPY_SAMD ?= 1
131132
CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
132133
CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
133134
CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
135+
CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1
134136

135137
endif # same51
136138
######################################################################

‎ports/stm/boards/pyb_nano_v2/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ LD_FILE = boards/STM32F411_fs.ld
1717
CIRCUITPY_AUDIOCORE = 0
1818
CIRCUITPY_AUDIOPWMIO = 0
1919
CIRCUITPY_BLEIO_HCI = 0
20+
CIRCUITPY_ULAB = 0

‎ports/unix/variants/coverage/mpconfigvariant.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ $(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-shadow -Wno-sign-compare -include sha
2828
SRC_BITMAP := \
2929
shared/runtime/context_manager_helpers.c \
3030
displayio_min.c \
31+
shared-bindings/__future__/__init__.c \
3132
shared-bindings/aesio/aes.c \
3233
shared-bindings/aesio/__init__.c \
3334
shared-bindings/audiocore/__init__.c \
@@ -85,6 +86,7 @@ CFLAGS += \
8586
-DCIRCUITPY_AUDIOCORE_DEBUG=1 \
8687
-DCIRCUITPY_BITMAPTOOLS=1 \
8788
-DCIRCUITPY_DISPLAYIO_UNIX=1 \
89+
-DCIRCUITPY_FUTURE=1 \
8890
-DCIRCUITPY_GIFIO=1 \
8991
-DCIRCUITPY_OS_GETENV=1 \
9092
-DCIRCUITPY_RAINBOWIO=1 \

‎py/circuitpy_mpconfig.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@ CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB)
562562
CIRCUITPY_ULAB ?= $(CIRCUITPY_FULL_BUILD)
563563
CFLAGS += -DCIRCUITPY_ULAB=$(CIRCUITPY_ULAB)
564564

565+
# whether to use -Os optimization on files in ulab
566+
CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 0
567+
565568
# CIRCUITPY_VIDEOCORE is handled in the broadcom tree.
566569
# Only for Broadcom chips.
567570
# Assume not a Broadcom build.

‎py/py.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ ULAB_SRCS := $(shell find $(TOP)/extmod/ulab/code -type f -name "*.c")
5757
SRC_MOD += $(patsubst $(TOP)/%,%,$(ULAB_SRCS))
5858
CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 -DULAB_HAS_USER_MODULE=0 -iquote $(TOP)/extmod/ulab/code
5959
$(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
60+
ifeq ($(CIRCUITPY_ULAB_OPTIMIZE_SIZE),1)
61+
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Os
62+
endif
6063
endif
6164

6265
# py object files

‎tests/cmdline/cmd_parsetree.py.exp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ bytes)
4343
Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
4444
########
45-
\.\+63
4645
arg names:
4746
(N_STATE 5)
4847
(N_EXC_STACK 0)

‎tests/unix/extra_coverage.py.exp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ RuntimeError:
2929
ame__
3030
mport
3131

32-
builtins micropython _asyncio _thread
33-
_uasyncio aesio array audiocore
34-
audiomixer binascii bitmaptools btree
35-
cexample cmath collections cppexample
36-
displayio errno ffi framebuf
37-
gc hashlib json math
38-
qrio rainbowio re struct
39-
synthio sys termios traceback
40-
ubinascii uctypes uerrno uheapq
41-
uio ujson ulab ulab.numpy
42-
ulab.numpy.fft ulab.numpy.linalg ulab.scipy
43-
ulab.scipy.linalg ulab.scipy.optimize
44-
ulab.scipy.signal ulab.scipy.special
45-
ulab.utils uos urandom ure
46-
uselect utime utimeq uzlib
47-
zlib
32+
builtins micropython __future__ _asyncio
33+
_thread _uasyncio aesio array
34+
audiocore audiomixer binascii bitmaptools
35+
btree cexample cmath collections
36+
cppexample displayio errno ffi
37+
framebuf gc hashlib json
38+
math qrio rainbowio re
39+
struct synthio sys termios
40+
traceback ubinascii uctypes uerrno
41+
uheapq uio ujson ulab
42+
ulab.numpy ulab.numpy.fft ulab.numpy.linalg
43+
ulab.scipy ulab.scipy.linalg
44+
ulab.scipy.optimize ulab.scipy.signal
45+
ulab.scipy.special ulab.utils uos
46+
urandom ure uselect utime
47+
utimeq uzlib zlib
4848
ime
4949

5050
utime utimeq

0 commit comments

Comments
 (0)