App port changes

examples/natmod/deepcraft/Makefile

@@ -13,5 +13,11 @@ ARCH = armv7emsp
 # Link with libm.a and libgcc.a from the toolchain
 LINK_RUNTIME = 1
 
-# Include to get the rules for compiling and linking the module
-include $(MPY_DIR)/py/dynruntime.mk
+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
+
+include $(MPY_DIR)/py/dynruntime.mk
+
+# Custom clean target
+clean:
+	rm -rf .mpy_ld_cache/ build/ $(MOD).mpy

examples/natmod/deepcraft/dc_mp_iface.c

@@ -1,5 +1,3 @@
-#define MICROPY_PY_DEEPCRAFT_MPY (1)
-
 #include "py/dynruntime.h"
 
 #if !defined(__linux__)
@@ -21,26 +19,42 @@ int *__errno (void)
     return &native_errno;
 }
 
-mp_obj_full_type_t dcmodel_type;
-
 #include "examples/natmod/deepcraft/mp_src.c"
 
-mp_map_elem_t dcmodel_locals_dict_table[3];
-static MP_DEFINE_CONST_DICT(dcmodel_locals_dict, dcmodel_locals_dict_table);
-
-mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
-    MP_DYNRUNTIME_INIT_ENTRY
+// Forward declaration of type
+mp_obj_full_type_t dc_type;
 
-    dcmodel_type.base.type = mp_fun_table.type_type;
-    dcmodel_type.name = MP_QSTR_DEEPCRAFT;
-    //MP_OBJ_TYPE_SET_SLOT(&dcmodel_type, make_new, &deflateio_make_new, 0);
-    dcmodel_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_init), MP_OBJ_FROM_PTR(&init_obj) };
-    dcmodel_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_enqueue), MP_OBJ_FROM_PTR(&enqueue_obj) };
-    dcmodel_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_dequeue), MP_OBJ_FROM_PTR(&dequeue_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&dcmodel_type, locals_dict, (void*)&dcmodel_locals_dict, 2);
+mp_map_elem_t dc_locals_dict_table[5];
+static MP_DEFINE_CONST_DICT(dc_locals_dict, dc_locals_dict_table);
 
-    mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_deepcraft));
-    mp_store_global(MP_QSTR_DEEPCRAFT, MP_OBJ_FROM_PTR(&dcmodel_type));
+// Constructor
+static mp_obj_t dc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
+    dc_obj_t *self = mp_obj_malloc(dc_obj_t, type);
+    return MP_OBJ_FROM_PTR(self);
+}
 
+// Create type and methods at runtime
+mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
+    // This must be first, it sets up the globals dict and other things
+    MP_DYNRUNTIME_INIT_ENTRY
+
+    // Populate type
+    dc_type.base.type = (void*)&mp_type_type;
+    dc_type.flags = MP_TYPE_FLAG_NONE;
+    dc_type.name = MP_QSTR_DEEPCRAFT;
+    MP_OBJ_TYPE_SET_SLOT(&dc_type, make_new, dc_make_new, 0);
+
+    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, 5);
+
+    // Expose constructor as DEEPCRAFT
+    mp_store_global(MP_QSTR_DEEPCRAFT, MP_OBJ_FROM_PTR(&dc_type));
+    // This must be last, it restores the globals dict
     MP_DYNRUNTIME_INIT_EXIT
+
 }