cnn: Fixup int8 when built as external C module

The TinyMaix symbols were defined as weak - so int8 config
would call a function that had fp32 configuration.
Would fail in tm_load

Author: jonnor

dependencies/TinyMaix

@@ -1,6 +1,14 @@
 /*
  * emlearn_cnn_fp32 wrapper
- * This file sets CONFIG_FP32 and includes the main mod_cnn.c
+ * This file includes fp32/tm_port.h directly before including mod_cnn.c
+ * We need to modify mod_cnn.c to not include tm_port.h when CONFIG is already defined
  */
+
+/* Define CONFIG_FP32 first */
 #define CONFIG_FP32
+
+/* Include the fp32 tm_port.h directly */
+#include "../tinymaix_cnn/fp32/tm_port.h"
+
+/* Now include mod_cnn.c - it will see CONFIG_FP32 is defined and use fp32/tm_port.h */
 #include "../tinymaix_cnn/mod_cnn.c"

src/emlearn_cnn_fp32/emlearn_cnn_fp32.c

@@ -6,8 +6,9 @@ CNN_SRC := $(USERMOD_DIR)/../tinymaix_cnn
 # Add wrapper C file which defines CONFIG_FP32
 SRC_USERMOD_C += $(USERMOD_DIR)/emlearn_cnn_fp32.c
 
-# Include paths - need to include tm_port.h location
+# Include paths - config directory first to ensure correct tm_port.h is found
 CFLAGS_USERMOD += -I$(CNN_SRC)/fp32
+CFLAGS_USERMOD += -I$(CNN_SRC)/int8
 CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/include
 CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/src
 

src/emlearn_cnn_fp32/micropython.mk

@@ -1,6 +1,14 @@
 /*
  * emlearn_cnn_int8 wrapper
- * This file sets CONFIG_INT8 and includes the main mod_cnn.c
+ * This file includes int8/tm_port.h directly before including mod_cnn.c
+ * We need to modify mod_cnn.c to not include tm_port.h when CONFIG is already defined
  */
+
+/* Define CONFIG_INT8 first */
 #define CONFIG_INT8
+
+/* Include the int8 tm_port.h directly */
+#include "../tinymaix_cnn/int8/tm_port.h"
+
+/* Now include mod_cnn.c - it will see CONFIG_INT8 is defined and use int8/tm_port.h */
 #include "../tinymaix_cnn/mod_cnn.c"

src/emlearn_cnn_int8/emlearn_cnn_int8.c

@@ -6,8 +6,9 @@ CNN_SRC := $(USERMOD_DIR)/../tinymaix_cnn
 # Add wrapper C file which defines CONFIG_INT8
 SRC_USERMOD_C += $(USERMOD_DIR)/emlearn_cnn_int8.c
 
-# Include paths - need to include tm_port.h location
+# Include paths - config directory first to ensure correct tm_port.h is found
 CFLAGS_USERMOD += -I$(CNN_SRC)/int8
+CFLAGS_USERMOD += -I$(CNN_SRC)/fp32
 CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/include
 CFLAGS_USERMOD += -I$(CNN_SRC)/../../dependencies/TinyMaix/src
 

src/emlearn_cnn_int8/micropython.mk

@@ -41,7 +41,7 @@ limitations under the License.
 #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         __attribute__((weak))
+#define TM_WEAK         static
 
 // 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

src/tinymaix_cnn/fp32/tm_port.h

@@ -41,7 +41,7 @@ limitations under the License.
 #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         __attribute__((weak))
+#define TM_WEAK         static
 
 // 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

src/tinymaix_cnn/int8/tm_port.h

@@ -5,6 +5,11 @@
 #include "py/runtime.h"
 #endif
 
+// Check that only one CONFIG is defined
+#if defined(CONFIG_FP32) && defined(CONFIG_INT8)
+#error "Only one of CONFIG_FP32 or CONFIG_INT8 should be defined"
+#endif
+
 // Define unique symbol names based on CONFIG
 #ifdef CONFIG_FP32
 #define CNN_TYPE mod_cnn_fp32_type
@@ -23,8 +28,17 @@
 // Forward declaration for tm_port.h
 void CNN_FREE(void *ptr);
 
-// TinyMaix config
-#include "./tm_port.h"
+// TinyMaix config - include from the config directory
+// Only include if not already included by wrapper
+#ifndef __TM_PORT_H
+#ifdef CONFIG_INT8
+#include "./int8/tm_port.h"
+#elif defined(CONFIG_FP32)
+#include "./fp32/tm_port.h"
+#else
+#include "./int8/tm_port.h"  // default
+#endif
+#endif
 
 #include <tinymaix.h>
 
@@ -52,7 +66,7 @@ void *memset(void *s, int c, size_t n) {
 
 // get model output shapes
 //mdl: model handle; in: input mat; out: output mat
-int TM_WEAK tm_get_outputs(tm_mdl_t* mdl, tm_mat_t* out, int out_length)
+static int tm_get_outputs(tm_mdl_t* mdl, tm_mat_t* out, int out_length)
 {
     // NOTE: based on tm_run, but without actually executing
     int out_idx = 0;