initial working commit

Author: cknorow-sensiml

src/embedded_ml_sdk/classifiers/nnom_middleware/nnom_middleware.c

@@ -25,7 +25,7 @@ License along with SensiML Piccolo AI. If not, see <https://www.gnu.org/licenses
 
 float results[NNOM_MAX_NUMBER_REULTS];
 
-nnom_classifier_rows_t nnom_classifier_rows;
+nnom_classifier_rows_t *nnom_classifier_rows;
 float probability;
 int32_t label;
 
@@ -77,15 +77,15 @@ uint8_t nnom_simple_submit(uint8_t classifier_id, feature_vector_t *feature_vect
     */
     model_results->result = (float)label;
 
-    return float(label);
+    return (float)label; 
 }
 
 void nnom_init(nnom_classifier_rows_t *classifier_table, const uint8_t num_classifiers)
 {
     model = nnom_model_create();
     nnom_classifier_rows = classifier_table;
-    nnom_classifier_rows[0].model=model
-    last_nnom_initialized=0
+    nnom_classifier_rows[0].model=model;
+    last_nnom_initialized=0;
 
 }
 

src/server/codegen/knowledgepack_codegen_mixin.py

@@ -264,13 +264,18 @@ def create_classifier_structures(self, classifier_types, kb_models):
         formated_classifier_types = [
             x.lower().replace(" ", "_") for x in classifier_types
         ]
+        
+        def is_neural_netwrok(classifier_type):
+            return (classifier_type == "tensorflow_lite_for_microcontrollers" or classifier_type == 'neural_network')
 
         formated_classifier_types = [
-            x if x != "tensorflow_lite_for_microcontrollers" else "tf_micro"
+            x if not is_neural_netwrok(x) else self.nn_inference_engine
             for x in formated_classifier_types
         ]
+        
+        
 
-        logger.debug(
+        logger.info(
             {
                 "message": "CLASSIFIER TYPE INFORMATION",
                 "data": formated_classifier_types,
@@ -349,8 +354,8 @@ def create_kb_classifier_headers(self, classifier_types):
             output.append('#include "bonsai_trained_models.h"')
 
         if self.is_tensorflow(classifier_types):
-            if self.nn_inference_engine == "nnom":
-                output.append('#include "nnom.h"')
+            if self.nn_inference_engine == "nnom":                
+                output.append('#include "nnom_trained_models.h"')
                 output.append('#include "nnom_middleware.h"')
 
             if self.nn_inference_engine == "tf_micro":
@@ -419,7 +424,7 @@ def create_kb_classifier_init(self, classifier_types):
 
         if self.is_tensorflow(classifier_types):
             if self.nn_inference_engine == "nnom":
-                output.append(c_line(1, "nnom_init(tf_micro_classifier_rows, 0);"))                
+                output.append(c_line(1, "nnom_init(nnom_classifier_rows, 0);"))                
 
             if self.nn_inference_engine == "tf_micro":
                 output.append(c_line(1, "tf_micro_init(tf_micro_classifier_rows, 0);"))

src/server/codegen/model_gen/nnom.py

@@ -113,7 +113,7 @@ def create_classifier_structures(models):
 
 
 def create_max_tmp_parameters(kb_models):
-   pass
+   return []
 
 def validate_model_parameters(data):
     pass

src/server/codegen/templates/compilers/x86gcc_generic/libsensiml/sml_profile_utils.h

@@ -27,6 +27,9 @@ License along with SensiML Piccolo AI. If not, see <https://www.gnu.org/licenses
 #include <string.h>
 #include <time.h>
 
+#ifdef __cplusplus // Only compile this when c++
+
+
 static struct timespec ts_end;
 static struct timespec ts_begin;
 static long total_time_ms;
@@ -66,4 +69,6 @@ float sml_profile_get_avg_iteration_time(uint32_t iterations)
     return (sml_profile_get_total_time())/(iterations * 1.0f);
 }
 
+#endif
+
 #endif // __SML_PROFILE_UTILS_H__

src/server/codegen/templates/trained_classifiers/nnom/nnom_trained_models.c

@@ -1,13 +1,4 @@
 
 #include "nnom_trained_models.h"
 
-nnom_classifier_rows_t nnom_classifier_rows[1] = {
-    {
-    .num_inputs=9,
-    .num_outputs=2,
-    .threshold=0.5,
-    .estimator_type=0,
-    .model = null.
-
-    }
-}
+// FILL_NNOM_CLASSIFIER_STRUCTS

src/server/codegen/templates/trained_classifiers/nnom/nnom_trained_models.h

@@ -27,7 +27,7 @@ extern "C"
 {
 #endif
 
-extern nnom_classifier_rows_t NNOMClassifierTable[];
+extern nnom_classifier_rows_t nnom_classifier_rows[];
 
 
 #ifdef __cplusplus