cnn: Enable for Unix/external build (fp32 only for now)

Author: jonnor

src/emlearn_cnn_fp32/emlearn_cnn_fp32.py

@@ -0,0 +1,6 @@
+# emlearn_cnn_fp32 - wrapper for frozen unix build
+# Imports the native C module compiled with fp32 configuration
+try:
+    from tinymaix_cnn_fp32_native import *
+except ImportError:
+    pass

src/emlearn_cnn_fp32/micropython.mk

@@ -0,0 +1,18 @@
+# emlearn_cnn_fp32 wrapper for Unix port
+# Compiles mod_cnn.c with fp32 configuration
+
+CNN_SRC := $(USERMOD_DIR)/../tinymaix_cnn
+
+# Add C source file from tinymaix_cnn
+SRC_USERMOD_C += $(CNN_SRC)/mod_cnn.c
+
+# Include paths
+CFLAGS_USERMOD += -I$(CNN_SRC)/fp32
+CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/include
+CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/src
+
+# Compile flags
+CFLAGS_USERMOD += -Wno-error=unused-variable -Wno-error=multichar -Wdouble-promotion
+
+# Define CONFIG_FP32 for the C code
+CFLAGS_USERMOD += -DCONFIG_FP32

src/manifest_unix.py

@@ -4,6 +4,7 @@
 # Ref https://docs.micropython.org/en/latest/reference/manifest.html
 module("emlearn_trees.py", base_path='./emlearn_trees')
 module("emlearn_kmeans.py", base_path='./emlearn_kmeans')
+module("emlearn_cnn_fp32.py", base_path='./emlearn_cnn_fp32')
 module("emlearn_fft.py", base_path='./emlearn_fft')
 module("emlearn_linreg.py", base_path='./emlearn_linreg')
 module("emlearn_logreg.py", base_path='./emlearn_logreg')

src/tinymaix_cnn/mod_cnn.c

@@ -301,8 +301,8 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 // Define a class
 static const mp_rom_map_elem_t mod_cnn_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&mod_cnn_run_obj) },
-    { MP_ROM_QSTR(MP_QSTR_output_dimensions), MP_ROM_PTR(&mod_cnn_del_obj) },
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mod_cnn_output_dimensions_obj) }
+    { MP_ROM_QSTR(MP_QSTR_output_dimensions), MP_ROM_PTR(&mod_cnn_output_dimensions_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mod_cnn_del_obj) }
 };
 static MP_DEFINE_CONST_DICT(mod_cnn_locals_dict, mod_cnn_locals_dict_table);
 
@@ -325,8 +325,12 @@ const mp_obj_module_t mod_cnn_cmodule = {
     .globals = (mp_obj_dict_t *)&mod_cnn_globals,
 };
 
-// FIXME: unhardcode config part of module name
+// Module name depends on CONFIG
+#ifdef CONFIG_FP32
+MP_REGISTER_MODULE(MP_QSTR_tinymaix_cnn_fp32_native, mod_cnn_cmodule);
+#else
 MP_REGISTER_MODULE(MP_QSTR_emlearn_cnn_int8, mod_cnn_cmodule);
 #endif
+#endif