cnn: Fixup dynamic module build

Needs different config from external C...

Author: jonnor

dependencies/TinyMaix

@@ -7,6 +7,9 @@
 /* Define CONFIG_FP32 first */
 #define CONFIG_FP32
 
+// for external module we need static
+#define TM_STATIC static
+
 /* Include the fp32 tm_port.h directly */
 #include "../tinymaix_cnn/fp32/tm_port.h"
 

src/emlearn_cnn_fp32/emlearn_cnn_fp32.c

@@ -7,6 +7,9 @@
 /* Define CONFIG_INT8 first */
 #define CONFIG_INT8
 
+// for external module we need static
+#define TM_STATIC static
+
 /* Include the int8 tm_port.h directly */
 #include "../tinymaix_cnn/int8/tm_port.h"
 

src/emlearn_cnn_int8/emlearn_cnn_int8.c

@@ -35,6 +35,8 @@ $(DIST_FILE): $(MOD).mpy $(DIST_DIR)
 # Include to get the rules for compiling and linking the module
 include $(MPY_DIR)/py/dynruntime.mk
 
-CFLAGS += -I$(CONFIG_DIR) -I$(TINYMAIX_DIR)/include -I$(TINYMAIX_DIR)/src -Wno-error=unused-variable -Wno-error=multichar -Wdouble-promotion
+CONFIG_DEFINE = CONFIG_$(shell echo $(CONFIG) | tr '[:lower:]' '[:upper:]')
+
+CFLAGS += -D${CONFIG_DEFINE} -I$(CONFIG_DIR) -I$(TINYMAIX_DIR)/include -I$(TINYMAIX_DIR)/src -Wno-error=unused-variable -Wno-error=multichar -Wdouble-promotion
 
 dist: $(DIST_FILE)

src/tinymaix_cnn/Makefile

@@ -35,21 +35,20 @@ limitations under the License.
 #define TM_MDL_TYPE     TM_MDL_FP32
 #define TM_FASTSCALE    (0)         //enable if your chip don't have FPU, may speed up 1/3, but decrease accuracy
 #define TM_LOCAL_MATH   (1)         //use local math func (like exp()) to avoid libm
-#define TM_ENABLE_STAT  (1)         //enable mdl stat functions
+#define TM_ENABLE_STAT  (0)         //enable mdl stat functions
 #define TM_MAX_CSIZE    (1000)      //max channel num //used if INT8 mdl  //cost TM_MAX_CSIZE*4 Byte
 #define TM_MAX_KSIZE    (5*5)       //max kernel_size   //cost TM_MAX_KSIZE*4 Byte
 #define TM_MAX_KCSIZE   (3*3*256)   //max kernel_size*channels //cost TM_MAX_KSIZE*sizeof(mtype_t) Byte
 
 #define TM_INLINE       __attribute__((always_inline)) static inline
-#define TM_WEAK         static
+#ifndef TM_WEAK
+#define TM_WEAK         __attribute__((weak))
+#endif
 
 // Disable "static" (non-const) globals, since they are not supported by MicroPython mpy_ld.py
-// But when building multiple variants, we need static to avoid duplicate definitions
-#ifdef CONFIG_FP32
-#define TM_STATIC static
-#else
+#ifndef TM_STATIC
 #define TM_STATIC
-#endif       
+#endif      
 
 // Use MicroPython for dynamic allocation
 #define tm_malloc(x)   m_malloc(x)

src/tinymaix_cnn/fp32/tm_port.h

@@ -35,19 +35,18 @@ limitations under the License.
 #define TM_MDL_TYPE     TM_MDL_INT8
 #define TM_FASTSCALE    (0)         //enable if your chip don't have FPU, may speed up 1/3, but decrease accuracy
 #define TM_LOCAL_MATH   (1)         //use local math func (like exp()) to avoid libm
-#define TM_ENABLE_STAT  (1)         //enable mdl stat functions
+#define TM_ENABLE_STAT  (0)         //enable mdl stat functions
 #define TM_MAX_CSIZE    (1000)      //max channel num //used if INT8 mdl  //cost TM_MAX_CSIZE*4 Byte
 #define TM_MAX_KSIZE    (5*5)       //max kernel_size   //cost TM_MAX_KSIZE*4 Byte
 #define TM_MAX_KCSIZE   (3*3*256)   //max kernel_size*channels //cost TM_MAX_KSIZE*sizeof(mtype_t) Byte
 
 #define TM_INLINE       __attribute__((always_inline)) static inline
-#define TM_WEAK         static
+#ifndef TM_WEAK
+#define TM_WEAK         __attribute__((weak))
+#endif
 
 // Disable "static" (non-const) globals, since they are not supported by MicroPython mpy_ld.py
-// But when building multiple variants, we need static to avoid duplicate definitions
-#ifdef CONFIG_INT8
-#define TM_STATIC static
-#else
+#ifndef TM_STATIC
 #define TM_STATIC
 #endif       
 

src/tinymaix_cnn/int8/tm_port.h

@@ -36,7 +36,7 @@ void CNN_FREE(void *ptr);
 #elif defined(CONFIG_FP32)
 #include "./fp32/tm_port.h"
 #else
-#include "./int8/tm_port.h"  // default
+#error "No config defined"
 #endif
 #endif