优化demo

Hu Chunming
1 parent 5e69f8fc
Showing 4 changed files with 18 additions and 62 deletions
build/demo/Makefile
src/demo/main.cpp
src/village_pic_interface.cpp
src/village_pic_interface.h
@@ -2,7 +2,6 @@ CC = gcc
 XX = c++
-
 PROJ_ALL_PATH = $(PWD)/../..
 CUR_PROJ_PATH = $(PROJ_ALL_PATH)/src
 BIN_PATH = $(PROJ_ALL_PATH)/bin
@@ -17,22 +16,11 @@ SPDLOG_ROOT = $(PROJ_ALL_PATH)/3rdparty/spdlog-1.9.2/release
 ALGORITHM_PATH = $(PROJ_ALL_PATH)/algorithm
 INCLUDES = -I$(PROJ_ALL_PATH)/src/common \
-		   -I$(PROJ_ALL_PATH)/src/common/dvpp \
-		   -I$(PROJ_ALL_PATH)/src/common/cnn \
-		   -I$(PROJ_ALL_PATH)/src/common/cnn_cls \
-		   -I$(PROJ_ALL_PATH)/src/common/road_cnn \
-		   -I$(PROJ_ALL_PATH)/src/common/dvppx \
-		   -I$(PROJ_ALL_PATH)/src/common/model_process \
-		   -I$(CUR_PROJ_PATH)/../va \
 		   -I$(OPENCV_PATH)/include \
 		   -I$(OPENCV_PATH)/include/opencv2 \
 		   -I$(ACL_PATH)/include \
 		   -I$(SPDLOG_ROOT)/include \
-		   -I$(CUR_PROJ_PATH)/ai_engine_module \
 		   -I$(ALGORITHM_PATH)/vehicle_analysis \
-		   -I$(ALGORITHM_PATH)/vid_clothes2/vid_clothes \
-		   -I$(ALGORITHM_PATH)/hp2/hp \
-		   -I$(ALGORITHM_PATH)/hcp2/hcp \
 # CXXFLAGS = -O0 -std=c++11 $(INCLUDES) -DENABLE_DVPP_INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0
@@ -49,10 +37,7 @@ local_shared_libs := \
 	ascendcl \
 	acl_dvpp \
 	spdlog \
-	vehicle_analysis \
-	vid_clothes \
-	hp \
-	hcp \
+	village_ascend_arm \
 SHARED_LIBRARIES      := $(foreach shared_lib, $(local_shared_libs), -l$(shared_lib))
@@ -61,17 +46,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) \
-		$(wildcard $(CUR_PROJ_PATH)/common/cnn_cls/*.cpp) \
-		$(wildcard $(CUR_PROJ_PATH)/common/road_cnn/*.cpp) \
-		$(wildcard $(CUR_PROJ_PATH)/common/cnn/*.cpp) \
-		$(wildcard $(CUR_PROJ_PATH)/common/dvppx/*.cpp) \
-		$(wildcard $(CUR_PROJ_PATH)/common/model_process/*.cpp) \
-		$(wildcard $(CUR_PROJ_PATH)/utils/*.cpp) \
+SRCS := $(wildcard $(CUR_PROJ_PATH)/demo/*.cpp) \
 DIRS := $(notdir $(SRCS))
 OBJS := $(patsubst %cpp, %o, $(DIRS))
@@ -80,40 +55,10 @@ all: $(TARGET)
 $(TARGET):$(OBJS)
 	$(XX) -o $@ $^  $(CXXFLAGS) $(SHARED_LIBRARIES_DIRS) $(SHARED_LIBRARIES)
-	
-%.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 $<
-
-%.o:$(CUR_PROJ_PATH)/common/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/dvpp/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/cnn/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/cnn_cls/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/road_cnn/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/dvppx/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/common/model_process/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
-%.o:$(CUR_PROJ_PATH)/utils/%.cpp
-	$(XX) $(CXXFLAGS) -c $<
-
 clean:
 	@rm -f $(TARGET)
 	@rm -f $(OBJS)
-#include "../PicAnalysis.h"
+#include "../village_pic_interface.h"
+#include <vector>
+#include <string>
+
+using namespace std;
 int main() {
-    PicAnalysis pic_analysis;
+    void *vaHandle = NULL;
     VillageParam param;
     param.dev_id = 0;
     param.db_path = "";
     param.model_path = "";
-    pic_analysis.init(param);
+    int ret = village_pic_init(&vaHandle, param);
     vector<string> vec_path;
     size_t i = 1;
@@ -19,9 +23,9 @@ int main() {
         vec_path.push_back(path);
     }
-    pic_analysis.analysis_file(vec_path);
+    village_pic_analysis_file(vaHandle, vec_path);
-    // while (getchar() != 'q');
+    village_pic_release(&vaHandle);
     return 0;
 }
 \ No newline at end of file
@@ -21,6 +21,10 @@ std::vector&lt;AnalysisResult&gt; village_pic_analysis(void *handle, sy_img* img_array
 	return tools->analysis_img(vec_img);
 }
+std::vector<AnalysisResult> village_pic_analysis_file(void *handle, std::vector<std::string> vec_file) {
+	PicAnalysis* tools = (PicAnalysis*)handle;
+	return tools->analysis_file(vec_file);
+}
 int village_pic_release(void **handle)
 {
@@ -12,6 +12,7 @@
 #include "village_inc.h"
 #include <vector>
+#include <string>
 extern "C"
 {
@@ -19,6 +20,8 @@ extern &quot;C&quot;
 	VILLAGE_PIC_API std::vector<AnalysisResult> village_pic_analysis(void *handle, sy_img* imgs, int batch_size);
+	VILLAGE_PIC_API std::vector<AnalysisResult> village_pic_analysis_file(void *handle, std::vector<std::string> vec_file);
+
 	VILLAGE_PIC_API int village_pic_release(void **handle);
 	VILLAGE_PIC_API const char* get_village_pic_version();