Jeff Epler
308627c9aa
* Properly register submodules of ulab This is related to * https://github.com/adafruit/circuitpython/issues/6066 in which, after the merge of 1.18 into CircuitPython, we lost the ability to import submodules of built-in modules. While reconstructing the changes we had made locally to enable this, I discovered that there was an easier way: simply register the dotted module names via MP_REGISTER_MODULE. * Fix finding processor count when no `python` executable is installed debian likes to install only `python3`, and not `python` (which was, for many decades, python2). This was previously done for `build.sh` but not for `build-cp.sh`. * Only use this submodule feature in CircuitPython .. as it does not work properly in MicroPython. Also, modules to be const. This saves a small amount of RAM * Fix -Werror=undef diagnostic Most CircuitPython ports build with -Werror=undef, so that use of an undefined preprocessor flag is an error. Also, CircuitPython's micropython version is old enough that MICROPY_VERSION is not (ever) defined. Defensively check for this macro being defined, and use the older style of MP_REGISTER_MODULE when it is not. * Fix -Werror=discarded-qualifiers diagnostics Most CircuitPython ports build with -Werror=discarded-qualifiers. This detected a problem where string constants were passed to functions with non-constant parameter types. * bump version number * Use MicroPython-compatible registration of submodules * straggler * Remove spurious casts these were build errors for micropython * Run tests for both nanbox and regular variant during CI
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
|
|
/*
|
|
* This file is part of the micropython-ulab project,
|
|
*
|
|
* https://github.com/v923z/micropython-ulab
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2020 Jeff Epler for Adafruit Industries
|
|
* 2020 Scott Shawcroft for Adafruit Industries
|
|
* 2020-2021 Zoltán Vörös
|
|
* 2020 Taku Fukada
|
|
*/
|
|
|
|
#include <math.h>
|
|
#include "py/runtime.h"
|
|
|
|
#include "../ulab.h"
|
|
#include "optimize/optimize.h"
|
|
#include "signal/signal.h"
|
|
#include "special/special.h"
|
|
#include "linalg/linalg.h"
|
|
|
|
#if ULAB_HAS_SCIPY
|
|
|
|
//| """Compatibility layer for scipy"""
|
|
//|
|
|
|
|
static const mp_rom_map_elem_t ulab_scipy_globals_table[] = {
|
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_scipy) },
|
|
#if ULAB_SCIPY_HAS_LINALG_MODULE
|
|
{ MP_ROM_QSTR(MP_QSTR_linalg), MP_ROM_PTR(&ulab_scipy_linalg_module) },
|
|
#endif
|
|
#if ULAB_SCIPY_HAS_OPTIMIZE_MODULE
|
|
{ MP_ROM_QSTR(MP_QSTR_optimize), MP_ROM_PTR(&ulab_scipy_optimize_module) },
|
|
#endif
|
|
#if ULAB_SCIPY_HAS_SIGNAL_MODULE
|
|
{ MP_ROM_QSTR(MP_QSTR_signal), MP_ROM_PTR(&ulab_scipy_signal_module) },
|
|
#endif
|
|
#if ULAB_SCIPY_HAS_SPECIAL_MODULE
|
|
{ MP_ROM_QSTR(MP_QSTR_special), MP_ROM_PTR(&ulab_scipy_special_module) },
|
|
#endif
|
|
};
|
|
|
|
static MP_DEFINE_CONST_DICT(mp_module_ulab_scipy_globals, ulab_scipy_globals_table);
|
|
|
|
const mp_obj_module_t ulab_scipy_module = {
|
|
.base = { &mp_type_module },
|
|
.globals = (mp_obj_dict_t*)&mp_module_ulab_scipy_globals,
|
|
};
|
|
#if CIRCUITPY_ULAB
|
|
#if !defined(MICROPY_VERSION) || MICROPY_VERSION <= 70144
|
|
MP_REGISTER_MODULE(MP_QSTR_ulab_dot_scipy, ulab_scipy_module, MODULE_ULAB_ENABLED);
|
|
#else
|
|
MP_REGISTER_MODULE(MP_QSTR_ulab_dot_scipy, ulab_scipy_module);
|
|
#endif
|
|
#endif
|
|
#endif /* ULAB_HAS_SCIPY */
|