examples/natmod/deepcraft: Refactored dc enablement.

Signed-off-by: NikhitaR-IFX <nikhita.rajasekhar@infineon.com>

Author: NikhitaR-IFX

examples/natmod/deepcraft/Makefile

@@ -13,12 +13,9 @@ ARCH = armv7emsp
 # Link with libm.a and libgcc.a from the toolchain
 LINK_RUNTIME = 1
 
-CFLAGS += -Dsqrtf=__builtin_sqrtf -fno-math-errno -fno-trapping-math -fno-builtin-logf -ffreestanding
-CFLAGS += -Dlogf=logf
+override LIBGCC_PATH := gcc/lib/gcc/arm-none-eabi/11.3.1/thumb/v7e-m+fp/hard/libgcc.a
+override LIBM_PATH := gcc/arm-none-eabi/lib/thumb/v7e-m+fp/hard/libm.a
 
-#CFLAGS += -Dlogf=__builtin_logf -ffreestanding -fno-math-errno -fno-trapping-math -ffast-math
-
-# Include to get the rules for compiling and linking the module
 include $(MPY_DIR)/py/dynruntime.mk
 
 # Custom clean target

examples/natmod/deepcraft/dc_mp_iface.c

@@ -1,27 +1,12 @@
 #include "py/dynruntime.h"
 
-
 #if !defined(__linux__)
 void *memcpy(void *dst, const void *src, size_t n) {
     return mp_fun_table.memmove_(dst, src, n);
 }
 void *memset(void *s, int c, size_t n) {
     return mp_fun_table.memset_(s, c, n);
 }
-
-__attribute__((weak))
-float logf(float x) {
-    // Basic fallback or dummy version — avoids pulling in full libm
-    // Replace with your approximation if needed
-    return 0.0f;  // Just to satisfy the linker
-}
-
-/*float logf(float x) {
-    // Optional: You can define a very basic approximation, or just return x
-    // to make the code compile and defer real computation
-    return x;  // Placeholder – replace with approximation if needed
-}*/
-
 #endif
 
 int native_errno=0;
@@ -36,15 +21,10 @@ int *__errno (void)
 
 #include "examples/natmod/deepcraft/mp_src.c"
 
-
-typedef struct _dc_obj_t {
-    mp_obj_base_t base;
-} dc_obj_t;
-
 // Forward declaration of type
 mp_obj_full_type_t dc_type;
 
-mp_map_elem_t dc_locals_dict_table[3];
+mp_map_elem_t dc_locals_dict_table[5];
 static MP_DEFINE_CONST_DICT(dc_locals_dict, dc_locals_dict_table);
 
 // Constructor
@@ -67,9 +47,10 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     dc_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_init), MP_OBJ_FROM_PTR(&init_obj) };
     dc_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_enqueue), MP_OBJ_FROM_PTR(&enqueue_obj) };
     dc_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_dequeue), MP_OBJ_FROM_PTR(&dequeue_obj) };
- 
+    dc_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get_model_input_dim), MP_OBJ_FROM_PTR(&get_model_input_dim_obj) };
+    dc_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get_model_output_dim), MP_OBJ_FROM_PTR(&get_model_output_dim_obj) };
 
-    MP_OBJ_TYPE_SET_SLOT(&dc_type, locals_dict, (void*)&dc_locals_dict, 2);
+    MP_OBJ_TYPE_SET_SLOT(&dc_type, locals_dict, (void*)&dc_locals_dict, 5);
 
     // Expose constructor as DEEPCRAFT
     mp_store_global(MP_QSTR_DEEPCRAFT, MP_OBJ_FROM_PTR(&dc_type));

examples/natmod/deepcraft/mp_src.c

@@ -2,32 +2,68 @@
 #include "model.h"
 #include <string.h>
 
-mp_obj_t init(void){
-    //assign();
+typedef struct _dc_obj_t {
+    mp_obj_base_t base;
+    bool model_state; 
+    uint8_t model_in_dim;
+    uint8_t model_out_dim;
+} dc_obj_t;
+
+mp_obj_t get_model_input_dim(mp_obj_t self_in){
+    dc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->model_in_dim);
+}
+
+mp_obj_t get_model_output_dim(mp_obj_t self_in){
+    dc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(self->model_out_dim);
+}
+
+mp_obj_t init(mp_obj_t self_in){
+    dc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->model_state = true;
+    self->model_in_dim = IMAI_DATA_IN_COUNT;
+    self->model_out_dim = IMAI_DATA_OUT_COUNT;
     IMAI_init();
     return mp_const_none;
 }
 
