From 2ebcfc600cf2841932fb48b85ecf1a680980a269 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 19 Sep 2022 22:53:52 +0200 Subject: [PATCH] micropython: Update ulab to 5.1.1. * Fixes #1697. --- src/omv/modules/ulab | 2 +- src/omv/ports/nrf/omv_portconfig.mk | 1 + src/omv/ports/rp2/omv_portconfig.cmake | 1 + src/omv/ports/stm32/omv_portconfig.mk | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/omv/modules/ulab b/src/omv/modules/ulab index 0c7c6b88f..57de23c1f 160000 --- a/src/omv/modules/ulab +++ b/src/omv/modules/ulab @@ -1 +1 @@ -Subproject commit 0c7c6b88f3ec1b1d11d2f7d8b185e28ac657c06d +Subproject commit 57de23c1fb434ba99aaafe1d00bd77d5cdf5d66b diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index f976ccb7d..9736c1285 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -317,6 +317,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/ulab/,\ code/numpy/fft/fft.o \ code/numpy/fft/fft_tools.o \ code/numpy/filter.o \ + code/numpy/io/io.o \ code/numpy/linalg/linalg.o \ code/numpy/linalg/linalg_tools.o \ code/numpy/ndarray/ndarray_iter.o \ diff --git a/src/omv/ports/rp2/omv_portconfig.cmake b/src/omv/ports/rp2/omv_portconfig.cmake index 8af22d900..83090fa1d 100644 --- a/src/omv/ports/rp2/omv_portconfig.cmake +++ b/src/omv/ports/rp2/omv_portconfig.cmake @@ -231,6 +231,7 @@ if(MICROPY_PY_ULAB) ${MICROPY_ULAB_DIR}/code/numpy/fft/fft.c ${MICROPY_ULAB_DIR}/code/numpy/fft/fft_tools.c ${MICROPY_ULAB_DIR}/code/numpy/filter.c + ${MICROPY_ULAB_DIR}/code/numpy/io/io.c ${MICROPY_ULAB_DIR}/code/numpy/linalg/linalg.c ${MICROPY_ULAB_DIR}/code/numpy/linalg/linalg_tools.c ${MICROPY_ULAB_DIR}/code/numpy/ndarray/ndarray_iter.c diff --git a/src/omv/ports/stm32/omv_portconfig.mk b/src/omv/ports/stm32/omv_portconfig.mk index b6d580845..9c9ee4fa2 100644 --- a/src/omv/ports/stm32/omv_portconfig.mk +++ b/src/omv/ports/stm32/omv_portconfig.mk @@ -427,6 +427,7 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/ulab/,\ code/numpy/fft/fft.o \ code/numpy/fft/fft_tools.o \ code/numpy/filter.o \ + code/numpy/io/io.o \ code/numpy/linalg/linalg.o \ code/numpy/linalg/linalg_tools.o \ code/numpy/ndarray/ndarray_iter.o \