Merge pull request #8126 from jepler/update-ulab-6.3.2

update ulab to 6.3.2
2023-07-26 11:54:42 -04:00 · 2023-07-26 11:54:42 -04:00 · 5cc42d5041
commit 5cc42d5041
parent fd83a09078 318191433d
18 changed files with 117 additions and 20 deletions
--- a/extmod/ulab
+++ b/extmod/ulab
@ -1 +1 @@
-Subproject commit 6619c20b3b75864554fcee5f88846fac27df5701
+Subproject commit 3728d22732dedc8a591b7df18a16d3ef1aed6a39
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@ -2765,6 +2765,10 @@ msgstr ""
 msgid "cannot create instance"
 msgstr ""

+#: extmod/ulab/code/ndarray.c
+msgid "cannot delete array elements"
+msgstr ""
+
 #: py/runtime.c
 msgid "cannot import name %q"
 msgstr ""
@ -3222,6 +3226,14 @@ msgstr ""
 msgid "inline assembler must be a function"
 msgstr ""

+#: extmod/ulab/code/numpy/vector.c
+msgid "input and output dimensions differ"
+msgstr ""
+
+#: extmod/ulab/code/numpy/vector.c
+msgid "input and output shapes differ"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c
 msgid "input argument must be an integer, a tuple, or a list"
 msgstr ""
@ -3550,6 +3562,10 @@ msgstr ""
 msgid "native yield"
 msgstr ""

+#: extmod/ulab/code/ndarray.c
+msgid "ndarray length overflows"
+msgstr ""
+
 #: py/runtime.c
 #, c-format
 msgid "need more than %d values to unpack"
@ -3648,6 +3664,10 @@ msgstr ""
 msgid "not implemented for complex dtype"
 msgstr ""

+#: extmod/ulab/code/numpy/bitwise.c
+msgid "not supported for input types"
+msgstr ""
+
 #: extmod/ulab/code/numpy/create.c
 msgid "number of points must be at least 2"
 msgstr ""
@ -3758,8 +3778,8 @@ msgstr ""
 msgid "opcode"
 msgstr ""

-#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/compare.c
-#: extmod/ulab/code/numpy/vector.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
+#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
 msgid "operands could not be broadcast together"
 msgstr ""

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

+#: extmod/ulab/code/numpy/vector.c
+msgid "out keyword is not supported for complex dtype"
+msgstr ""
+
+#: extmod/ulab/code/numpy/vector.c
+msgid "out keyword is not supported for function"
+msgstr ""
+
 #: extmod/ulab/code/utils/utils.c
 msgid "out must be a float dense array"
 msgstr ""

+#: extmod/ulab/code/numpy/vector.c
+msgid "out must be an ndarray"
+msgstr ""
+
+#: extmod/ulab/code/numpy/vector.c
+msgid "out must be of float dtype"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 msgid "out of range of target"
 msgstr ""
--- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
@ -13,5 +13,16 @@ LONGINT_IMPL = MPZ
 CIRCUITPY__EVE = 1
 CIRCUITPY_CANIO = 1
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_GIFIO = 0

 CIRCUITPY_LTO_PARTITION = one
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif
--- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@ -12,3 +12,13 @@ LONGINT_IMPL = MPZ

 CIRCUITPY__EVE = 1
 CIRCUITPY_SYNTHIO = 0
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif
--- a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ

 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_GIFIO = 0

 CIRCUITPY_BITBANG_APA102 = 1
--- a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk
@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ

 CIRCUITPY__EVE = 1
+CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_SYNTHIO = 0
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif
--- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ

 CIRCUITPY__EVE = 1
+CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_SYNTHIO = 0
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif
--- a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk
@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ

 CIRCUITPY_AESIO = 0
+CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GIFIO = 0
 CIRCUITPY_KEYPAD = 1
--- a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
 LONGINT_IMPL = MPZ

 CIRCUITPY_AESIO = 0
+CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GIFIO = 0
 CIRCUITPY_KEYPAD = 1
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
@ -9,4 +9,6 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_SYNTHIO = 0
--- a/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk
@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ

 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_FRAMEBUFFERIO = 0

 CIRCUITPY_BITBANG_APA102 = 1
--- a/ports/atmel-samd/mpconfigport.mk
+++ b/ports/atmel-samd/mpconfigport.mk
@ -106,6 +106,7 @@ CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
 CIRCUITPY_SAMD ?= 1
 CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12
+CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1
 CIRCUITPY_WATCHDOG ?= 1

 endif # samd51
@ -131,6 +132,7 @@ CIRCUITPY_SAMD ?= 1
 CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
 CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO)
+CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1

 endif # same51
 ######################################################################
--- a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
+++ b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
@ -17,3 +17,4 @@ LD_FILE = boards/STM32F411_fs.ld
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_ULAB = 0
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@ -28,6 +28,7 @@ $(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-shadow -Wno-sign-compare -include sha
 SRC_BITMAP := \
 	shared/runtime/context_manager_helpers.c \
 	displayio_min.c \
+	shared-bindings/__future__/__init__.c \
 	shared-bindings/aesio/aes.c \
 	shared-bindings/aesio/__init__.c \
 	shared-bindings/audiocore/__init__.c \
@ -85,6 +86,7 @@ CFLAGS += \
 	-DCIRCUITPY_AUDIOCORE_DEBUG=1 \
 	-DCIRCUITPY_BITMAPTOOLS=1 \
 	-DCIRCUITPY_DISPLAYIO_UNIX=1 \
+	-DCIRCUITPY_FUTURE=1 \
 	-DCIRCUITPY_GIFIO=1 \
 	-DCIRCUITPY_OS_GETENV=1 \
 	-DCIRCUITPY_RAINBOWIO=1 \
--- a/py/circuitpy_mpconfig.mk
+++ b/py/circuitpy_mpconfig.mk
@ -562,6 +562,9 @@ CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB)
 CIRCUITPY_ULAB ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_ULAB=$(CIRCUITPY_ULAB)

+# whether to use -Os optimization on files in ulab
+CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 0
+
 # CIRCUITPY_VIDEOCORE is handled in the broadcom tree.
 # Only for Broadcom chips.
 # Assume not a Broadcom build.
--- a/py/py.mk
+++ b/py/py.mk
@ -57,6 +57,9 @@ ULAB_SRCS := $(shell find $(TOP)/extmod/ulab/code -type f -name "*.c")
 SRC_MOD += $(patsubst $(TOP)/%,%,$(ULAB_SRCS))
 CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 -DULAB_HAS_USER_MODULE=0 -iquote $(TOP)/extmod/ulab/code
 $(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
+ifeq ($(CIRCUITPY_ULAB_OPTIMIZE_SIZE),1)
+$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Os
+endif
 endif

 # py object files
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@ -42,7 +42,6 @@
 File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
-\.\+63
 arg names:
 (N_STATE 5)
 (N_EXC_STACK 0)
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@ -29,22 +29,22 @@ RuntimeError:
 ame__
 mport 

-builtins        micropython     _asyncio        _thread
-_uasyncio       aesio           array           audiocore
-audiomixer      binascii        bitmaptools     btree
-cexample        cmath           collections     cppexample
-displayio       errno           ffi             framebuf
-gc              hashlib         json            math
-qrio            rainbowio       re              struct
-synthio         sys             termios         traceback
-ubinascii       uctypes         uerrno          uheapq
-uio             ujson           ulab            ulab.numpy
-ulab.numpy.fft  ulab.numpy.linalg               ulab.scipy
-ulab.scipy.linalg               ulab.scipy.optimize
-ulab.scipy.signal               ulab.scipy.special
-ulab.utils      uos             urandom         ure
-uselect         utime           utimeq          uzlib
-zlib
+builtins        micropython     __future__      _asyncio
+_thread         _uasyncio       aesio           array
+audiocore       audiomixer      binascii        bitmaptools
+btree           cexample        cmath           collections
+cppexample      displayio       errno           ffi
+framebuf        gc              hashlib         json
+math            qrio            rainbowio       re
+struct          synthio         sys             termios
+traceback       ubinascii       uctypes         uerrno
+uheapq          uio             ujson           ulab
+ulab.numpy      ulab.numpy.fft  ulab.numpy.linalg
+ulab.scipy      ulab.scipy.linalg
+ulab.scipy.optimize             ulab.scipy.signal
+ulab.scipy.special              ulab.utils      uos
+urandom         ure             uselect         utime
+utimeq          uzlib           zlib
 ime

 utime           utimeq