更新demo

Hu Chunming
1 parent c8f96ad0
Showing 2 changed files with 11 additions and 3 deletions
build/demo/Makefile
src/demo/main.cpp
@@ -9,7 +9,7 @@ BIN_PATH = $(PROJ_ALL_PATH)/bin
  
 DEFS=-DOS_LINUX -DENABLE_DVPP_INTERFACE
  
-TARGET = $(BIN_PATH)/start
+TARGET = $(BIN_PATH)/demo
  
 ACL_PATH = $(ASCEND_AICPU_PATH)/acllib
 OPENCV_PATH = $(PROJ_ALL_PATH)/3rdparty/opencv_4_1
@@ -62,6 +62,7 @@ SHARED_LIBRARIES_DIRS := $(foreach shared_lib_dir, $(local_shared_libs_dirs), -L
 CXXFLAGS= -g -O0 -fPIC $(INCLUDES) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -DENABLE_DVPP_INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0 -fvisibility=hidden -Wall -Wno-deprecated -Wdeprecated-declarations -Wl,-Bsymbolic -ldl
  
 SRCS := $(wildcard $(CUR_PROJ_PATH)/*.cpp) \
+		$(wildcard $(CUR_PROJ_PATH)/demo/*.cpp) \
 		$(wildcard $(CUR_PROJ_PATH)/ai_engine_module/*.cpp) \
 		$(wildcard $(CUR_PROJ_PATH)/common/*.cpp) \
 		$(wildcard $(CUR_PROJ_PATH)/common/dvpp/*.cpp) \
@@ -83,6 +84,9 @@ $(TARGET):$(OBJS)
 %.o:$(CUR_PROJ_PATH)/%.cpp
 	$(XX) $(CXXFLAGS) -c $<
  
+%.o:$(CUR_PROJ_PATH)/demo/%.cpp
+	$(XX) $(CXXFLAGS) -c $<
+
 %.o:$(CUR_PROJ_PATH)/ai_engine_module/%.cpp
 	$(XX) $(CXXFLAGS) -c $<
  
@@ -4,7 +4,11 @@ int main() {
  
     PicAnalysis pic_analysis;
  
-    pic_analysis.init(0);
+    VillageParam param;
+    param.dev_id = 0;
+    param.db_path = "";
+    param.model_path = "";
+    pic_analysis.init(param);
  
     vector<string> vec_path;
     for (size_t i = 0; i < 1; i++)
@@ -12,7 +16,7 @@ int main() {
         vec_path.push_back("./test_all.jpg");
     }
  
-    pic_analysis.analysis_sync(vec_path);
+    pic_analysis.analysis_file(vec_path);
  
     // while (getchar() != 'q');