-mp_obj_t enqueue(const mp_obj_t data_in_obj){
-    float data_in[IMAI_DATA_IN_COUNT];
+mp_obj_t enqueue(mp_obj_t self_in, const mp_obj_t data_in_obj){
+    dc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    
+    // Check if model is initialized
+    if(!self->model_state){
+        mp_raise_ValueError("Model should be initialized first.");
+    }
+
+    float data_in[self->model_in_dim];
     mp_obj_t *data_in_items;
     size_t len;
     mp_obj_get_array(data_in_obj, &len, &data_in_items);
-    if (len != IMAI_DATA_IN_COUNT) {
-        mp_raise_ValueError("data_in must be a list of IMAI_DATA_IN_COUNT floats");
+
+    if (len != self->model_in_dim) {
+        mp_raise_ValueError("data_in must be a list of floats with size matching to input dimensions to model. Check using get_model_input_dim().");
     }
-    for (int i = 0; i < IMAI_DATA_IN_COUNT; i++) {
+
+    for (int i = 0; i < self->model_in_dim; i++) {
         data_in[i] = mp_obj_get_float(data_in_items[i]);
     }
     int result = IMAI_enqueue(data_in);
     return MP_OBJ_NEW_SMALL_INT(result);
-    return mp_const_none;
 }
 
-mp_obj_t dequeue(mp_obj_t data_out_obj) {
+mp_obj_t dequeue(mp_obj_t self_in, mp_obj_t data_out_obj) {
+    dc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
     mp_buffer_info_t buf_info;
     mp_get_buffer(data_out_obj, &buf_info, MP_BUFFER_WRITE);
     float *data_out = (float *)buf_info.buf;
+    size_t len = buf_info.len / sizeof(float);
+
+    if (len != self->model_out_dim) {
+        mp_raise_ValueError("data_out must be a list of floats with size matching to output dimensions of model. Check using get_model_output_dim().");
+    }
+    
     int result = IMAI_dequeue(data_out);
     if (result == 0) {
         return MP_OBJ_NEW_SMALL_INT(result);
@@ -37,22 +73,31 @@ mp_obj_t dequeue(mp_obj_t data_out_obj) {
         mp_raise_ValueError(MP_ERROR_TEXT("Internal memory allocation error"));
     }
     return MP_OBJ_NEW_SMALL_INT(result);
-    //return mp_const_none;
 }
 
 
 static const mp_obj_fun_builtin_fixed_t init_obj = {
-    .base = { &mp_type_fun_builtin_0 },
-    .fun._0 = (mp_fun_0_t)init,
+    .base = { &mp_type_fun_builtin_1 },
+    .fun._1 = (mp_fun_1_t)init,
 };
 
 
 static const mp_obj_fun_builtin_fixed_t enqueue_obj = {
-    .base = { &mp_type_fun_builtin_1 },
-    .fun._1 = (mp_fun_1_t)enqueue,
+    .base = { &mp_type_fun_builtin_2 },
+    .fun._2 = (mp_fun_2_t)enqueue,
 };
 
 static const mp_obj_fun_builtin_fixed_t dequeue_obj = {
+    .base = { &mp_type_fun_builtin_2 },
+    .fun._2 = (mp_fun_2_t)dequeue,
+};
+
+static const mp_obj_fun_builtin_fixed_t get_model_input_dim_obj = {
+    .base = { &mp_type_fun_builtin_1 },
+    .fun._1 = (mp_fun_1_t)get_model_input_dim,
+};
+
+static const mp_obj_fun_builtin_fixed_t get_model_output_dim_obj = {
     .base = { &mp_type_fun_builtin_1 },
-    .fun._1 = (mp_fun_1_t)dequeue,
+    .fun._1 = (mp_fun_1_t)get_model_output_dim,
 };