rename PaddleOCR to PPOCR
parent
d7b107d1a3
commit
93f5f47344
|
@ -39,10 +39,10 @@ using namespace paddle_infer;
|
|||
|
||||
namespace PaddleOCR {
|
||||
|
||||
class PaddleOCR {
|
||||
class PPOCR {
|
||||
public:
|
||||
explicit PaddleOCR();
|
||||
~PaddleOCR();
|
||||
explicit PPOCR();
|
||||
~PPOCR();
|
||||
std::vector<std::vector<OCRPredictResult>>
|
||||
ocr(std::vector<cv::String> cv_all_img_names, bool det = true,
|
||||
bool rec = true, bool cls = true);
|
||||
|
|
|
@ -65,6 +65,8 @@ public:
|
|||
|
||||
static bool PathExists(const std::string &path);
|
||||
|
||||
static void CreateDir(const std::string &path);
|
||||
|
||||
static void print_result(const std::vector<OCRPredictResult> &ocr_result);
|
||||
};
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ int main(int argc, char **argv) {
|
|||
cv::glob(FLAGS_image_dir, cv_all_img_names);
|
||||
std::cout << "total images num: " << cv_all_img_names.size() << endl;
|
||||
|
||||
PaddleOCR::PaddleOCR ocr = PaddleOCR::PaddleOCR();
|
||||
PPOCR ocr = PPOCR();
|
||||
|
||||
std::vector<std::vector<OCRPredictResult>> ocr_results =
|
||||
ocr.ocr(cv_all_img_names, FLAGS_det, FLAGS_rec, FLAGS_cls);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
namespace PaddleOCR {
|
||||
|
||||
PaddleOCR::PaddleOCR() {
|
||||
PPOCR::PPOCR() {
|
||||
if (FLAGS_det) {
|
||||
this->detector_ = new DBDetector(
|
||||
FLAGS_det_model_dir, FLAGS_use_gpu, FLAGS_gpu_id, FLAGS_gpu_mem,
|
||||
|
@ -45,8 +45,8 @@ PaddleOCR::PaddleOCR() {
|
|||
}
|
||||
};
|
||||
|
||||
void PaddleOCR::det(cv::Mat img, std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
void PPOCR::det(cv::Mat img, std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
std::vector<std::vector<std::vector<int>>> boxes;
|
||||
std::vector<double> det_times;
|
||||
|
||||
|
@ -63,9 +63,9 @@ void PaddleOCR::det(cv::Mat img, std::vector<OCRPredictResult> &ocr_results,
|
|||
times[2] += det_times[2];
|
||||
}
|
||||
|
||||
void PaddleOCR::rec(std::vector<cv::Mat> img_list,
|
||||
std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
void PPOCR::rec(std::vector<cv::Mat> img_list,
|
||||
std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
std::vector<std::string> rec_texts(img_list.size(), "");
|
||||
std::vector<float> rec_text_scores(img_list.size(), 0);
|
||||
std::vector<double> rec_times;
|
||||
|
@ -80,9 +80,9 @@ void PaddleOCR::rec(std::vector<cv::Mat> img_list,
|
|||
times[2] += rec_times[2];
|
||||
}
|
||||
|
||||
void PaddleOCR::cls(std::vector<cv::Mat> img_list,
|
||||
std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
void PPOCR::cls(std::vector<cv::Mat> img_list,
|
||||
std::vector<OCRPredictResult> &ocr_results,
|
||||
std::vector<double> ×) {
|
||||
std::vector<int> cls_labels(img_list.size(), 0);
|
||||
std::vector<float> cls_scores(img_list.size(), 0);
|
||||
std::vector<double> cls_times;
|
||||
|
@ -98,8 +98,8 @@ void PaddleOCR::cls(std::vector<cv::Mat> img_list,
|
|||
}
|
||||
|
||||
std::vector<std::vector<OCRPredictResult>>
|
||||
PaddleOCR::ocr(std::vector<cv::String> cv_all_img_names, bool det, bool rec,
|
||||
bool cls) {
|
||||
PPOCR::ocr(std::vector<cv::String> cv_all_img_names, bool det, bool rec,
|
||||
bool cls) {
|
||||
std::vector<double> time_info_det = {0, 0, 0};
|
||||
std::vector<double> time_info_rec = {0, 0, 0};
|
||||
std::vector<double> time_info_cls = {0, 0, 0};
|
||||
|
@ -188,9 +188,8 @@ PaddleOCR::ocr(std::vector<cv::String> cv_all_img_names, bool det, bool rec,
|
|||
return ocr_results;
|
||||
} // namespace PaddleOCR
|
||||
|
||||
void PaddleOCR::log(std::vector<double> &det_times,
|
||||
std::vector<double> &rec_times,
|
||||
std::vector<double> &cls_times, int img_num) {
|
||||
void PPOCR::log(std::vector<double> &det_times, std::vector<double> &rec_times,
|
||||
std::vector<double> &cls_times, int img_num) {
|
||||
if (det_times[0] + det_times[1] + det_times[2] > 0) {
|
||||
AutoLogger autolog_det("ocr_det", FLAGS_use_gpu, FLAGS_use_tensorrt,
|
||||
FLAGS_enable_mkldnn, FLAGS_cpu_threads, 1, "dynamic",
|
||||
|
@ -212,7 +211,7 @@ void PaddleOCR::log(std::vector<double> &det_times,
|
|||
autolog_cls.report();
|
||||
}
|
||||
}
|
||||
PaddleOCR::~PaddleOCR() {
|
||||
PPOCR::~PPOCR() {
|
||||
if (this->detector_ != nullptr) {
|
||||
delete this->detector_;
|
||||
}
|
||||
|
|
|
@ -16,10 +16,15 @@
|
|||
#include <include/utility.h>
|
||||
#include <iostream>
|
||||
#include <ostream>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <direct.h>
|
||||
#else
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
namespace PaddleOCR {
|
||||
|
||||
std::vector<std::string> Utility::ReadDict(const std::string &path) {
|
||||
|
@ -206,6 +211,14 @@ bool Utility::PathExists(const std::string &path) {
|
|||
#endif // !_WIN32
|
||||
}
|
||||
|
||||
void Utility::CreateDir(const std::string &path) {
|
||||
#ifdef _WIN32
|
||||
_mkdir(path.c_str());
|
||||
#else
|
||||
mkdir(path.c_str(), 0777);
|
||||
#endif // !_WIN32
|
||||
}
|
||||
|
||||
void Utility::print_result(const std::vector<OCRPredictResult> &ocr_result) {
|
||||
for (int i = 0; i < ocr_result.size(); i++) {
|
||||
std::cout << i << "\t";
|
||||
|
|
Loading…
Reference in New Issue