update some code and README.md

deploy/lite_shitu/Makefile

@@ -9,8 +9,9 @@ endif
 ${info ARM_ABI: ${ARM_ABI}}
 ${info ARM_PLAT: ${ARM_PLAT}; option[arm7/arm8]}
 
-LITE_ROOT=libs/inference_lite_lib.android.armv8
-include ${LITE_ROOT}/demo/cxx/Makefile.def
+include ../Makefile.def
+
+LITE_ROOT=../../../
 ${info LITE_ROOT: $(abspath ${LITE_ROOT})}
 
 THIRD_PARTY_DIR=third_party

deploy/lite_shitu/README.md

@@ -92,9 +92,9 @@ PaddleClas 提供了转换并优化后的推理模型，可以直接参考下方
 ```shell
 # 进入lite_ppshitu目录
 cd $PaddleClas/deploy/lite_shitu
-wget https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/lite/ppshitu_lite_models_v1.0.tar.gz
-tar -xf ppshitu_lite_models_v1.0.tar.gz
-rm -f ppshitu_lite_models_v1.0.tar.gz
+wget https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/lite/ppshitu_lite_models_v1.0.tar
+tar -xf ppshitu_lite_models_v1.0.tar
+rm -f ppshitu_lite_models_v1.0.tar
 ```
 
 #### 2.1.2 使用其他模型
@@ -312,7 +312,9 @@ chmod 777 pp_shitu
 
 运行效果如下：
 ```
-````
+images/demo.jpg:
+        result0: bbox[253, 275, 1146, 872], score: 0.974196, label: 伊藤园_果蔬汁
+```
 
 ## FAQ
 Q1：如果想更换模型怎么办，需要重新按照流程走一遍吗？

deploy/lite_shitu/include/vector_search.h

@@ -45,6 +45,7 @@ public:
     LoadIndexFile();
     this->I.resize(this->return_k * this->max_query_number);
     this->D.resize(this->return_k * this->max_query_number);
+    printf("faiss index load success!\n");
   };
 
   void LoadIdMap();

deploy/lite_shitu/src/feature_extractor.cc

@@ -51,7 +51,6 @@ void FeatureExtract::RunRecModel(const cv::Mat &img,
   for (auto dim : output_tensor->shape()) {
     output_size *= dim;
   }
-  std::cout << "output len is:  " << output_size << std::endl;
   feature.resize(output_size);
   output_tensor->CopyToCpu(feature.data());
 

deploy/lite_shitu/src/main.cc

@@ -208,9 +208,9 @@ int main(int argc, char **argv) {
           RT_Config["Global"]["max_det_results"].as<int>(), false, &det);
 
       // add the whole image for recognition to improve recall
-      PPShiTu::ObjectResult result_whole_img = {
-          {0, 0, srcimg.cols, srcimg.rows}, 0, 1.0};
-      det_result.push_back(result_whole_img);
+//      PPShiTu::ObjectResult result_whole_img = {
+//          {0, 0, srcimg.cols, srcimg.rows}, 0, 1.0};
+//      det_result.push_back(result_whole_img);
 
       // get rec result
       PPShiTu::SearchResult search_result;