diff --git a/APP_Framework/Applications/knowing_app/Makefile b/APP_Framework/Applications/knowing_app/Makefile index 3357fbf99..98c8708d0 100755 --- a/APP_Framework/Applications/knowing_app/Makefile +++ b/APP_Framework/Applications/knowing_app/Makefile @@ -1,3 +1,15 @@ -SRC_DIR := mnist +SRC_DIR := + +ifeq ($(CONFIG_APP_MNIST),y) +SRC_DIR += mnist +endif + +ifeq ($(CONFIG_USING_NNOM_DEMOAPP),y) +SRC_DIR += nnom_demo +endif + +ifeq ($(CONFIG_USING_CMSIS_5_DEMOAPP),y) +SRC_DIR += cmsis_5_demo +endif include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/cmsis_5_demo/Makefile b/APP_Framework/Applications/knowing_app/cmsis_5_demo/Makefile new file mode 100755 index 000000000..2ee26ceb1 --- /dev/null +++ b/APP_Framework/Applications/knowing_app/cmsis_5_demo/Makefile @@ -0,0 +1,11 @@ +SRC_DIR := + +ifeq ($(CONFIG_USING_CMSIS_5_NN_DEMOAPP),y) +SRC_DIR += cmsisnn-cifar10 +endif + +ifeq ($(CONFIG_USING_CMSIS_5_NN_DEMOAPP_VEG_CLASSIFY),y) +SRC_DIR += cmsisnn_vegetable_classify +endif + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/Makefile b/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/Makefile new file mode 100755 index 000000000..49fd390d1 --- /dev/null +++ b/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := demo/cmsisnn_demo.c demo/tjpgd.c model/m4/nn.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn_vegetable_classify/Makefile b/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn_vegetable_classify/Makefile new file mode 100755 index 000000000..06dfcfd59 --- /dev/null +++ b/APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn_vegetable_classify/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := cmsisnn_vegetable_classify.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/mnist/Makefile b/APP_Framework/Applications/knowing_app/mnist/Makefile index 516f61aba..8c57868a9 100755 --- a/APP_Framework/Applications/knowing_app/mnist/Makefile +++ b/APP_Framework/Applications/knowing_app/mnist/Makefile @@ -1,7 +1,9 @@ +SRC_FILES := +ifeq ($(CONFIG_APP_MNIST),y) SRC_FILES := \ main.cpp \ mnistmain.c CPPPATHS += -I. - +endif include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/mnist/mnistmain.c b/APP_Framework/Applications/knowing_app/mnist/mnistmain.c index 18160c47b..fa1c26821 100644 --- a/APP_Framework/Applications/knowing_app/mnist/mnistmain.c +++ b/APP_Framework/Applications/knowing_app/mnist/mnistmain.c @@ -26,5 +26,3 @@ void mnist_app(void); int tfmnist(void) { mnist_app(); } - -PRIV_SHELL_CMD_FUNCTION(tfmnist, a mnist test sample, PRIV_SHELL_CMD_MAIN_ATTR); diff --git a/APP_Framework/Applications/knowing_app/nnom_demo/Makefile b/APP_Framework/Applications/knowing_app/nnom_demo/Makefile new file mode 100755 index 000000000..b5628e53d --- /dev/null +++ b/APP_Framework/Applications/knowing_app/nnom_demo/Makefile @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_USING_NNOM_DEMOAPP),y) +SRC_DIR := mnist_nnom +endif + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/Makefile b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/Makefile new file mode 100755 index 000000000..935d42ca7 --- /dev/null +++ b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := main.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c index 55b6b3af0..dcdb6e8f7 100644 --- a/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c +++ b/APP_Framework/Applications/knowing_app/nnom_demo/mnist_nnom/main.c @@ -71,7 +71,9 @@ void mnist_nnom(int argc, char **argv) printf("Predicted label: %d\n", predic_label); printf("Probability: %d%%\n", (int)(prob * 100)); } - +#ifdef ADD_XIZI_FETURES +PRIV_SHELL_CMD_FUNCTION(mnist_nnom, a mnist_nnom test sample, PRIV_SHELL_CMD_MAIN_ATTR); +#endif #ifdef __RT_THREAD_H__ MSH_CMD_EXPORT(mnist_nnom, nnom mnist demo and image number should be followed); #endif diff --git a/APP_Framework/Framework/knowing/cmsis_5/Makefile b/APP_Framework/Framework/knowing/cmsis_5/Makefile new file mode 100644 index 000000000..c57a2692f --- /dev/null +++ b/APP_Framework/Framework/knowing/cmsis_5/Makefile @@ -0,0 +1,8 @@ +ifeq ($(CONFIG_USING_CMSIS_5),y) + SRC_FILES := $(wildcard NN/Source/ActivationFunctions/*.c) $(wildcard NN/Source/BasicMathFunctions/*.c) $(wildcard NN/Source/ConcatenationFunctions/*.c)\ + $(wildcard NN/Source/ConvolutionFunctions/*.c) $(wildcard NN/Source/FullyConnectedFunctions/*.c) $(wildcard NN/Source/NNSupportFunctions/*.c) \ + $(wildcard NN/Source/PoolingFunctions/*.c) $(wildcard NN/Source/ReshapeFunctions/*.c) $(wildcard NN/Source/SoftmaxFunctions/*.c) $(wildcard NN/Source/SVDFunctions/*.c) +endif + + +include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/knowing/nnom/Makefile b/APP_Framework/Framework/knowing/nnom/Makefile new file mode 100644 index 000000000..9ce348c15 --- /dev/null +++ b/APP_Framework/Framework/knowing/nnom/Makefile @@ -0,0 +1,6 @@ +SRC_DIR := +ifeq ($(CONFIG_USING_NNOM),y) + SRC_FILES := $(wildcard src/backends/*.c) $(wildcard src/core/*.c) $(wildcard src/layers/*.c) +endif + +include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/knowing/nnom/src/layers/nnom_reshape.c b/APP_Framework/Framework/knowing/nnom/src/layers/nnom_reshape.c index 1b6ae82f7..e744146cc 100644 --- a/APP_Framework/Framework/knowing/nnom/src/layers/nnom_reshape.c +++ b/APP_Framework/Framework/knowing/nnom/src/layers/nnom_reshape.c @@ -45,7 +45,7 @@ nnom_layer_t *reshape_s(const nnom_reshape_config_t *config) // config //nnom_memcpy(layer->dim, config->dim, config->num_dim * sizeof(nnom_shape_data_t)); - layer->super.config = config; + layer->super.config = (void*)config; layer->dim = config->dim; // temporary use the config directly. (not preferable.) layer->num_dim = config->num_dim;