整理工程

SConscript

@@ -17,15 +17,15 @@ CPPPATH += [cwd + '/include']
 
 if GetDepend(['R_TINYMAIX_USING_CIFAR10_SAMPLE']):
     src += ['examples/cifar10/cifar10.c']
-
-if GetDepend(['R_TINYMAIX_USING_MBNET_SAMPLE']):
-    src += ['examples/mbnet/mbnet.c']
+    CPPPATH += [cwd + '/examples/cifar10']
 
 if GetDepend(['R_TINYMAIX_USING_MNIST_SAMPLE']):
     src += ['examples/mnist/mnist.c']
+    CPPPATH += [cwd + '/examples/mnist']
 
 if GetDepend(['R_TINYMAIX_USING_VWW_SAMPLE']):
     src += ['examples/vww/vww.c']
+    CPPPATH += [cwd + '/examples/vww']
 
 LOCAL_CFLAGS = '--gnu'
 

examples/cifar10/cifar10.c

@@ -73,7 +73,7 @@ static void parse_output(tm_mat_t* outs)
     float maxp = 0;
     int maxi = -1;
     for(int i=0; i<CLASS_NUM; i++){
-        ("%d: %.3f\n", i, data[i]);
+        TM_PRINTF("%d: %.3f\n", i, data[i]);
         if(data[i] > maxp) {
             maxi = i;
             maxp = data[i];

examples/mnist/mnist.c

@@ -137,7 +137,7 @@ static void parse_output(tm_mat_t* outs)
     return;
 }
 
-int main(int argc, char** argv)
+int mnist(int argc, char** argv)
 {   TM_DBGT_INIT();
     TM_PRINTF("mnist demo\n");
     tm_mdl_t mdl;
@@ -172,3 +172,4 @@ int main(int argc, char** argv)
     tm_unload(&mdl);                 
     return 0;
 }
+MSH_CMD_EXPORT(mnist, TinyMaix mnist example);

examples/vww/vww.c

@@ -82,7 +82,7 @@ static void parse_output(tm_mat_t* outs)
     return;
 }
 
-int main(int argc, char** argv)
+int vww(int argc, char** argv)
 {   TM_DBGT_INIT();
     TM_PRINTF("mnist demo\n");
     tm_mdl_t mdl;
@@ -112,3 +112,4 @@ int main(int argc, char** argv)
     tm_unload(&mdl);                 
     return 0;
 }
+MSH_CMD_EXPORT(vww, TinyMaix vww example);

include/tm_port.h

@@ -50,19 +50,19 @@ limitations under the License.
 #define TM_DBGL()                   TM_PRINTF("###L%d\n",__LINE__);
 
 /******************************* DBG TIME CONFIG  ************************************/
-#define  TM_GET_MS()                rt_tick_get_millisecond();
+#define  TM_GET_US()                rt_tick_get_millisecond();
 
 #define TM_DBGT_INIT()              uint32_t _start,_finish;\
                                     float _time;\
-                                    _start = TM_GET_MS();
+                                    _start = TM_GET_US();
 
-#define TM_DBGT_START()             _start = TM_GET_MS();
+#define TM_DBGT_START()             _start = TM_GET_US();
 
 #define TM_DBGT(x)                  {\
-                                        _finish=TM_GET_MS();\
-                                        _time = (float)(_finish-_start) / 1.0;\
+                                        _finish=TM_GET_US();\
+                                        _time = (float)(_finish-_start) / 1000.0;\
                                         TM_PRINTF("===%s use %.3f ms\n", (x), _time);\
-                                        _start=TM_GET_MS();\
+                                        _start=TM_GET_US();\
                                     }
 
 /******************************* DBG PERFORMANCE CONFIG  ************************************/