Merge pull request #2919 from LDOUBLEV/benchmark_dyg

support img_directory predict

deploy/cpp_infer/include/utility.h

@@ -44,6 +44,9 @@ public:
   inline static size_t argmax(ForwardIterator first, ForwardIterator last) {
     return std::distance(first, std::max_element(first, last));
   }
+
+  static void GetAllFiles(const char *dir_name,
+                          std::vector<std::string> &all_inputs);
 };
 
 } // namespace PaddleOCR
\ No newline at end of file

deploy/cpp_infer/src/main.cpp

@@ -27,9 +27,12 @@
 #include <fstream>
 #include <numeric>
 
+#include <glog/logging.h>
 #include <include/config.h>
 #include <include/ocr_det.h>
 #include <include/ocr_rec.h>
+#include <include/utility.h>
+#include <sys/stat.h>
 
 using namespace std;
 using namespace cv;
@@ -47,13 +50,8 @@ int main(int argc, char **argv) {
   config.PrintConfigInfo();
 
   std::string img_path(argv[2]);
-
-  cv::Mat srcimg = cv::imread(img_path, cv::IMREAD_COLOR);
-
-  if (!srcimg.data) {
-    std::cerr << "[ERROR] image read failed! image path: " << img_path << "\n";
-    exit(1);
-  }
+  std::vector<std::string> all_img_names;
+  Utility::GetAllFiles((char *)img_path.c_str(), all_img_names);
 
   DBDetector det(config.det_model_dir, config.use_gpu, config.gpu_id,
                  config.gpu_mem, config.cpu_math_library_num_threads,
@@ -76,7 +74,18 @@ int main(int argc, char **argv) {
                      config.use_tensorrt, config.use_fp16);
 
   auto start = std::chrono::system_clock::now();
+
+  for (auto img_dir : all_img_names) {
+    LOG(INFO) << "The predict img: " << img_dir;
+
+    cv::Mat srcimg = cv::imread(img_dir, cv::IMREAD_COLOR);
+    if (!srcimg.data) {
+      std::cerr << "[ERROR] image read failed! image path: " << img_path
+                << "\n";
+      exit(1);
+    }
     std::vector<std::vector<std::vector<int>>> boxes;
+
     det.Run(srcimg, boxes);
 
     rec.Run(boxes, srcimg, cls);
@@ -88,6 +97,7 @@ int main(int argc, char **argv) {
                      std::chrono::microseconds::period::num /
                      std::chrono::microseconds::period::den
               << "s" << std::endl;
+  }
 
   return 0;
 }

deploy/cpp_infer/src/utility.cpp

@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <dirent.h>
+#include <include/utility.h>
 #include <iostream>
 #include <ostream>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <vector>
 
-#include <include/utility.h>
-
 namespace PaddleOCR {
 
 std::vector<std::string> Utility::ReadDict(const std::string &path) {
@@ -57,4 +59,37 @@ void Utility::VisualizeBboxes(
             << std::endl;
 }
 
+// list all files under a directory
+void Utility::GetAllFiles(const char *dir_name,
+                          std::vector<std::string> &all_inputs) {
+  if (NULL == dir_name) {
+    std::cout << " dir_name is null ! " << std::endl;
+    return;
+  }
+  struct stat s;
+  lstat(dir_name, &s);
+  if (!S_ISDIR(s.st_mode)) {
+    std::cout << "dir_name is not a valid directory !" << std::endl;
+    all_inputs.push_back(dir_name);
+    return;
+  } else {
+    struct dirent *filename; // return value for readdir()
+    DIR *dir;                // return value for opendir()
+    dir = opendir(dir_name);
+    if (NULL == dir) {
+      std::cout << "Can not open dir " << dir_name << std::endl;
+      return;
+    }
+    std::cout << "Successfully opened the dir !" << std::endl;
+    while ((filename = readdir(dir)) != NULL) {
+      if (strcmp(filename->d_name, ".") == 0 ||
+          strcmp(filename->d_name, "..") == 0)
+        continue;
+      // img_dir + std::string("/") + all_inputs[0];
+      all_inputs.push_back(dir_name + std::string("/") +
+                           std::string(filename->d_name));
+    }
+  }
+}
+
 } // namespace PaddleOCR
\ No newline at end of file

deploy/cpp_infer/tools/build.sh

@@ -16,5 +16,6 @@ cmake .. \
     -DOPENCV_DIR=${OPENCV_DIR} \
     -DCUDNN_LIB=${CUDNN_LIB_DIR} \
     -DCUDA_LIB=${CUDA_LIB_DIR} \
+    -DTENSORRT_DIR=${TENSORRT_DIR} \
 
 make -j

deploy/cpp_infer/tools/config.txt

@@ -23,7 +23,7 @@ rec_model_dir  ./inference/ch_ppocr_mobile_v2.0_rec_infer/
 char_list_file  ../../ppocr/utils/ppocr_keys_v1.txt
 
 # show the detection results
-visualize 1
+visualize 0
 
 # use_tensorrt
 use_tensorrt 0