mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #1532 from openmv/update_ulab
ulab: Update to v4.0.0
This commit is contained in:
commit
6cd3f12fac
@ -110,7 +110,7 @@
|
||||
// #define IMLIB_ENABLE_HIGH_RES_APRILTAGS
|
||||
|
||||
// Enable find_datamatrices() (26 KB)
|
||||
#define IMLIB_ENABLE_DATAMATRICES
|
||||
//#define IMLIB_ENABLE_DATAMATRICES
|
||||
|
||||
// Enable find_barcodes() (42 KB)
|
||||
#define IMLIB_ENABLE_BARCODES
|
||||
@ -132,7 +132,7 @@
|
||||
#define IMLIB_FIND_TEMPLATE
|
||||
|
||||
// Enable find_lbp()
|
||||
#define IMLIB_ENABLE_FIND_LBP
|
||||
//#define IMLIB_ENABLE_FIND_LBP
|
||||
|
||||
// Enable find_keypoints()
|
||||
#define IMLIB_ENABLE_FIND_KEYPOINTS
|
||||
|
||||
@ -10,5 +10,7 @@
|
||||
#define __ULAB_CONFIG_H__
|
||||
// Override ulab defaults here.
|
||||
#define NDARRAY_BINARY_USES_FUN_POINTER (1)
|
||||
#define ULAB_VECTORISE_USES_FUN_POINTER (1)
|
||||
#define ULAB_SCIPY_HAS_OPTIMIZE_MODULE (1)
|
||||
#define ULAB_SCIPY_HAS_SPECIAL_MODULE (0)
|
||||
#endif //__ULAB_CONFIG_H__
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit be9033384eb86a172ef35f6c7b562bc86f194d7d
|
||||
Subproject commit 0c7c6b88f3ec1b1d11d2f7d8b185e28ac657c06d
|
||||
@ -305,27 +305,35 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/,\
|
||||
|
||||
ifeq ($(MICROPY_PY_ULAB), 1)
|
||||
FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/ulab/,\
|
||||
code/scipy/optimize/optimize.o \
|
||||
code/scipy/signal/signal.o \
|
||||
code/scipy/special/special.o \
|
||||
code/ndarray_operators.o \
|
||||
code/ulab_tools.o \
|
||||
code/ndarray.o \
|
||||
code/numpy/approx/approx.o \
|
||||
code/numpy/compare/compare.o \
|
||||
code/ulab_create.o \
|
||||
code/ndarray_operators.o \
|
||||
code/ndarray_properties.o \
|
||||
code/numpy/approx.o \
|
||||
code/numpy/carray/carray.o \
|
||||
code/numpy/carray/carray_tools.o \
|
||||
code/numpy/compare.o \
|
||||
code/numpy/create.o \
|
||||
code/numpy/fft/fft.o \
|
||||
code/numpy/fft/fft_tools.o \
|
||||
code/numpy/filter/filter.o \
|
||||
code/numpy/filter.o \
|
||||
code/numpy/linalg/linalg.o \
|
||||
code/numpy/linalg/linalg_tools.o \
|
||||
code/numpy/numerical/numerical.o \
|
||||
code/numpy/poly/poly.o \
|
||||
code/numpy/vector/vector.o \
|
||||
code/user/user.o \
|
||||
code/numpy/ndarray/ndarray_iter.o \
|
||||
code/numpy/numerical.o \
|
||||
code/numpy/numpy.o \
|
||||
code/numpy/poly.o \
|
||||
code/numpy/stats.o \
|
||||
code/numpy/transform.o \
|
||||
code/numpy/vector.o \
|
||||
code/scipy/linalg/linalg.o \
|
||||
code/scipy/optimize/optimize.o \
|
||||
code/scipy/scipy.o \
|
||||
code/scipy/signal/signal.o \
|
||||
code/scipy/special/special.o \
|
||||
code/ulab.o \
|
||||
code/ulab_tools.o \
|
||||
code/user/user.o \
|
||||
code/utils/utils.o \
|
||||
)
|
||||
endif
|
||||
|
||||
|
||||
@ -223,27 +223,35 @@ if(MICROPY_PY_ULAB)
|
||||
)
|
||||
|
||||
set(ULAB_SOURCES
|
||||
${MICROPY_ULAB_DIR}/code/scipy/optimize/optimize.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/signal/signal.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/special/special.c
|
||||
${MICROPY_ULAB_DIR}/code/ndarray_operators.c
|
||||
${MICROPY_ULAB_DIR}/code/ulab_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/ndarray.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/approx/approx.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/compare/compare.c
|
||||
${MICROPY_ULAB_DIR}/code/ulab_create.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/fft/fft.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/fft/fft_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/filter/filter.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/linalg/linalg.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/linalg/linalg_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/numerical/numerical.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/poly/poly.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/vector/vector.c
|
||||
${MICROPY_ULAB_DIR}/code/user/user.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/numpy.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/scipy.c
|
||||
${MICROPY_ULAB_DIR}/code/ulab.c
|
||||
${MICROPY_ULAB_DIR}/code/ndarray.c
|
||||
${MICROPY_ULAB_DIR}/code/ndarray_operators.c
|
||||
${MICROPY_ULAB_DIR}/code/ndarray_properties.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/approx.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/carray/carray.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/carray/carray_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/compare.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/create.c
|
||||
${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/linalg/linalg.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/linalg/linalg_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/ndarray/ndarray_iter.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/numerical.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/numpy.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/poly.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/stats.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/transform.c
|
||||
${MICROPY_ULAB_DIR}/code/numpy/vector.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/linalg/linalg.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/optimize/optimize.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/scipy.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/signal/signal.c
|
||||
${MICROPY_ULAB_DIR}/code/scipy/special/special.c
|
||||
${MICROPY_ULAB_DIR}/code/ulab.c
|
||||
${MICROPY_ULAB_DIR}/code/ulab_tools.c
|
||||
${MICROPY_ULAB_DIR}/code/user/user.c
|
||||
${MICROPY_ULAB_DIR}/code/utils/utils.c
|
||||
)
|
||||
|
||||
target_sources(${MICROPY_TARGET} PRIVATE ${ULAB_SOURCES})
|
||||
|
||||
@ -408,27 +408,35 @@ FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/drivers/,\
|
||||
|
||||
ifeq ($(MICROPY_PY_ULAB), 1)
|
||||
FIRM_OBJ += $(addprefix $(BUILD)/$(MICROPY_DIR)/modules/ulab/,\
|
||||
code/scipy/optimize/optimize.o \
|
||||
code/scipy/signal/signal.o \
|
||||
code/scipy/special/special.o \
|
||||
code/ndarray_operators.o \
|
||||
code/ulab_tools.o \
|
||||
code/ndarray.o \
|
||||
code/numpy/approx/approx.o \
|
||||
code/numpy/compare/compare.o \
|
||||
code/ulab_create.o \
|
||||
code/ndarray_operators.o \
|
||||
code/ndarray_properties.o \
|
||||
code/numpy/approx.o \
|
||||
code/numpy/carray/carray.o \
|
||||
code/numpy/carray/carray_tools.o \
|
||||
code/numpy/compare.o \
|
||||
code/numpy/create.o \
|
||||
code/numpy/fft/fft.o \
|
||||
code/numpy/fft/fft_tools.o \
|
||||
code/numpy/filter/filter.o \
|
||||
code/numpy/filter.o \
|
||||
code/numpy/linalg/linalg.o \
|
||||
code/numpy/linalg/linalg_tools.o \
|
||||
code/numpy/numerical/numerical.o \
|
||||
code/numpy/poly/poly.o \
|
||||
code/numpy/vector/vector.o \
|
||||
code/user/user.o \
|
||||
code/numpy/ndarray/ndarray_iter.o \
|
||||
code/numpy/numerical.o \
|
||||
code/numpy/numpy.o \
|
||||
code/numpy/poly.o \
|
||||
code/numpy/stats.o \
|
||||
code/numpy/transform.o \
|
||||
code/numpy/vector.o \
|
||||
code/scipy/linalg/linalg.o \
|
||||
code/scipy/optimize/optimize.o \
|
||||
code/scipy/scipy.o \
|
||||
code/scipy/signal/signal.o \
|
||||
code/scipy/special/special.o \
|
||||
code/ulab.o \
|
||||
code/ulab_tools.o \
|
||||
code/user/user.o \
|
||||
code/utils/utils.o \
|
||||
)
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user