Skip to content

GitLab

"docs/vscode:/vscode.git/clone" did not exist on "3dc1fafbb1d6ec16fc13dc205d110c86afa4802e"
Commit 2475c919 authored by liucong's avatar liucong
Browse files

重新Cpp代码格式化

parent 466992ff
Show whitespace changes
Inline Side-by-side
Showing with 6480 additions and 5818 deletions
Src/PaddleOCR/OcrDB.cpp
View file @ 2475c919
...@@ -9,22 +9,14 @@ using namespace cv::dnn; ...@@ -9,22 +9,14 @@ using namespace cv::dnn;
namespace migraphxSamples namespace migraphxSamples
{ {
DB::DB() DB::DB() {}
{
}
DB::~DB() DB::~DB() { configurationFile.release(); }
{
configurationFile.release();
}
ErrorCode DB::Initialize(InitializationParameterOfDB InitializationParameterOfDB) ErrorCode DB::Initialize(InitializationParameterOfDB InitializationParameterOfDB)
{ {
// 读取配置文件 // 读取配置文件
std::string configFilePath=InitializationParameterOfDB.configFilePath; std::string configFilePath = InitializationParameterOfDB.configFilePath;
if(!Exists(configFilePath)) if(!Exists(configFilePath))
{ {
LOG_ERROR(stdout, "no configuration file!\n"); LOG_ERROR(stdout, "no configuration file!\n");
...@@ -49,50 +41,50 @@ ErrorCode DB::Initialize(InitializationParameterOfDB InitializationParameterOfDB ...@@ -49,50 +41,50 @@ ErrorCode DB::Initialize(InitializationParameterOfDB InitializationParameterOfDB
// 加载模型 // 加载模型
if(!Exists(modelPath)) if(!Exists(modelPath))
{ {
LOG_ERROR(stdout,"%s not exist!\n",modelPath.c_str()); LOG_ERROR(stdout, "%s not exist!\n", modelPath.c_str());
return MODEL_NOT_EXIST; return MODEL_NOT_EXIST;
} }
migraphx::onnx_options onnx_options; migraphx::onnx_options onnx_options;
onnx_options.map_input_dims["x"] = {1,3,2496,2496}; // 设置最大shape onnx_options.map_input_dims["x"] = {1, 3, 2496, 2496}; // 设置最大shape
net = migraphx::parse_onnx(modelPath, onnx_options); net = migraphx::parse_onnx(modelPath, onnx_options);
LOG_INFO(stdout,"succeed to load model: %s\n",GetFileName(modelPath).c_str()); LOG_INFO(stdout, "succeed to load model: %s\n", GetFileName(modelPath).c_str());
// 获取模型输入/输出节点信息 // 获取模型输入/输出节点信息
std::unordered_map<std::string, migraphx::shape> inputs=net.get_inputs(); std::unordered_map<std::string, migraphx::shape> inputs = net.get_inputs();
std::unordered_map<std::string, migraphx::shape> outputs=net.get_outputs(); std::unordered_map<std::string, migraphx::shape> outputs = net.get_outputs();
inputName=inputs.begin()->first; inputName = inputs.begin()->first;
inputShape=inputs.begin()->second; inputShape = inputs.begin()->second;
int N=inputShape.lens()[0]; int N = inputShape.lens()[0];
int C=inputShape.lens()[1]; int C = inputShape.lens()[1];
int H=inputShape.lens()[2]; int H = inputShape.lens()[2];
int W=inputShape.lens()[3]; int W = inputShape.lens()[3];
inputSize=cv::Size(W,H); inputSize = cv::Size(W, H);
// 设置模型为GPU模式 // 设置模型为GPU模式
migraphx::target gpuTarget = migraphx::gpu::target{}; migraphx::target gpuTarget = migraphx::gpu::target{};
// 编译模型 // 编译模型
migraphx::compile_options options; migraphx::compile_options options;
options.device_id=0; // 设置GPU设备，默认为0号设备 options.device_id = 0; // 设置GPU设备，默认为0号设备
options.offload_copy=true; options.offload_copy = true;
net.compile(gpuTarget,options); net.compile(gpuTarget, options);
LOG_INFO(stdout,"succeed to compile model: %s\n",GetFileName(modelPath).c_str()); LOG_INFO(stdout, "succeed to compile model: %s\n", GetFileName(modelPath).c_str());
// warm up // warm up
std::unordered_map<std::string, migraphx::argument> inputData; std::unordered_map<std::string, migraphx::argument> inputData;
inputData[inputName]=migraphx::argument{inputShape}; inputData[inputName] = migraphx::argument{inputShape};
net.eval(inputData); net.eval(inputData);
// log // log
LOG_INFO(stdout,"InputMaxSize:%dx%d\n",inputSize.width,inputSize.height); LOG_INFO(stdout, "InputMaxSize:%dx%d\n", inputSize.width, inputSize.height);
LOG_INFO(stdout,"InputName:%s\n",inputName.c_str()); LOG_INFO(stdout, "InputName:%s\n", inputName.c_str());
return SUCCESS; return SUCCESS;
} }
ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ErrorCode DB::Infer(const cv::Mat& img, std::vector<cv::Mat>& imgList)
{ {
if(img.empty()||img.type()!=CV_8UC3) if(img.empty() || img.type() != CV_8UC3)
{ {
LOG_ERROR(stdout, "image error!\n"); LOG_ERROR(stdout, "image error!\n");
return IMAGE_ERROR; return IMAGE_ERROR;
...@@ -106,9 +98,9 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -106,9 +98,9 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
int h = srcImage.rows; int h = srcImage.rows;
float ratio = 1.f; float ratio = 1.f;
int maxWH = std::max(h, w); int maxWH = std::max(h, w);
if (maxWH > dbParameter.LimitSideLen) if(maxWH > dbParameter.LimitSideLen)
{ {
if (h > w) if(h > w)
{ {
ratio = float(dbParameter.LimitSideLen) / float(h); ratio = float(dbParameter.LimitSideLen) / float(h);
} }
...@@ -127,27 +119,28 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -127,27 +119,28 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
float ratioH = float(resizeH) / float(h); float ratioH = float(resizeH) / float(h);
float ratioW = float(resizeW) / float(w); float ratioW = float(resizeW) / float(w);
resizeImg.convertTo(resizeImg, CV_32FC3, 1.0/255.0); resizeImg.convertTo(resizeImg, CV_32FC3, 1.0 / 255.0);
std::vector<cv::Mat> bgrChannels(3); std::vector<cv::Mat> bgrChannels(3);
cv::split(resizeImg, bgrChannels); cv::split(resizeImg, bgrChannels);
std::vector<float> mean = {0.485f, 0.456f, 0.406f}; std::vector<float> mean = {0.485f, 0.456f, 0.406f};
std::vector<float> scale = {1 / 0.229f, 1 / 0.224f, 1 / 0.225f}; std::vector<float> scale = {1 / 0.229f, 1 / 0.224f, 1 / 0.225f};
for (auto i = 0; i < bgrChannels.size(); i++) for(auto i = 0; i < bgrChannels.size(); i++)
{ {
bgrChannels[i].convertTo(bgrChannels[i], CV_32FC1, 1.0 * scale[i], bgrChannels[i].convertTo(
(0.0 - mean[i]) * scale[i]); bgrChannels[i], CV_32FC1, 1.0 * scale[i], (0.0 - mean[i]) * scale[i]);
} }
cv::merge(bgrChannels, resizeImg); cv::merge(bgrChannels, resizeImg);
int rh = resizeImg.rows; int rh = resizeImg.rows;
int rw = resizeImg.cols; int rw = resizeImg.cols;
cv::Mat inputBlob; cv::Mat inputBlob;
inputBlob = cv::dnn::blobFromImage(resizeImg); inputBlob = cv::dnn::blobFromImage(resizeImg);
std::vector<std::size_t> inputShapeOfInfer={1,3,rh,rw}; std::vector<std::size_t> inputShapeOfInfer = {1, 3, rh, rw};
// 创建输入数据 // 创建输入数据
std::unordered_map<std::string, migraphx::argument> inputData; std::unordered_map<std::string, migraphx::argument> inputData;
inputData[inputName]= migraphx::argument{migraphx::shape(inputShape.type(),inputShapeOfInfer), (float*)inputBlob.data}; inputData[inputName] = migraphx::argument{migraphx::shape(inputShape.type(), inputShapeOfInfer),
(float*)inputBlob.data};
// 推理 // 推理
std::vector<migraphx::argument> inferenceResults = net.eval(inputData); std::vector<migraphx::argument> inferenceResults = net.eval(inputData);
...@@ -157,24 +150,25 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -157,24 +150,25 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
// 转换为vector // 转换为vector
migraphx::shape outputShape = result.get_shape(); migraphx::shape outputShape = result.get_shape();
int shape[]={outputShape.lens()[0],outputShape.lens()[1],outputShape.lens()[2],outputShape.lens()[3]}; int shape[] = {
outputShape.lens()[0], outputShape.lens()[1], outputShape.lens()[2], outputShape.lens()[3]};
int n2 = outputShape.lens()[2]; int n2 = outputShape.lens()[2];
int n3 = outputShape.lens()[3]; int n3 = outputShape.lens()[3];
int n = n2 * n3; int n = n2 * n3;
std::vector<float> out(n); std::vector<float> out(n);
memcpy(out.data(),result.data(),sizeof(float)*outputShape.elements()); memcpy(out.data(), result.data(), sizeof(float) * outputShape.elements());
out.resize(n); out.resize(n);
std::vector<float> pred(n, 0.0); std::vector<float> pred(n, 0.0);
std::vector<unsigned char> cbuf(n, ' '); std::vector<unsigned char> cbuf(n, ' ');
for (int i = 0; i < n; i++) for(int i = 0; i < n; i++)
{ {
pred[i] = (float)(out[i]); pred[i] = (float)(out[i]);
cbuf[i] = (unsigned char)((out[i]) * 255); cbuf[i] = (unsigned char)((out[i]) * 255);
} }
cv::Mat cbufMap(n2, n3, CV_8UC1, (unsigned char *)cbuf.data()); cv::Mat cbufMap(n2, n3, CV_8UC1, (unsigned char*)cbuf.data());
cv::Mat predMap(n2, n3, CV_32F, (float *)pred.data()); cv::Mat predMap(n2, n3, CV_32F, (float*)pred.data());
const double threshold = dbParameter.BinaryThreshold * 255; const double threshold = dbParameter.BinaryThreshold * 255;
const double maxvalue = 255; const double maxvalue = 255;
cv::Mat bitMap; cv::Mat bitMap;
...@@ -182,11 +176,12 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -182,11 +176,12 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
std::vector<std::vector<std::vector<int>>> boxes; std::vector<std::vector<std::vector<int>>> boxes;
DBPostProcessor postProcessor; DBPostProcessor postProcessor;
boxes = postProcessor.BoxesFromBitmap(predMap, bitMap, dbParameter.BoxThreshold, dbParameter.UnclipRatio, dbParameter.ScoreMode); boxes = postProcessor.BoxesFromBitmap(
predMap, bitMap, dbParameter.BoxThreshold, dbParameter.UnclipRatio, dbParameter.ScoreMode);
boxes = postProcessor.FilterTagDetRes(boxes, ratioH, ratioW, srcImage); boxes = postProcessor.FilterTagDetRes(boxes, ratioH, ratioW, srcImage);
std::vector<migraphxSamples::OCRPredictResult> ocrResults; std::vector<migraphxSamples::OCRPredictResult> ocrResults;
for (int i = 0; i < boxes.size(); i++) for(int i = 0; i < boxes.size(); i++)
{ {
OCRPredictResult res; OCRPredictResult res;
res.box = boxes[i]; res.box = boxes[i];
...@@ -194,7 +189,7 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -194,7 +189,7 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
} }
Utility::sorted_boxes(ocrResults); Utility::sorted_boxes(ocrResults);
for (int j = 0; j < ocrResults.size(); j++) for(int j = 0; j < ocrResults.size(); j++)
{ {
cv::Mat cropImg; cv::Mat cropImg;
cropImg = Utility::GetRotateCropImage(img, ocrResults[j].box); cropImg = Utility::GetRotateCropImage(img, ocrResults[j].box);
...@@ -202,18 +197,19 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList) ...@@ -202,18 +197,19 @@ ErrorCode DB::Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList)
} }
} }
void DBPostProcessor::GetContourArea(const std::vector<std::vector<float>> &box, void DBPostProcessor::GetContourArea(const std::vector<std::vector<float>>& box,
float unclip_ratio, float &distance) { float unclip_ratio,
float& distance)
{
int pts_num = 4; int pts_num = 4;
float area = 0.0f; float area = 0.0f;
float dist = 0.0f; float dist = 0.0f;
for (int i = 0; i < pts_num; i++) { for(int i = 0; i < pts_num; i++)
area += box[i][0] * box[(i + 1) % pts_num][1] - {
box[i][1] * box[(i + 1) % pts_num][0]; area += box[i][0] * box[(i + 1) % pts_num][1] - box[i][1] * box[(i + 1) % pts_num][0];
dist += sqrtf((box[i][0] - box[(i + 1) % pts_num][0]) * dist += sqrtf(
(box[i][0] - box[(i + 1) % pts_num][0]) + (box[i][0] - box[(i + 1) % pts_num][0]) * (box[i][0] - box[(i + 1) % pts_num][0]) +
(box[i][1] - box[(i + 1) % pts_num][1]) * (box[i][1] - box[(i + 1) % pts_num][1]) * (box[i][1] - box[(i + 1) % pts_num][1]));
(box[i][1] - box[(i + 1) % pts_num][1]));
} }
area = fabs(float(area / 2.0)); area = fabs(float(area / 2.0));
...@@ -221,7 +217,8 @@ void DBPostProcessor::GetContourArea(const std::vector<std::vector<float>> &box, ...@@ -221,7 +217,8 @@ void DBPostProcessor::GetContourArea(const std::vector<std::vector<float>> &box,
} }
cv::RotatedRect DBPostProcessor::UnClip(std::vector<std::vector<float>> box, cv::RotatedRect DBPostProcessor::UnClip(std::vector<std::vector<float>> box,
const float &unclip_ratio) { const float& unclip_ratio)
{
float distance = 1.0; float distance = 1.0;
GetContourArea(box, unclip_ratio, distance); GetContourArea(box, unclip_ratio, distance);
...@@ -238,26 +235,34 @@ cv::RotatedRect DBPostProcessor::UnClip(std::vector<std::vector<float>> box, ...@@ -238,26 +235,34 @@ cv::RotatedRect DBPostProcessor::UnClip(std::vector<std::vector<float>> box,
offset.Execute(soln, distance); offset.Execute(soln, distance);
std::vector<cv::Point2f> points; std::vector<cv::Point2f> points;
for (int j = 0; j < soln.size(); j++) { for(int j = 0; j < soln.size(); j++)
for (int i = 0; i < soln[soln.size() - 1].size(); i++) { {
for(int i = 0; i < soln[soln.size() - 1].size(); i++)
{
points.emplace_back(soln[j][i].X, soln[j][i].Y); points.emplace_back(soln[j][i].X, soln[j][i].Y);
} }
} }
cv::RotatedRect res; cv::RotatedRect res;
if (points.size() <= 0) { if(points.size() <= 0)
{
res = cv::RotatedRect(cv::Point2f(0, 0), cv::Size2f(1, 1), 0); res = cv::RotatedRect(cv::Point2f(0, 0), cv::Size2f(1, 1), 0);
} else { }
else
{
res = cv::minAreaRect(points); res = cv::minAreaRect(points);
} }
return res; return res;
} }
float **DBPostProcessor::Mat2Vec(cv::Mat mat) { float** DBPostProcessor::Mat2Vec(cv::Mat mat)
auto **array = new float *[mat.rows]; {
for (int i = 0; i < mat.rows; ++i) auto** array = new float*[mat.rows];
for(int i = 0; i < mat.rows; ++i)
array[i] = new float[mat.cols]; array[i] = new float[mat.cols];
for (int i = 0; i < mat.rows; ++i) { for(int i = 0; i < mat.rows; ++i)
for (int j = 0; j < mat.cols; ++j) { {
for(int j = 0; j < mat.cols; ++j)
{
array[i][j] = mat.at<float>(i, j); array[i][j] = mat.at<float>(i, j);
} }
} }
...@@ -266,31 +271,34 @@ float **DBPostProcessor::Mat2Vec(cv::Mat mat) { ...@@ -266,31 +271,34 @@ float **DBPostProcessor::Mat2Vec(cv::Mat mat) {
} }
std::vector<std::vector<int>> std::vector<std::vector<int>>
DBPostProcessor::OrderPointsClockwise(std::vector<std::vector<int>> pts) { DBPostProcessor::OrderPointsClockwise(std::vector<std::vector<int>> pts)
{
std::vector<std::vector<int>> box = pts; std::vector<std::vector<int>> box = pts;
std::sort(box.begin(), box.end(), XsortInt); std::sort(box.begin(), box.end(), XsortInt);
std::vector<std::vector<int>> leftmost = {box[0], box[1]}; std::vector<std::vector<int>> leftmost = {box[0], box[1]};
std::vector<std::vector<int>> rightmost = {box[2], box[3]}; std::vector<std::vector<int>> rightmost = {box[2], box[3]};
if (leftmost[0][1] > leftmost[1][1]) if(leftmost[0][1] > leftmost[1][1])
std::swap(leftmost[0], leftmost[1]); std::swap(leftmost[0], leftmost[1]);
if (rightmost[0][1] > rightmost[1][1]) if(rightmost[0][1] > rightmost[1][1])
std::swap(rightmost[0], rightmost[1]); std::swap(rightmost[0], rightmost[1]);
std::vector<std::vector<int>> rect = {leftmost[0], rightmost[0], rightmost[1], std::vector<std::vector<int>> rect = {leftmost[0], rightmost[0], rightmost[1], leftmost[1]};
leftmost[1]};
return rect; return rect;
} }
std::vector<std::vector<float>> DBPostProcessor::Mat2Vector(cv::Mat mat) { std::vector<std::vector<float>> DBPostProcessor::Mat2Vector(cv::Mat mat)
{
std::vector<std::vector<float>> img_vec; std::vector<std::vector<float>> img_vec;
std::vector<float> tmp; std::vector<float> tmp;
for (int i = 0; i < mat.rows; ++i) { for(int i = 0; i < mat.rows; ++i)
{
tmp.clear(); tmp.clear();
for (int j = 0; j < mat.cols; ++j) { for(int j = 0; j < mat.cols; ++j)
{
tmp.push_back(mat.at<float>(i, j)); tmp.push_back(mat.at<float>(i, j));
} }
img_vec.push_back(tmp); img_vec.push_back(tmp);
...@@ -298,20 +306,22 @@ std::vector<std::vector<float>> DBPostProcessor::Mat2Vector(cv::Mat mat) { ...@@ -298,20 +306,22 @@ std::vector<std::vector<float>> DBPostProcessor::Mat2Vector(cv::Mat mat) {
return img_vec; return img_vec;
} }
bool DBPostProcessor::XsortFp32(std::vector<float> a, std::vector<float> b) { bool DBPostProcessor::XsortFp32(std::vector<float> a, std::vector<float> b)
if (a[0] != b[0]) {
if(a[0] != b[0])
return a[0] < b[0]; return a[0] < b[0];
return false; return false;
} }
bool DBPostProcessor::XsortInt(std::vector<int> a, std::vector<int> b) { bool DBPostProcessor::XsortInt(std::vector<int> a, std::vector<int> b)
if (a[0] != b[0]) {
if(a[0] != b[0])
return a[0] < b[0]; return a[0] < b[0];
return false; return false;
} }
std::vector<std::vector<float>> std::vector<std::vector<float>> DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float& ssid)
DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float &ssid) { {
ssid = std::max(box.size.width, box.size.height); ssid = std::max(box.size.width, box.size.height);
cv::Mat points; cv::Mat points;
...@@ -320,19 +330,24 @@ DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float &ssid) { ...@@ -320,19 +330,24 @@ DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float &ssid) {
auto array = Mat2Vector(points); auto array = Mat2Vector(points);
std::sort(array.begin(), array.end(), XsortFp32); std::sort(array.begin(), array.end(), XsortFp32);
std::vector<float> idx1 = array[0], idx2 = array[1], idx3 = array[2], std::vector<float> idx1 = array[0], idx2 = array[1], idx3 = array[2], idx4 = array[3];
idx4 = array[3]; if(array[3][1] <= array[2][1])
if (array[3][1] <= array[2][1]) { {
idx2 = array[3]; idx2 = array[3];
idx3 = array[2]; idx3 = array[2];
} else { }
else
{
idx2 = array[2]; idx2 = array[2];
idx3 = array[3]; idx3 = array[3];
} }
if (array[1][1] <= array[0][1]) { if(array[1][1] <= array[0][1])
{
idx1 = array[1]; idx1 = array[1];
idx4 = array[0]; idx4 = array[0];
} else { }
else
{
idx1 = array[0]; idx1 = array[0];
idx4 = array[1]; idx4 = array[1];
} }
...@@ -345,54 +360,50 @@ DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float &ssid) { ...@@ -345,54 +360,50 @@ DBPostProcessor::GetMiniBoxes(cv::RotatedRect box, float &ssid) {
return array; return array;
} }
float DBPostProcessor::PolygonScoreAcc(std::vector<cv::Point> contour, float DBPostProcessor::PolygonScoreAcc(std::vector<cv::Point> contour, cv::Mat pred)
cv::Mat pred) { {
int width = pred.cols; int width = pred.cols;
int height = pred.rows; int height = pred.rows;
std::vector<float> box_x; std::vector<float> box_x;
std::vector<float> box_y; std::vector<float> box_y;
for (int i = 0; i < contour.size(); ++i) { for(int i = 0; i < contour.size(); ++i)
{
box_x.push_back(contour[i].x); box_x.push_back(contour[i].x);
box_y.push_back(contour[i].y); box_y.push_back(contour[i].y);
} }
int xmin = int xmin =
clamp(int(std::floor(*(std::min_element(box_x.begin(), box_x.end())))), 0, clamp(int(std::floor(*(std::min_element(box_x.begin(), box_x.end())))), 0, width - 1);
width - 1); int xmax = clamp(int(std::ceil(*(std::max_element(box_x.begin(), box_x.end())))), 0, width - 1);
int xmax =
clamp(int(std::ceil(*(std::max_element(box_x.begin(), box_x.end())))), 0,
width - 1);
int ymin = int ymin =
clamp(int(std::floor(*(std::min_element(box_y.begin(), box_y.end())))), 0, clamp(int(std::floor(*(std::min_element(box_y.begin(), box_y.end())))), 0, height - 1);
height - 1);
int ymax = int ymax =
clamp(int(std::ceil(*(std::max_element(box_y.begin(), box_y.end())))), 0, clamp(int(std::ceil(*(std::max_element(box_y.begin(), box_y.end())))), 0, height - 1);
height - 1);
cv::Mat mask; cv::Mat mask;
mask = cv::Mat::zeros(ymax - ymin + 1, xmax - xmin + 1, CV_8UC1); mask = cv::Mat::zeros(ymax - ymin + 1, xmax - xmin + 1, CV_8UC1);
cv::Point *rook_point = new cv::Point[contour.size()]; cv::Point* rook_point = new cv::Point[contour.size()];
for (int i = 0; i < contour.size(); ++i) { for(int i = 0; i < contour.size(); ++i)
{
rook_point[i] = cv::Point(int(box_x[i]) - xmin, int(box_y[i]) - ymin); rook_point[i] = cv::Point(int(box_x[i]) - xmin, int(box_y[i]) - ymin);
} }
const cv::Point *ppt[1] = {rook_point}; const cv::Point* ppt[1] = {rook_point};
int npt[] = {int(contour.size())}; int npt[] = {int(contour.size())};
cv::fillPoly(mask, ppt, npt, 1, cv::Scalar(1)); cv::fillPoly(mask, ppt, npt, 1, cv::Scalar(1));
cv::Mat croppedImg; cv::Mat croppedImg;
pred(cv::Rect(xmin, ymin, xmax - xmin + 1, ymax - ymin + 1)) pred(cv::Rect(xmin, ymin, xmax - xmin + 1, ymax - ymin + 1)).copyTo(croppedImg);
.copyTo(croppedImg);
float score = cv::mean(croppedImg, mask)[0]; float score = cv::mean(croppedImg, mask)[0];
delete[] rook_point; delete[] rook_point;
return score; return score;
} }
float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array, float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred)
cv::Mat pred) { {
auto array = box_array; auto array = box_array;
int width = pred.cols; int width = pred.cols;
int height = pred.rows; int height = pred.rows;
...@@ -400,14 +411,10 @@ float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array, ...@@ -400,14 +411,10 @@ float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array,
float box_x[4] = {array[0][0], array[1][0], array[2][0], array[3][0]}; float box_x[4] = {array[0][0], array[1][0], array[2][0], array[3][0]};
float box_y[4] = {array[0][1], array[1][1], array[2][1], array[3][1]}; float box_y[4] = {array[0][1], array[1][1], array[2][1], array[3][1]};
int xmin = clamp(int(std::floor(*(std::min_element(box_x, box_x + 4)))), 0, int xmin = clamp(int(std::floor(*(std::min_element(box_x, box_x + 4)))), 0, width - 1);
width - 1); int xmax = clamp(int(std::ceil(*(std::max_element(box_x, box_x + 4)))), 0, width - 1);
int xmax = clamp(int(std::ceil(*(std::max_element(box_x, box_x + 4)))), 0, int ymin = clamp(int(std::floor(*(std::min_element(box_y, box_y + 4)))), 0, height - 1);
width - 1); int ymax = clamp(int(std::ceil(*(std::max_element(box_y, box_y + 4)))), 0, height - 1);
int ymin = clamp(int(std::floor(*(std::min_element(box_y, box_y + 4)))), 0,
height - 1);
int ymax = clamp(int(std::ceil(*(std::max_element(box_y, box_y + 4)))), 0,
height - 1);
cv::Mat mask; cv::Mat mask;
mask = cv::Mat::zeros(ymax - ymin + 1, xmax - xmin + 1, CV_8UC1); mask = cv::Mat::zeros(ymax - ymin + 1, xmax - xmin + 1, CV_8UC1);
...@@ -417,21 +424,24 @@ float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array, ...@@ -417,21 +424,24 @@ float DBPostProcessor::BoxScoreFast(std::vector<std::vector<float>> box_array,
root_point[1] = cv::Point(int(array[1][0]) - xmin, int(array[1][1]) - ymin); root_point[1] = cv::Point(int(array[1][0]) - xmin, int(array[1][1]) - ymin);
root_point[2] = cv::Point(int(array[2][0]) - xmin, int(array[2][1]) - ymin); root_point[2] = cv::Point(int(array[2][0]) - xmin, int(array[2][1]) - ymin);
root_point[3] = cv::Point(int(array[3][0]) - xmin, int(array[3][1]) - ymin); root_point[3] = cv::Point(int(array[3][0]) - xmin, int(array[3][1]) - ymin);
const cv::Point *ppt[1] = {root_point}; const cv::Point* ppt[1] = {root_point};
int npt[] = {4}; int npt[] = {4};
cv::fillPoly(mask, ppt, npt, 1, cv::Scalar(1)); cv::fillPoly(mask, ppt, npt, 1, cv::Scalar(1));
cv::Mat croppedImg; cv::Mat croppedImg;
pred(cv::Rect(xmin, ymin, xmax - xmin + 1, ymax - ymin + 1)) pred(cv::Rect(xmin, ymin, xmax - xmin + 1, ymax - ymin + 1)).copyTo(croppedImg);
.copyTo(croppedImg);
auto score = cv::mean(croppedImg, mask)[0]; auto score = cv::mean(croppedImg, mask)[0];
return score; return score;
} }
std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap( std::vector<std::vector<std::vector<int>>>
const cv::Mat pred, const cv::Mat bitmap, const float &box_thresh, DBPostProcessor::BoxesFromBitmap(const cv::Mat pred,
const float &det_db_unclip_ratio, const std::string &det_db_score_mode) { const cv::Mat bitmap,
const float& box_thresh,
const float& det_db_unclip_ratio,
const std::string& det_db_score_mode)
{
const int min_size = 3; const int min_size = 3;
const int max_candidates = 2000; const int max_candidates = 2000;
...@@ -441,16 +451,16 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap( ...@@ -441,16 +451,16 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap(
std::vector<std::vector<cv::Point>> contours; std::vector<std::vector<cv::Point>> contours;
std::vector<cv::Vec4i> hierarchy; std::vector<cv::Vec4i> hierarchy;
cv::findContours(bitmap, contours, hierarchy, cv::RETR_LIST, cv::findContours(bitmap, contours, hierarchy, cv::RETR_LIST, cv::CHAIN_APPROX_SIMPLE);
cv::CHAIN_APPROX_SIMPLE);
int num_contours = int num_contours = contours.size() >= max_candidates ? max_candidates : contours.size();
contours.size() >= max_candidates ? max_candidates : contours.size();
std::vector<std::vector<std::vector<int>>> boxes; std::vector<std::vector<std::vector<int>>> boxes;
for (int _i = 0; _i < num_contours; _i++) { for(int _i = 0; _i < num_contours; _i++)
if (contours[_i].size() <= 2) { {
if(contours[_i].size() <= 2)
{
continue; continue;
} }
float ssid; float ssid;
...@@ -460,23 +470,25 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap( ...@@ -460,23 +470,25 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap(
auto box_for_unclip = array; auto box_for_unclip = array;
// end get_mini_box // end get_mini_box
if (ssid < min_size) { if(ssid < min_size)
{
continue; continue;
} }
float score; float score;
if (det_db_score_mode == "slow") if(det_db_score_mode == "slow")
/* compute using polygon*/ /* compute using polygon*/
score = PolygonScoreAcc(contours[_i], pred); score = PolygonScoreAcc(contours[_i], pred);
else else
score = BoxScoreFast(array, pred); score = BoxScoreFast(array, pred);
if (score < box_thresh) if(score < box_thresh)
continue; continue;
// start for unclip // start for unclip
cv::RotatedRect points = UnClip(box_for_unclip, det_db_unclip_ratio); cv::RotatedRect points = UnClip(box_for_unclip, det_db_unclip_ratio);
if (points.size.height < 1.001 && points.size.width < 1.001) { if(points.size.height < 1.001 && points.size.width < 1.001)
{
continue; continue;
} }
// end for unclip // end for unclip
...@@ -484,20 +496,22 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap( ...@@ -484,20 +496,22 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap(
cv::RotatedRect clipbox = points; cv::RotatedRect clipbox = points;
auto cliparray = GetMiniBoxes(clipbox, ssid); auto cliparray = GetMiniBoxes(clipbox, ssid);
if (ssid < min_size + 2) if(ssid < min_size + 2)
continue; continue;
int dest_width = pred.cols; int dest_width = pred.cols;
int dest_height = pred.rows; int dest_height = pred.rows;
std::vector<std::vector<int>> intcliparray; std::vector<std::vector<int>> intcliparray;
for (int num_pt = 0; num_pt < 4; num_pt++) { for(int num_pt = 0; num_pt < 4; num_pt++)
std::vector<int> a{int(clampf(roundf(cliparray[num_pt][0] / float(width) * {
float(dest_width)), std::vector<int> a{
0, float(dest_width))), int(clampf(roundf(cliparray[num_pt][0] / float(width) * float(dest_width)),
int(clampf(roundf(cliparray[num_pt][1] / 0,
float(height) * float(dest_height)), float(dest_width))),
0, float(dest_height)))}; int(clampf(roundf(cliparray[num_pt][1] / float(height) * float(dest_height)),
0,
float(dest_height)))};
intcliparray.push_back(a); intcliparray.push_back(a);
} }
boxes.push_back(intcliparray); boxes.push_back(intcliparray);
...@@ -507,15 +521,17 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap( ...@@ -507,15 +521,17 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::BoxesFromBitmap(
} }
std::vector<std::vector<std::vector<int>>> DBPostProcessor::FilterTagDetRes( std::vector<std::vector<std::vector<int>>> DBPostProcessor::FilterTagDetRes(
std::vector<std::vector<std::vector<int>>> boxes, float ratio_h, std::vector<std::vector<std::vector<int>>> boxes, float ratio_h, float ratio_w, cv::Mat srcimg)
float ratio_w, cv::Mat srcimg) { {
int oriimg_h = srcimg.rows; int oriimg_h = srcimg.rows;
int oriimg_w = srcimg.cols; int oriimg_w = srcimg.cols;
std::vector<std::vector<std::vector<int>>> root_points; std::vector<std::vector<std::vector<int>>> root_points;
for (int n = 0; n < boxes.size(); n++) { for(int n = 0; n < boxes.size(); n++)
{
boxes[n] = OrderPointsClockwise(boxes[n]); boxes[n] = OrderPointsClockwise(boxes[n]);
for (int m = 0; m < boxes[0].size(); m++) { for(int m = 0; m < boxes[0].size(); m++)
{
boxes[n][m][0] /= ratio_w; boxes[n][m][0] /= ratio_w;
boxes[n][m][1] /= ratio_h; boxes[n][m][1] /= ratio_h;
...@@ -524,17 +540,18 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::FilterTagDetRes( ...@@ -524,17 +540,18 @@ std::vector<std::vector<std::vector<int>>> DBPostProcessor::FilterTagDetRes(
} }
} }
for (int n = 0; n < boxes.size(); n++) { for(int n = 0; n < boxes.size(); n++)
{
int rect_width, rect_height; int rect_width, rect_height;
rect_width = int(sqrt(pow(boxes[n][0][0] - boxes[n][1][0], 2) + rect_width = int(sqrt(pow(boxes[n][0][0] - boxes[n][1][0], 2) +
pow(boxes[n][0][1] - boxes[n][1][1], 2))); pow(boxes[n][0][1] - boxes[n][1][1], 2)));
rect_height = int(sqrt(pow(boxes[n][0][0] - boxes[n][3][0], 2) + rect_height = int(sqrt(pow(boxes[n][0][0] - boxes[n][3][0], 2) +
pow(boxes[n][0][1] - boxes[n][3][1], 2))); pow(boxes[n][0][1] - boxes[n][3][1], 2)));
if (rect_width <= 4 || rect_height <= 4) if(rect_width <= 4 || rect_height <= 4)
continue; continue;
root_points.push_back(boxes[n]); root_points.push_back(boxes[n]);
} }
return root_points; return root_points;
} }
} } // namespace migraphxSamples
\ No newline at end of file \ No newline at end of file
Src/PaddleOCR/OcrDB.h
View file @ 2475c919
...@@ -20,20 +20,20 @@ typedef struct _DBParameter ...@@ -20,20 +20,20 @@ typedef struct _DBParameter
int LimitSideLen; int LimitSideLen;
std::string ScoreMode; std::string ScoreMode;
}DBParameter; } DBParameter;
class DB class DB
{ {
public: public:
DB(); DB();
~DB(); ~DB();
ErrorCode Initialize(InitializationParameterOfDB InitializationParameterOfDB); ErrorCode Initialize(InitializationParameterOfDB InitializationParameterOfDB);
ErrorCode Infer(const cv::Mat &img, std::vector<cv::Mat> &imgList); ErrorCode Infer(const cv::Mat& img, std::vector<cv::Mat>& imgList);
private: private:
cv::FileStorage configurationFile; cv::FileStorage configurationFile;
migraphx::program net; migraphx::program net;
...@@ -41,38 +41,39 @@ private: ...@@ -41,38 +41,39 @@ private:
std::string inputName; std::string inputName;
migraphx::shape inputShape; migraphx::shape inputShape;
DBParameter dbParameter; DBParameter dbParameter;
}; };
class DBPostProcessor { class DBPostProcessor
public: {
void GetContourArea(const std::vector<std::vector<float>> &box, public:
float unclip_ratio, float &distance); void
GetContourArea(const std::vector<std::vector<float>>& box, float unclip_ratio, float& distance);
cv::RotatedRect UnClip(std::vector<std::vector<float>> box, cv::RotatedRect UnClip(std::vector<std::vector<float>> box, const float& unclip_ratio);
const float &unclip_ratio);
float **Mat2Vec(cv::Mat mat); float** Mat2Vec(cv::Mat mat);
std::vector<std::vector<int>> std::vector<std::vector<int>> OrderPointsClockwise(std::vector<std::vector<int>> pts);
OrderPointsClockwise(std::vector<std::vector<int>> pts);
std::vector<std::vector<float>> GetMiniBoxes(cv::RotatedRect box, std::vector<std::vector<float>> GetMiniBoxes(cv::RotatedRect box, float& ssid);
float &ssid);
float BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred); float BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred);
float PolygonScoreAcc(std::vector<cv::Point> contour, cv::Mat pred); float PolygonScoreAcc(std::vector<cv::Point> contour, cv::Mat pred);
std::vector<std::vector<std::vector<int>>> std::vector<std::vector<std::vector<int>>>
BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap, BoxesFromBitmap(const cv::Mat pred,
const float &box_thresh, const float &det_db_unclip_ratio, const cv::Mat bitmap,
const std::string &det_db_score_mode); const float& box_thresh,
const float& det_db_unclip_ratio,
const std::string& det_db_score_mode);
std::vector<std::vector<std::vector<int>>> std::vector<std::vector<std::vector<int>>>
FilterTagDetRes(std::vector<std::vector<std::vector<int>>> boxes, FilterTagDetRes(std::vector<std::vector<std::vector<int>>> boxes,
float ratio_h, float ratio_w, cv::Mat srcimg); float ratio_h,
float ratio_w,
cv::Mat srcimg);
private: private:
static bool XsortInt(std::vector<int> a, std::vector<int> b); static bool XsortInt(std::vector<int> a, std::vector<int> b);
static bool XsortFp32(std::vector<float> a, std::vector<float> b); static bool XsortFp32(std::vector<float> a, std::vector<float> b);
...@@ -83,23 +84,26 @@ private: ...@@ -83,23 +84,26 @@ private:
inline int _min(int a, int b) { return a >= b ? b : a; } inline int _min(int a, int b) { return a >= b ? b : a; }
template <class T> inline T clamp(T x, T min, T max) { template <class T>
if (x > max) inline T clamp(T x, T min, T max)
{
if(x > max)
return max; return max;
if (x < min) if(x < min)
return min; return min;
return x; return x;
} }
inline float clampf(float x, float min, float max) { inline float clampf(float x, float min, float max)
if (x > max) {
if(x > max)
return max; return max;
if (x < min) if(x < min)
return min; return min;
return x; return x;
} }
}; };
} } // namespace migraphxSamples
#endif #endif
\ No newline at end of file
Src/PaddleOCR/OcrSVTR.cpp
View file @ 2475c919
...@@ -6,20 +6,14 @@ ...@@ -6,20 +6,14 @@
namespace migraphxSamples namespace migraphxSamples
{ {
SVTR::SVTR() SVTR::SVTR() {}
{
}
SVTR::~SVTR() SVTR::~SVTR() { configurationFile.release(); }
{
configurationFile.release();
}
ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameterOfSVTR) ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameterOfSVTR)
{ {
// 读取配置文件 // 读取配置文件
std::string configFilePath=InitializationParameterOfSVTR.configFilePath; std::string configFilePath = InitializationParameterOfSVTR.configFilePath;
if(!Exists(configFilePath)) if(!Exists(configFilePath))
{ {
LOG_ERROR(stdout, "no configuration file!\n"); LOG_ERROR(stdout, "no configuration file!\n");
...@@ -40,45 +34,45 @@ ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameter ...@@ -40,45 +34,45 @@ ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameter
// 加载模型 // 加载模型
if(!Exists(modelPath)) if(!Exists(modelPath))
{ {
LOG_ERROR(stdout,"%s not exist!\n",modelPath.c_str()); LOG_ERROR(stdout, "%s not exist!\n", modelPath.c_str());
return MODEL_NOT_EXIST; return MODEL_NOT_EXIST;
} }
migraphx::onnx_options onnx_options; migraphx::onnx_options onnx_options;
onnx_options.map_input_dims["x"]={1,3,48,320}; // 设置最大shape onnx_options.map_input_dims["x"] = {1, 3, 48, 320}; // 设置最大shape
net = migraphx::parse_onnx(modelPath, onnx_options); net = migraphx::parse_onnx(modelPath, onnx_options);
LOG_INFO(stdout,"succeed to load model: %s\n",GetFileName(modelPath).c_str()); LOG_INFO(stdout, "succeed to load model: %s\n", GetFileName(modelPath).c_str());
// 获取模型输入/输出节点信息 // 获取模型输入/输出节点信息
std::unordered_map<std::string, migraphx::shape> inputs=net.get_inputs(); std::unordered_map<std::string, migraphx::shape> inputs = net.get_inputs();
std::unordered_map<std::string, migraphx::shape> outputs=net.get_outputs(); std::unordered_map<std::string, migraphx::shape> outputs = net.get_outputs();
inputName=inputs.begin()->first; inputName = inputs.begin()->first;
inputShape=inputs.begin()->second; inputShape = inputs.begin()->second;
int N=inputShape.lens()[0]; int N = inputShape.lens()[0];
int C=inputShape.lens()[1]; int C = inputShape.lens()[1];
int H=inputShape.lens()[2]; int H = inputShape.lens()[2];
int W=inputShape.lens()[3]; int W = inputShape.lens()[3];
inputSize=cv::Size(W,H); inputSize = cv::Size(W, H);
// 设置模型为GPU模式 // 设置模型为GPU模式
migraphx::target gpuTarget = migraphx::gpu::target{}; migraphx::target gpuTarget = migraphx::gpu::target{};
// 编译模型 // 编译模型
migraphx::compile_options options; migraphx::compile_options options;
options.device_id=0; // 设置GPU设备，默认为0号设备 options.device_id = 0; // 设置GPU设备，默认为0号设备
options.offload_copy=true; options.offload_copy = true;
net.compile(gpuTarget,options); net.compile(gpuTarget, options);
LOG_INFO(stdout,"succeed to compile model: %s\n",GetFileName(modelPath).c_str()); LOG_INFO(stdout, "succeed to compile model: %s\n", GetFileName(modelPath).c_str());
// warm up // warm up
std::unordered_map<std::string, migraphx::argument> inputData; std::unordered_map<std::string, migraphx::argument> inputData;
inputData[inputName]=migraphx::argument{inputShape}; inputData[inputName] = migraphx::argument{inputShape};
net.eval(inputData); net.eval(inputData);
std::ifstream in(dictPath); std::ifstream in(dictPath);
std::string line; std::string line;
if (in) if(in)
{ {
while (getline(in, line)) while(getline(in, line))
{ {
charactorDict.push_back(line); charactorDict.push_back(line);
} }
...@@ -92,15 +86,16 @@ ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameter ...@@ -92,15 +86,16 @@ ErrorCode SVTR::Initialize(InitializationParameterOfSVTR InitializationParameter
} }
// log // log
LOG_INFO(stdout,"InputMaxSize:%dx%d\n",inputSize.width,inputSize.height); LOG_INFO(stdout, "InputMaxSize:%dx%d\n", inputSize.width, inputSize.height);
LOG_INFO(stdout,"InputName:%s\n",inputName.c_str()); LOG_INFO(stdout, "InputName:%s\n", inputName.c_str());
return SUCCESS; return SUCCESS;
} }
ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdScore, float &maxWHRatio) ErrorCode
SVTR::Infer(cv::Mat& img, std::string& resultsChar, float& resultsdScore, float& maxWHRatio)
{ {
if(img.empty()||img.type()!=CV_8UC3) if(img.empty() || img.type() != CV_8UC3)
{ {
LOG_ERROR(stdout, "image error!\n"); LOG_ERROR(stdout, "image error!\n");
return IMAGE_ERROR; return IMAGE_ERROR;
...@@ -115,7 +110,7 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco ...@@ -115,7 +110,7 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco
int resizeW; int resizeW;
int imgW = int((48 * maxWHRatio)); int imgW = int((48 * maxWHRatio));
ratio = float(srcImage.cols) / float(srcImage.rows); ratio = float(srcImage.cols) / float(srcImage.rows);
if (ceil(imgH * ratio) > imgW) if(ceil(imgH * ratio) > imgW)
{ {
resizeW = imgW; resizeW = imgW;
} }
...@@ -124,27 +119,33 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco ...@@ -124,27 +119,33 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco
resizeW = int(ceil(imgH * ratio)); resizeW = int(ceil(imgH * ratio));
} }
cv::resize(srcImage, resizeImg, cv::Size(resizeW, imgH)); cv::resize(srcImage, resizeImg, cv::Size(resizeW, imgH));
cv::copyMakeBorder(resizeImg, resizeImg, 0, 0, 0, cv::copyMakeBorder(resizeImg,
int(imgW - resizeImg.cols), cv::BORDER_CONSTANT, resizeImg,
0,
0,
0,
int(imgW - resizeImg.cols),
cv::BORDER_CONSTANT,
{127, 127, 127}); {127, 127, 127});
resizeImg.convertTo(resizeImg, CV_32FC3, 1.0/255.0); resizeImg.convertTo(resizeImg, CV_32FC3, 1.0 / 255.0);
std::vector<cv::Mat> bgrChannels(3); std::vector<cv::Mat> bgrChannels(3);
cv::split(resizeImg, bgrChannels); cv::split(resizeImg, bgrChannels);
std::vector<float> mean = {0.485f, 0.456f, 0.406f}; std::vector<float> mean = {0.485f, 0.456f, 0.406f};
std::vector<float> scale = {1 / 0.229f, 1 / 0.224f, 1 / 0.225f}; std::vector<float> scale = {1 / 0.229f, 1 / 0.224f, 1 / 0.225f};
for (auto i = 0; i < bgrChannels.size(); i++) for(auto i = 0; i < bgrChannels.size(); i++)
{ {
bgrChannels[i].convertTo(bgrChannels[i], CV_32FC1, 1.0 * scale[i], bgrChannels[i].convertTo(
(0.0 - mean[i]) * scale[i]); bgrChannels[i], CV_32FC1, 1.0 * scale[i], (0.0 - mean[i]) * scale[i]);
} }
cv::merge(bgrChannels, resizeImg); cv::merge(bgrChannels, resizeImg);
cv::Mat inputBlob = cv::dnn::blobFromImage(resizeImg); cv::Mat inputBlob = cv::dnn::blobFromImage(resizeImg);
std::vector<std::size_t> inputShapeOfInfer={1,3,48,resizeW}; std::vector<std::size_t> inputShapeOfInfer = {1, 3, 48, resizeW};
// 创建输入数据 // 创建输入数据
std::unordered_map<std::string, migraphx::argument> inputData; std::unordered_map<std::string, migraphx::argument> inputData;
inputData[inputName]= migraphx::argument{migraphx::shape(inputShape.type(),inputShapeOfInfer), (float*)inputBlob.data}; inputData[inputName] = migraphx::argument{migraphx::shape(inputShape.type(), inputShapeOfInfer),
(float*)inputBlob.data};
// 推理 // 推理
std::vector<migraphx::argument> inferenceResults = net.eval(inputData); std::vector<migraphx::argument> inferenceResults = net.eval(inputData);
...@@ -156,7 +157,7 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco ...@@ -156,7 +157,7 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco
int n3 = outputShape.lens()[2]; int n3 = outputShape.lens()[2];
int n = n2 * n3; int n = n2 * n3;
std::vector<float> out(n); std::vector<float> out(n);
memcpy(out.data(),result.data(),sizeof(float)*outputShape.elements()); memcpy(out.data(), result.data(), sizeof(float) * outputShape.elements());
out.resize(n); out.resize(n);
int argmaxIdx; int argmaxIdx;
...@@ -164,14 +165,13 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco ...@@ -164,14 +165,13 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco
float score = 0.f; float score = 0.f;
int count = 0; int count = 0;
float maxValue = 0.0f; float maxValue = 0.0f;
for (int j = 0; j < n2; j++) for(int j = 0; j < n2; j++)
{ {
argmaxIdx = int(std::distance(&out[(j) * n3], argmaxIdx =
std::max_element(&out[(j) * n3], &out[(j + 1) * n3]))); int(std::distance(&out[(j)*n3], std::max_element(&out[(j)*n3], &out[(j + 1) * n3])));
maxValue = float(*std::max_element(&out[(j) * n3], maxValue = float(*std::max_element(&out[(j)*n3], &out[(j + 1) * n3]));
&out[(j + 1) * n3]));
if (argmaxIdx > 0 && (!(n > 0 && argmaxIdx == lastIndex))) if(argmaxIdx > 0 && (!(n > 0 && argmaxIdx == lastIndex)))
{ {
score += maxValue; score += maxValue;
count += 1; count += 1;
...@@ -184,4 +184,4 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco ...@@ -184,4 +184,4 @@ ErrorCode SVTR::Infer(cv::Mat &img, std::string &resultsChar, float &resultsdSco
return SUCCESS; return SUCCESS;
} }
} } // namespace migraphxSamples
Src/PaddleOCR/OcrSVTR.h
View file @ 2475c919
...@@ -11,16 +11,17 @@ namespace migraphxSamples ...@@ -11,16 +11,17 @@ namespace migraphxSamples
class SVTR class SVTR
{ {
public: public:
SVTR(); SVTR();
~SVTR(); ~SVTR();
ErrorCode Initialize(InitializationParameterOfSVTR InitializationParameterOfSVTR); ErrorCode Initialize(InitializationParameterOfSVTR InitializationParameterOfSVTR);
ErrorCode Infer(cv::Mat &img, std::string &resultsChar, float &resultsdScore, float &maxWHRatio); ErrorCode
Infer(cv::Mat& img, std::string& resultsChar, float& resultsdScore, float& maxWHRatio);
private: private:
cv::FileStorage configurationFile; cv::FileStorage configurationFile;
migraphx::program net; migraphx::program net;
...@@ -29,8 +30,7 @@ private: ...@@ -29,8 +30,7 @@ private:
migraphx::shape inputShape; migraphx::shape inputShape;
std::string dictPath; std::string dictPath;
std::vector<std::string> charactorDict; std::vector<std::string> charactorDict;
}; };
} } // namespace migraphxSamples
#endif #endif
\ No newline at end of file
Src/PaddleOCR/VLPR.cpp
View file @ 2475c919
...@@ -3,22 +3,17 @@ ...@@ -3,22 +3,17 @@
namespace migraphxSamples namespace migraphxSamples
{ {
VLPR::VLPR() VLPR::VLPR() {}
{
} VLPR::~VLPR() { configurationFile.release(); }
VLPR::~VLPR() ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB,
{ InitializationParameterOfSVTR initParamOfSVTR)
configurationFile.release();
}
ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB, InitializationParameterOfSVTR initParamOfSVTR)
{ {
// 初始化DB // 初始化DB
initParamOfDB.configFilePath = CONFIG_FILE; initParamOfDB.configFilePath = CONFIG_FILE;
ErrorCode errorCode=db.Initialize(initParamOfDB); ErrorCode errorCode = db.Initialize(initParamOfDB);
if(errorCode!=SUCCESS) if(errorCode != SUCCESS)
{ {
LOG_ERROR(stdout, "fail to initialize db!\n"); LOG_ERROR(stdout, "fail to initialize db!\n");
exit(-1); exit(-1);
...@@ -27,8 +22,8 @@ ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB, Initializa ...@@ -27,8 +22,8 @@ ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB, Initializa
// 初始化SVTR // 初始化SVTR
initParamOfSVTR.configFilePath = CONFIG_FILE; initParamOfSVTR.configFilePath = CONFIG_FILE;
errorCode=svtr.Initialize(initParamOfSVTR); errorCode = svtr.Initialize(initParamOfSVTR);
if(errorCode!=SUCCESS) if(errorCode != SUCCESS)
{ {
LOG_ERROR(stdout, "fail to initialize svtr!\n"); LOG_ERROR(stdout, "fail to initialize svtr!\n");
exit(-1); exit(-1);
...@@ -36,12 +31,13 @@ ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB, Initializa ...@@ -36,12 +31,13 @@ ErrorCode VLPR::Initialize(InitializationParameterOfDB initParamOfDB, Initializa
LOG_INFO(stdout, "succeed to initialize svtr\n"); LOG_INFO(stdout, "succeed to initialize svtr\n");
} }
ErrorCode VLPR::Infer(cv::Mat &img, std::vector<std::string> &recTexts, std::vector<float> &recTextScores) ErrorCode
VLPR::Infer(cv::Mat& img, std::vector<std::string>& recTexts, std::vector<float>& recTextScores)
{ {
// DB推理 // DB推理
db.Infer(img,imgLists); db.Infer(img, imgLists);
for (int i = 0; i < imgLists.size(); i++) for(int i = 0; i < imgLists.size(); i++)
{ {
float maxWHRatio = float(imgLists[i].cols) / float(imgLists[i].rows); float maxWHRatio = float(imgLists[i].cols) / float(imgLists[i].rows);
...@@ -52,7 +48,6 @@ ErrorCode VLPR::Infer(cv::Mat &img, std::vector<std::string> &recTexts, std::vec ...@@ -52,7 +48,6 @@ ErrorCode VLPR::Infer(cv::Mat &img, std::vector<std::string> &recTexts, std::vec
} }
return SUCCESS; return SUCCESS;
} }
} } // namespace migraphxSamples
\ No newline at end of file \ No newline at end of file
Src/PaddleOCR/VLPR.h
View file @ 2475c919
...@@ -12,24 +12,25 @@ namespace migraphxSamples ...@@ -12,24 +12,25 @@ namespace migraphxSamples
class VLPR class VLPR
{ {
public: public:
VLPR(); VLPR();
~VLPR(); ~VLPR();
ErrorCode Initialize(InitializationParameterOfDB initParamOfDB, InitializationParameterOfSVTR initParamOfSVTR); ErrorCode Initialize(InitializationParameterOfDB initParamOfDB,
InitializationParameterOfSVTR initParamOfSVTR);
ErrorCode Infer(cv::Mat &img, std::vector<std::string> &recTexts, std::vector<float> &recTextScores); ErrorCode
Infer(cv::Mat& img, std::vector<std::string>& recTexts, std::vector<float>& recTextScores);
private: private:
DB db; DB db;
SVTR svtr; SVTR svtr;
cv::FileStorage configurationFile; cv::FileStorage configurationFile;
std::vector<cv::Mat> imgLists; std::vector<cv::Mat> imgLists;
std::string recText; std::string recText;
float recTextScore; float recTextScore;
}; };
} } // namespace migraphxSamples
#endif #endif
\ No newline at end of file
Src/PaddleOCR/clipper.cpp
View file @ 2475c919
This source diff could not be displayed because it is too large. You can view the blob instead.
Src/PaddleOCR/clipper.h
View file @ 2475c919
/******************************************************************************* /*******************************************************************************
* * * *
* Author : Angus Johnson * * Author : Angus Johnson *
* Version : 6.4.2 * * Version : 6.4.2 *
* Date : 27 February 2017 * * Date : 27 February 2017 *
* Website : http://www.angusj.com * * Website : http://www.angusj.com *
* Copyright : Angus Johnson 2010-2017 * * Copyright : Angus Johnson 2010-2017 *
* * * *
* License: * * License: *
* Use, modification & distribution is subject to Boost Software License Ver 1. * * Use, modification & distribution is subject to Boost Software License Ver 1. *
* http://www.boost.org/LICENSE_1_0.txt * * http://www.boost.org/LICENSE_1_0.txt *
* * * *
* Attributions: * * Attributions: *
* The code in this library is an extension of Bala Vatti's clipping algorithm: * * The code in this library is an extension of Bala Vatti's clipping algorithm: *
* "A generic solution to polygon clipping" * * "A generic solution to polygon clipping" *
* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * * Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. *
* http://portal.acm.org/citation.cfm?id=129906 * * http://portal.acm.org/citation.cfm?id=129906 *
* * * *
* Computer graphics and geometric modeling: implementation and algorithms * * Computer graphics and geometric modeling: implementation and algorithms *
* By Max K. Agoston * * By Max K. Agoston *
* Springer; 1 edition (January 4, 2005) * * Springer; 1 edition (January 4, 2005) *
* http://books.google.com/books?q=vatti+clipping+agoston * * http://books.google.com/books?q=vatti+clipping+agoston *
* * * *
* See also: * * See also: *
* "Polygon Offsetting by Computing Winding Numbers" * * "Polygon Offsetting by Computing Winding Numbers" *
* Paper no. DETC2005-85513 pp. 565-575 * * Paper no. DETC2005-85513 pp. 565-575 *
* ASME 2005 International Design Engineering Technical Conferences * * ASME 2005 International Design Engineering Technical Conferences *
* and Computers and Information in Engineering Conference (IDETC/CIE2005) * * and Computers and Information in Engineering Conference (IDETC/CIE2005) *
* September 24-28, 2005 , Long Beach, California, USA * * September 24-28, 2005 , Long Beach, California, USA *
* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * * http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf *
* * * *
*******************************************************************************/ *******************************************************************************/
#pragma once #pragma once
...@@ -40,16 +40,16 @@ ...@@ -40,16 +40,16 @@
// use_int32: When enabled 32bit ints are used instead of 64bit ints. This // use_int32: When enabled 32bit ints are used instead of 64bit ints. This
// improve performance but coordinate values are limited to the range +/- 46340 // improve performance but coordinate values are limited to the range +/- 46340
//#define use_int32 // #define use_int32
// use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance. // use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
//#define use_xyz // #define use_xyz
// use_lines: Enables line clipping. Adds a very minor cost to performance. // use_lines: Enables line clipping. Adds a very minor cost to performance.
#define use_lines #define use_lines
// use_deprecated: Enables temporary support for the obsolete functions // use_deprecated: Enables temporary support for the obsolete functions
//#define use_deprecated // #define use_deprecated
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
...@@ -61,15 +61,32 @@ ...@@ -61,15 +61,32 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
namespace ClipperLib { namespace ClipperLib
{
enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; enum ClipType
enum PolyType { ptSubject, ptClip }; {
ctIntersection,
ctUnion,
ctDifference,
ctXor
};
enum PolyType
{
ptSubject,
ptClip
};
// By far the most widely used winding rules for polygon filling are // By far the most widely used winding rules for polygon filling are
// EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32) // EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32)
// Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL) // Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL)
// see http://glprogramming.com/red/chapter11.html // see http://glprogramming.com/red/chapter11.html
enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; enum PolyFillType
{
pftEvenOdd,
pftNonZero,
pftPositive,
pftNegative
};
#ifdef use_int32 #ifdef use_int32
typedef int cInt; typedef int cInt;
...@@ -84,7 +101,8 @@ typedef unsigned long long ulong64; ...@@ -84,7 +101,8 @@ typedef unsigned long long ulong64;
#endif #endif
struct IntPoint { struct IntPoint
{
cInt X; cInt X;
cInt Y; cInt Y;
#ifdef use_xyz #ifdef use_xyz
...@@ -94,10 +112,12 @@ struct IntPoint { ...@@ -94,10 +112,12 @@ struct IntPoint {
IntPoint(cInt x = 0, cInt y = 0) : X(x), Y(y){}; IntPoint(cInt x = 0, cInt y = 0) : X(x), Y(y){};
#endif #endif
friend inline bool operator==(const IntPoint &a, const IntPoint &b) { friend inline bool operator==(const IntPoint& a, const IntPoint& b)
{
return a.X == b.X && a.Y == b.Y; return a.X == b.X && a.Y == b.Y;
} }
friend inline bool operator!=(const IntPoint &a, const IntPoint &b) { friend inline bool operator!=(const IntPoint& a, const IntPoint& b)
{
return a.X != b.X || a.Y != b.Y; return a.X != b.X || a.Y != b.Y;
} }
}; };
...@@ -106,20 +126,23 @@ struct IntPoint { ...@@ -106,20 +126,23 @@ struct IntPoint {
typedef std::vector<IntPoint> Path; typedef std::vector<IntPoint> Path;
typedef std::vector<Path> Paths; typedef std::vector<Path> Paths;
inline Path &operator<<(Path &poly, const IntPoint &p) { inline Path& operator<<(Path& poly, const IntPoint& p)
{
poly.push_back(p); poly.push_back(p);
return poly; return poly;
} }
inline Paths &operator<<(Paths &polys, const Path &p) { inline Paths& operator<<(Paths& polys, const Path& p)
{
polys.push_back(p); polys.push_back(p);
return polys; return polys;
} }
std::ostream &operator<<(std::ostream &s, const IntPoint &p); std::ostream& operator<<(std::ostream& s, const IntPoint& p);
std::ostream &operator<<(std::ostream &s, const Path &p); std::ostream& operator<<(std::ostream& s, const Path& p);
std::ostream &operator<<(std::ostream &s, const Paths &p); std::ostream& operator<<(std::ostream& s, const Paths& p);
struct DoublePoint { struct DoublePoint
{
double X; double X;
double Y; double Y;
DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {} DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {}
...@@ -128,17 +151,24 @@ struct DoublePoint { ...@@ -128,17 +151,24 @@ struct DoublePoint {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#ifdef use_xyz #ifdef use_xyz
typedef void (*ZFillCallback)(IntPoint &e1bot, IntPoint &e1top, IntPoint &e2bot, typedef void (*ZFillCallback)(
IntPoint &e2top, IntPoint &pt); IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
#endif #endif
enum InitOptions { enum InitOptions
{
ioReverseSolution = 1, ioReverseSolution = 1,
ioStrictlySimple = 2, ioStrictlySimple = 2,
ioPreserveCollinear = 4 ioPreserveCollinear = 4
}; };
enum JoinType { jtSquare, jtRound, jtMiter }; enum JoinType
enum EndType { {
jtSquare,
jtRound,
jtMiter
};
enum EndType
{
etClosedPolygon, etClosedPolygon,
etClosedLine, etClosedLine,
etOpenButt, etOpenButt,
...@@ -147,75 +177,73 @@ enum EndType { ...@@ -147,75 +177,73 @@ enum EndType {
}; };
class PolyNode; class PolyNode;
typedef std::vector<PolyNode *> PolyNodes; typedef std::vector<PolyNode*> PolyNodes;
class PolyNode { class PolyNode
public: {
public:
PolyNode(); PolyNode();
virtual ~PolyNode(){}; virtual ~PolyNode(){};
Path Contour; Path Contour;
PolyNodes Childs; PolyNodes Childs;
PolyNode *Parent; PolyNode* Parent;
PolyNode *GetNext() const; PolyNode* GetNext() const;
bool IsHole() const; bool IsHole() const;
bool IsOpen() const; bool IsOpen() const;
int ChildCount() const; int ChildCount() const;
private: private:
// PolyNode& operator =(PolyNode& other); // PolyNode& operator =(PolyNode& other);
unsigned Index; // node index in Parent.Childs unsigned Index; // node index in Parent.Childs
bool m_IsOpen; bool m_IsOpen;
JoinType m_jointype; JoinType m_jointype;
EndType m_endtype; EndType m_endtype;
PolyNode *GetNextSiblingUp() const; PolyNode* GetNextSiblingUp() const;
void AddChild(PolyNode &child); void AddChild(PolyNode& child);
friend class Clipper; // to access Index friend class Clipper; // to access Index
friend class ClipperOffset; friend class ClipperOffset;
}; };
class PolyTree : public PolyNode { class PolyTree : public PolyNode
public: {
public:
~PolyTree() { Clear(); }; ~PolyTree() { Clear(); };
PolyNode *GetFirst() const; PolyNode* GetFirst() const;
void Clear(); void Clear();
int Total() const; int Total() const;
private: private:
// PolyTree& operator =(PolyTree& other); // PolyTree& operator =(PolyTree& other);
PolyNodes AllNodes; PolyNodes AllNodes;
friend class Clipper; // to access AllNodes friend class Clipper; // to access AllNodes
}; };
bool Orientation(const Path &poly); bool Orientation(const Path& poly);
double Area(const Path &poly); double Area(const Path& poly);
int PointInPolygon(const IntPoint &pt, const Path &path); int PointInPolygon(const IntPoint& pt, const Path& path);
void SimplifyPolygon(const Path &in_poly, Paths &out_polys, void SimplifyPolygon(const Path& in_poly, Paths& out_polys, PolyFillType fillType = pftEvenOdd);
PolyFillType fillType = pftEvenOdd); void SimplifyPolygons(const Paths& in_polys, Paths& out_polys, PolyFillType fillType = pftEvenOdd);
void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, void SimplifyPolygons(Paths& polys, PolyFillType fillType = pftEvenOdd);
PolyFillType fillType = pftEvenOdd);
void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
void CleanPolygon(const Path &in_poly, Path &out_poly, double distance = 1.415); void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415);
void CleanPolygon(Path &poly, double distance = 1.415); void CleanPolygon(Path& poly, double distance = 1.415);
void CleanPolygons(const Paths &in_polys, Paths &out_polys, void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
double distance = 1.415); void CleanPolygons(Paths& polys, double distance = 1.415);
void CleanPolygons(Paths &polys, double distance = 1.415);
void MinkowskiSum(const Path &pattern, const Path &path, Paths &solution, void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed);
bool pathIsClosed); void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed);
void MinkowskiSum(const Path &pattern, const Paths &paths, Paths &solution, void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution);
bool pathIsClosed);
void MinkowskiDiff(const Path &poly1, const Path &poly2, Paths &solution);
void PolyTreeToPaths(const PolyTree &polytree, Paths &paths); void PolyTreeToPaths(const PolyTree& polytree, Paths& paths);
void ClosedPathsFromPolyTree(const PolyTree &polytree, Paths &paths); void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
void OpenPathsFromPolyTree(PolyTree &polytree, Paths &paths); void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths);
void ReversePath(Path &p); void ReversePath(Path& p);
void ReversePaths(Paths &p); void ReversePaths(Paths& p);
struct IntRect { struct IntRect
{
cInt left; cInt left;
cInt top; cInt top;
cInt right; cInt right;
...@@ -223,7 +251,11 @@ struct IntRect { ...@@ -223,7 +251,11 @@ struct IntRect {
}; };
// enums that are used internally ... // enums that are used internally ...
enum EdgeSide { esLeft = 1, esRight = 2 }; enum EdgeSide
{
esLeft = 1,
esRight = 2
};
// forward declarations (for stuff used internally) ... // forward declarations (for stuff used internally) ...
struct TEdge; struct TEdge;
...@@ -233,42 +265,43 @@ struct OutPt; ...@@ -233,42 +265,43 @@ struct OutPt;
struct OutRec; struct OutRec;
struct Join; struct Join;
typedef std::vector<OutRec *> PolyOutList; typedef std::vector<OutRec*> PolyOutList;
typedef std::vector<TEdge *> EdgeList; typedef std::vector<TEdge*> EdgeList;
typedef std::vector<Join *> JoinList; typedef std::vector<Join*> JoinList;
typedef std::vector<IntersectNode *> IntersectList; typedef std::vector<IntersectNode*> IntersectList;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// ClipperBase is the ancestor to the Clipper class. It should not be // ClipperBase is the ancestor to the Clipper class. It should not be
// instantiated directly. This class simply abstracts the conversion of sets of // instantiated directly. This class simply abstracts the conversion of sets of
// polygon coordinates into edge objects that are stored in a LocalMinima list. // polygon coordinates into edge objects that are stored in a LocalMinima list.
class ClipperBase { class ClipperBase
public: {
public:
ClipperBase(); ClipperBase();
virtual ~ClipperBase(); virtual ~ClipperBase();
virtual bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed); virtual bool AddPath(const Path& pg, PolyType PolyTyp, bool Closed);
bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed); bool AddPaths(const Paths& ppg, PolyType PolyTyp, bool Closed);
virtual void Clear(); virtual void Clear();
IntRect GetBounds(); IntRect GetBounds();
bool PreserveCollinear() { return m_PreserveCollinear; }; bool PreserveCollinear() { return m_PreserveCollinear; };
void PreserveCollinear(bool value) { m_PreserveCollinear = value; }; void PreserveCollinear(bool value) { m_PreserveCollinear = value; };
protected: protected:
void DisposeLocalMinimaList(); void DisposeLocalMinimaList();
TEdge *AddBoundsToLML(TEdge *e, bool IsClosed); TEdge* AddBoundsToLML(TEdge* e, bool IsClosed);
virtual void Reset(); virtual void Reset();
TEdge *ProcessBound(TEdge *E, bool IsClockwise); TEdge* ProcessBound(TEdge* E, bool IsClockwise);
void InsertScanbeam(const cInt Y); void InsertScanbeam(const cInt Y);
bool PopScanbeam(cInt &Y); bool PopScanbeam(cInt& Y);
bool LocalMinimaPending(); bool LocalMinimaPending();
bool PopLocalMinima(cInt Y, const LocalMinimum *&locMin); bool PopLocalMinima(cInt Y, const LocalMinimum*& locMin);
OutRec *CreateOutRec(); OutRec* CreateOutRec();
void DisposeAllOutRecs(); void DisposeAllOutRecs();
void DisposeOutRec(PolyOutList::size_type index); void DisposeOutRec(PolyOutList::size_type index);
void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2); void SwapPositionsInAEL(TEdge* edge1, TEdge* edge2);
void DeleteFromAEL(TEdge *e); void DeleteFromAEL(TEdge* e);
void UpdateEdgeIntoAEL(TEdge *&e); void UpdateEdgeIntoAEL(TEdge*& e);
typedef std::vector<LocalMinimum> MinimaList; typedef std::vector<LocalMinimum> MinimaList;
MinimaList::iterator m_CurrentLM; MinimaList::iterator m_CurrentLM;
...@@ -279,23 +312,26 @@ protected: ...@@ -279,23 +312,26 @@ protected:
bool m_PreserveCollinear; bool m_PreserveCollinear;
bool m_HasOpenPaths; bool m_HasOpenPaths;
PolyOutList m_PolyOuts; PolyOutList m_PolyOuts;
TEdge *m_ActiveEdges; TEdge* m_ActiveEdges;
typedef std::priority_queue<cInt> ScanbeamList; typedef std::priority_queue<cInt> ScanbeamList;
ScanbeamList m_Scanbeam; ScanbeamList m_Scanbeam;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
class Clipper : public virtual ClipperBase { class Clipper : public virtual ClipperBase
public: {
public:
Clipper(int initOptions = 0); Clipper(int initOptions = 0);
bool Execute(ClipType clipType, Paths &solution, bool Execute(ClipType clipType, Paths& solution, PolyFillType fillType = pftEvenOdd);
PolyFillType fillType = pftEvenOdd); bool Execute(ClipType clipType,
bool Execute(ClipType clipType, Paths &solution, PolyFillType subjFillType, Paths& solution,
PolyFillType subjFillType,
PolyFillType clipFillType); PolyFillType clipFillType);
bool Execute(ClipType clipType, PolyTree &polytree, bool Execute(ClipType clipType, PolyTree& polytree, PolyFillType fillType = pftEvenOdd);
PolyFillType fillType = pftEvenOdd); bool Execute(ClipType clipType,
bool Execute(ClipType clipType, PolyTree &polytree, PolyFillType subjFillType, PolyTree& polytree,
PolyFillType subjFillType,
PolyFillType clipFillType); PolyFillType clipFillType);
bool ReverseSolution() { return m_ReverseOutput; }; bool ReverseSolution() { return m_ReverseOutput; };
void ReverseSolution(bool value) { m_ReverseOutput = value; }; void ReverseSolution(bool value) { m_ReverseOutput = value; };
...@@ -306,17 +342,17 @@ public: ...@@ -306,17 +342,17 @@ public:
#ifdef use_xyz #ifdef use_xyz
void ZFillFunction(ZFillCallback zFillFunc); void ZFillFunction(ZFillCallback zFillFunc);
#endif #endif
protected: protected:
virtual bool ExecuteInternal(); virtual bool ExecuteInternal();
private: private:
JoinList m_Joins; JoinList m_Joins;
JoinList m_GhostJoins; JoinList m_GhostJoins;
IntersectList m_IntersectList; IntersectList m_IntersectList;
ClipType m_ClipType; ClipType m_ClipType;
typedef std::list<cInt> MaximaList; typedef std::list<cInt> MaximaList;
MaximaList m_Maxima; MaximaList m_Maxima;
TEdge *m_SortedEdges; TEdge* m_SortedEdges;
bool m_ExecuteLocked; bool m_ExecuteLocked;
PolyFillType m_ClipFillType; PolyFillType m_ClipFillType;
PolyFillType m_SubjFillType; PolyFillType m_SubjFillType;
...@@ -326,71 +362,72 @@ private: ...@@ -326,71 +362,72 @@ private:
#ifdef use_xyz #ifdef use_xyz
ZFillCallback m_ZFill; // custom callback ZFillCallback m_ZFill; // custom callback
#endif #endif
void SetWindingCount(TEdge &edge); void SetWindingCount(TEdge& edge);
bool IsEvenOddFillType(const TEdge &edge) const; bool IsEvenOddFillType(const TEdge& edge) const;
bool IsEvenOddAltFillType(const TEdge &edge) const; bool IsEvenOddAltFillType(const TEdge& edge) const;
void InsertLocalMinimaIntoAEL(const cInt botY); void InsertLocalMinimaIntoAEL(const cInt botY);
void InsertEdgeIntoAEL(TEdge *edge, TEdge *startEdge); void InsertEdgeIntoAEL(TEdge* edge, TEdge* startEdge);
void AddEdgeToSEL(TEdge *edge); void AddEdgeToSEL(TEdge* edge);
bool PopEdgeFromSEL(TEdge *&edge); bool PopEdgeFromSEL(TEdge*& edge);
void CopyAELToSEL(); void CopyAELToSEL();
void DeleteFromSEL(TEdge *e); void DeleteFromSEL(TEdge* e);
void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2); void SwapPositionsInSEL(TEdge* edge1, TEdge* edge2);
bool IsContributing(const TEdge &edge) const; bool IsContributing(const TEdge& edge) const;
bool IsTopHorz(const cInt XPos); bool IsTopHorz(const cInt XPos);
void DoMaxima(TEdge *e); void DoMaxima(TEdge* e);
void ProcessHorizontals(); void ProcessHorizontals();
void ProcessHorizontal(TEdge *horzEdge); void ProcessHorizontal(TEdge* horzEdge);
void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); void AddLocalMaxPoly(TEdge* e1, TEdge* e2, const IntPoint& pt);
OutPt *AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); OutPt* AddLocalMinPoly(TEdge* e1, TEdge* e2, const IntPoint& pt);
OutRec *GetOutRec(int idx); OutRec* GetOutRec(int idx);
void AppendPolygon(TEdge *e1, TEdge *e2); void AppendPolygon(TEdge* e1, TEdge* e2);
void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt); void IntersectEdges(TEdge* e1, TEdge* e2, IntPoint& pt);
OutPt *AddOutPt(TEdge *e, const IntPoint &pt); OutPt* AddOutPt(TEdge* e, const IntPoint& pt);
OutPt *GetLastOutPt(TEdge *e); OutPt* GetLastOutPt(TEdge* e);
bool ProcessIntersections(const cInt topY); bool ProcessIntersections(const cInt topY);
void BuildIntersectList(const cInt topY); void BuildIntersectList(const cInt topY);
void ProcessIntersectList(); void ProcessIntersectList();
void ProcessEdgesAtTopOfScanbeam(const cInt topY); void ProcessEdgesAtTopOfScanbeam(const cInt topY);
void BuildResult(Paths &polys); void BuildResult(Paths& polys);
void BuildResult2(PolyTree &polytree); void BuildResult2(PolyTree& polytree);
void SetHoleState(TEdge *e, OutRec *outrec); void SetHoleState(TEdge* e, OutRec* outrec);
void DisposeIntersectNodes(); void DisposeIntersectNodes();
bool FixupIntersectionOrder(); bool FixupIntersectionOrder();
void FixupOutPolygon(OutRec &outrec); void FixupOutPolygon(OutRec& outrec);
void FixupOutPolyline(OutRec &outrec); void FixupOutPolyline(OutRec& outrec);
bool IsHole(TEdge *e); bool IsHole(TEdge* e);
bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl); bool FindOwnerFromSplitRecs(OutRec& outRec, OutRec*& currOrfl);
void FixHoleLinkage(OutRec &outrec); void FixHoleLinkage(OutRec& outrec);
void AddJoin(OutPt *op1, OutPt *op2, const IntPoint offPt); void AddJoin(OutPt* op1, OutPt* op2, const IntPoint offPt);
void ClearJoins(); void ClearJoins();
void ClearGhostJoins(); void ClearGhostJoins();
void AddGhostJoin(OutPt *op, const IntPoint offPt); void AddGhostJoin(OutPt* op, const IntPoint offPt);
bool JoinPoints(Join *j, OutRec *outRec1, OutRec *outRec2); bool JoinPoints(Join* j, OutRec* outRec1, OutRec* outRec2);
void JoinCommonEdges(); void JoinCommonEdges();
void DoSimplePolygons(); void DoSimplePolygons();
void FixupFirstLefts1(OutRec *OldOutRec, OutRec *NewOutRec); void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec);
void FixupFirstLefts2(OutRec *InnerOutRec, OutRec *OuterOutRec); void FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec);
void FixupFirstLefts3(OutRec *OldOutRec, OutRec *NewOutRec); void FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec);
#ifdef use_xyz #ifdef use_xyz
void SetZ(IntPoint &pt, TEdge &e1, TEdge &e2); void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
#endif #endif
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
class ClipperOffset { class ClipperOffset
public: {
public:
ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25); ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
~ClipperOffset(); ~ClipperOffset();
void AddPath(const Path &path, JoinType joinType, EndType endType); void AddPath(const Path& path, JoinType joinType, EndType endType);
void AddPaths(const Paths &paths, JoinType joinType, EndType endType); void AddPaths(const Paths& paths, JoinType joinType, EndType endType);
void Execute(Paths &solution, double delta); void Execute(Paths& solution, double delta);
void Execute(PolyTree &solution, double delta); void Execute(PolyTree& solution, double delta);
void Clear(); void Clear();
double MiterLimit; double MiterLimit;
double ArcTolerance; double ArcTolerance;
private: private:
Paths m_destPolys; Paths m_destPolys;
Path m_srcPoly; Path m_srcPoly;
Path m_destPoly; Path m_destPoly;
...@@ -402,24 +439,25 @@ private: ...@@ -402,24 +439,25 @@ private:
void FixOrientations(); void FixOrientations();
void DoOffset(double delta); void DoOffset(double delta);
void OffsetPoint(int j, int &k, JoinType jointype); void OffsetPoint(int j, int& k, JoinType jointype);
void DoSquare(int j, int k); void DoSquare(int j, int k);
void DoMiter(int j, int k, double r); void DoMiter(int j, int k, double r);
void DoRound(int j, int k); void DoRound(int j, int k);
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
class clipperException : public std::exception { class clipperException : public std::exception
public: {
clipperException(const char *description) : m_descr(description) {} public:
clipperException(const char* description) : m_descr(description) {}
virtual ~clipperException() throw() {} virtual ~clipperException() throw() {}
virtual const char *what() const throw() { return m_descr.c_str(); } virtual const char* what() const throw() { return m_descr.c_str(); }
private: private:
std::string m_descr; std::string m_descr;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
} // ClipperLib namespace } // namespace ClipperLib
#endif // clipper_hpp #endif // clipper_hpp
Src/PaddleOCR/utility.cpp
View file @ 2475c919
...@@ -25,71 +25,81 @@ ...@@ -25,71 +25,81 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
namespace migraphxSamples { namespace migraphxSamples
{
std::vector<std::string> Utility::ReadDict(const std::string &path) { std::vector<std::string> Utility::ReadDict(const std::string& path)
{
std::ifstream in(path); std::ifstream in(path);
std::string line; std::string line;
std::vector<std::string> m_vec; std::vector<std::string> m_vec;
if (in) { if(in)
while (getline(in, line)) { {
while(getline(in, line))
{
m_vec.push_back(line); m_vec.push_back(line);
} }
} else { }
std::cout << "no such label file: " << path << ", exit the program..." else
<< std::endl; {
std::cout << "no such label file: " << path << ", exit the program..." << std::endl;
exit(1); exit(1);
} }
return m_vec; return m_vec;
} }
void Utility::VisualizeBboxes(const cv::Mat &srcimg, void Utility::VisualizeBboxes(const cv::Mat& srcimg,
const std::vector<OCRPredictResult> &ocr_result, const std::vector<OCRPredictResult>& ocr_result,
const std::string &save_path) { const std::string& save_path)
{
cv::Mat img_vis; cv::Mat img_vis;
srcimg.copyTo(img_vis); srcimg.copyTo(img_vis);
for (int n = 0; n < ocr_result.size(); n++) { for(int n = 0; n < ocr_result.size(); n++)
{
cv::Point rook_points[4]; cv::Point rook_points[4];
for (int m = 0; m < ocr_result[n].box.size(); m++) { for(int m = 0; m < ocr_result[n].box.size(); m++)
rook_points[m] = {
cv::Point(int(ocr_result[n].box[m][0]), int(ocr_result[n].box[m][1])); rook_points[m] = cv::Point(int(ocr_result[n].box[m][0]), int(ocr_result[n].box[m][1]));
} }
const cv::Point *ppt[1] = {rook_points}; const cv::Point* ppt[1] = {rook_points};
int npt[] = {4}; int npt[] = {4};
cv::polylines(img_vis, ppt, npt, 1, 1, CV_RGB(0, 255, 0), 2, 8, 0); cv::polylines(img_vis, ppt, npt, 1, 1, CV_RGB(0, 255, 0), 2, 8, 0);
} }
cv::imwrite(save_path, img_vis); cv::imwrite(save_path, img_vis);
std::cout << "The detection visualized image saved in " + save_path std::cout << "The detection visualized image saved in " + save_path << std::endl;
<< std::endl;
} }
void Utility::VisualizeBboxes(const cv::Mat &srcimg, void Utility::VisualizeBboxes(const cv::Mat& srcimg,
const StructurePredictResult &structure_result, const StructurePredictResult& structure_result,
const std::string &save_path) { const std::string& save_path)
{
cv::Mat img_vis; cv::Mat img_vis;
srcimg.copyTo(img_vis); srcimg.copyTo(img_vis);
img_vis = crop_image(img_vis, structure_result.box); img_vis = crop_image(img_vis, structure_result.box);
for (int n = 0; n < structure_result.cell_box.size(); n++) { for(int n = 0; n < structure_result.cell_box.size(); n++)
if (structure_result.cell_box[n].size() == 8) { {
if(structure_result.cell_box[n].size() == 8)
{
cv::Point rook_points[4]; cv::Point rook_points[4];
for (int m = 0; m < structure_result.cell_box[n].size(); m += 2) { for(int m = 0; m < structure_result.cell_box[n].size(); m += 2)
rook_points[m / 2] = {
cv::Point(int(structure_result.cell_box[n][m]), rook_points[m / 2] = cv::Point(int(structure_result.cell_box[n][m]),
int(structure_result.cell_box[n][m + 1])); int(structure_result.cell_box[n][m + 1]));
} }
const cv::Point *ppt[1] = {rook_points}; const cv::Point* ppt[1] = {rook_points};
int npt[] = {4}; int npt[] = {4};
cv::polylines(img_vis, ppt, npt, 1, 1, CV_RGB(0, 255, 0), 2, 8, 0); cv::polylines(img_vis, ppt, npt, 1, 1, CV_RGB(0, 255, 0), 2, 8, 0);
} else if (structure_result.cell_box[n].size() == 4) { }
else if(structure_result.cell_box[n].size() == 4)
{
cv::Point rook_points[2]; cv::Point rook_points[2];
rook_points[0] = cv::Point(int(structure_result.cell_box[n][0]), rook_points[0] = cv::Point(int(structure_result.cell_box[n][0]),
int(structure_result.cell_box[n][1])); int(structure_result.cell_box[n][1]));
rook_points[1] = cv::Point(int(structure_result.cell_box[n][2]), rook_points[1] = cv::Point(int(structure_result.cell_box[n][2]),
int(structure_result.cell_box[n][3])); int(structure_result.cell_box[n][3]));
cv::rectangle(img_vis, rook_points[0], rook_points[1], CV_RGB(0, 255, 0), cv::rectangle(img_vis, rook_points[0], rook_points[1], CV_RGB(0, 255, 0), 2, 8, 0);
2, 8, 0);
} }
} }
...@@ -98,40 +108,44 @@ void Utility::VisualizeBboxes(const cv::Mat &srcimg, ...@@ -98,40 +108,44 @@ void Utility::VisualizeBboxes(const cv::Mat &srcimg,
} }
// list all files under a directory // list all files under a directory
void Utility::GetAllFiles(const char *dir_name, void Utility::GetAllFiles(const char* dir_name, std::vector<std::string>& all_inputs)
std::vector<std::string> &all_inputs) { {
if (NULL == dir_name) { if(NULL == dir_name)
{
std::cout << " dir_name is null ! " << std::endl; std::cout << " dir_name is null ! " << std::endl;
return; return;
} }
struct stat s; struct stat s;
stat(dir_name, &s); stat(dir_name, &s);
if (!S_ISDIR(s.st_mode)) { if(!S_ISDIR(s.st_mode))
{
std::cout << "dir_name is not a valid directory !" << std::endl; std::cout << "dir_name is not a valid directory !" << std::endl;
all_inputs.push_back(dir_name); all_inputs.push_back(dir_name);
return; return;
} else { }
struct dirent *filename; // return value for readdir() else
DIR *dir; // return value for opendir() {
struct dirent* filename; // return value for readdir()
DIR* dir; // return value for opendir()
dir = opendir(dir_name); dir = opendir(dir_name);
if (NULL == dir) { if(NULL == dir)
{
std::cout << "Can not open dir " << dir_name << std::endl; std::cout << "Can not open dir " << dir_name << std::endl;
return; return;
} }
std::cout << "Successfully opened the dir !" << std::endl; std::cout << "Successfully opened the dir !" << std::endl;
while ((filename = readdir(dir)) != NULL) { while((filename = readdir(dir)) != NULL)
if (strcmp(filename->d_name, ".") == 0 || {
strcmp(filename->d_name, "..") == 0) if(strcmp(filename->d_name, ".") == 0 || strcmp(filename->d_name, "..") == 0)
continue; continue;
// img_dir + std::string("/") + all_inputs[0]; // img_dir + std::string("/") + all_inputs[0];
all_inputs.push_back(dir_name + std::string("/") + all_inputs.push_back(dir_name + std::string("/") + std::string(filename->d_name));
std::string(filename->d_name));
} }
} }
} }
cv::Mat Utility::GetRotateCropImage(const cv::Mat &srcimage, cv::Mat Utility::GetRotateCropImage(const cv::Mat& srcimage, std::vector<std::vector<int>> box)
std::vector<std::vector<int>> box) { {
cv::Mat image; cv::Mat image;
srcimage.copyTo(image); srcimage.copyTo(image);
std::vector<std::vector<int>> points = box; std::vector<std::vector<int>> points = box;
...@@ -146,15 +160,16 @@ cv::Mat Utility::GetRotateCropImage(const cv::Mat &srcimage, ...@@ -146,15 +160,16 @@ cv::Mat Utility::GetRotateCropImage(const cv::Mat &srcimage,
cv::Mat img_crop; cv::Mat img_crop;
image(cv::Rect(left, top, right - left, bottom - top)).copyTo(img_crop); image(cv::Rect(left, top, right - left, bottom - top)).copyTo(img_crop);
for (int i = 0; i < points.size(); i++) { for(int i = 0; i < points.size(); i++)
{
points[i][0] -= left; points[i][0] -= left;
points[i][1] -= top; points[i][1] -= top;
} }
int img_crop_width = int(sqrt(pow(points[0][0] - points[1][0], 2) + int img_crop_width =
pow(points[0][1] - points[1][1], 2))); int(sqrt(pow(points[0][0] - points[1][0], 2) + pow(points[0][1] - points[1][1], 2)));
int img_crop_height = int(sqrt(pow(points[0][0] - points[3][0], 2) + int img_crop_height =
pow(points[0][1] - points[3][1], 2))); int(sqrt(pow(points[0][0] - points[3][0], 2) + pow(points[0][1] - points[3][1], 2)));
cv::Point2f pts_std[4]; cv::Point2f pts_std[4];
pts_std[0] = cv::Point2f(0., 0.); pts_std[0] = cv::Point2f(0., 0.);
...@@ -171,59 +186,69 @@ cv::Mat Utility::GetRotateCropImage(const cv::Mat &srcimage, ...@@ -171,59 +186,69 @@ cv::Mat Utility::GetRotateCropImage(const cv::Mat &srcimage,
cv::Mat M = cv::getPerspectiveTransform(pointsf, pts_std); cv::Mat M = cv::getPerspectiveTransform(pointsf, pts_std);
cv::Mat dst_img; cv::Mat dst_img;
cv::warpPerspective(img_crop, dst_img, M, cv::warpPerspective(
cv::Size(img_crop_width, img_crop_height), img_crop, dst_img, M, cv::Size(img_crop_width, img_crop_height), cv::BORDER_REPLICATE);
cv::BORDER_REPLICATE);
if (float(dst_img.rows) >= float(dst_img.cols) * 1.5) { if(float(dst_img.rows) >= float(dst_img.cols) * 1.5)
{
cv::Mat srcCopy = cv::Mat(dst_img.rows, dst_img.cols, dst_img.depth()); cv::Mat srcCopy = cv::Mat(dst_img.rows, dst_img.cols, dst_img.depth());
cv::transpose(dst_img, srcCopy); cv::transpose(dst_img, srcCopy);
cv::flip(srcCopy, srcCopy, 0); cv::flip(srcCopy, srcCopy, 0);
return srcCopy; return srcCopy;
} else { }
else
{
return dst_img; return dst_img;
} }
} }
std::vector<int> Utility::argsort(const std::vector<float> &array) { std::vector<int> Utility::argsort(const std::vector<float>& array)
{
const int array_len(array.size()); const int array_len(array.size());
std::vector<int> array_index(array_len, 0); std::vector<int> array_index(array_len, 0);
for (int i = 0; i < array_len; ++i) for(int i = 0; i < array_len; ++i)
array_index[i] = i; array_index[i] = i;
std::sort( std::sort(array_index.begin(), array_index.end(), [&array](int pos1, int pos2) {
array_index.begin(), array_index.end(), return (array[pos1] < array[pos2]);
[&array](int pos1, int pos2) { return (array[pos1] < array[pos2]); }); });
return array_index; return array_index;
} }
std::string Utility::basename(const std::string &filename) { std::string Utility::basename(const std::string& filename)
if (filename.empty()) { {
if(filename.empty())
{
return ""; return "";
} }
auto len = filename.length(); auto len = filename.length();
auto index = filename.find_last_of("/\\"); auto index = filename.find_last_of("/\\");
if (index == std::string::npos) { if(index == std::string::npos)
{
return filename; return filename;
} }
if (index + 1 >= len) { if(index + 1 >= len)
{
len--; len--;
index = filename.substr(0, len).find_last_of("/\\"); index = filename.substr(0, len).find_last_of("/\\");
if (len == 0) { if(len == 0)
{
return filename; return filename;
} }
if (index == 0) { if(index == 0)
{
return filename.substr(1, len - 1); return filename.substr(1, len - 1);
} }
if (index == std::string::npos) { if(index == std::string::npos)
{
return filename.substr(0, len); return filename.substr(0, len);
} }
...@@ -233,7 +258,8 @@ std::string Utility::basename(const std::string &filename) { ...@@ -233,7 +258,8 @@ std::string Utility::basename(const std::string &filename) {
return filename.substr(index + 1, len - index); return filename.substr(index + 1, len - index);
} }
bool Utility::PathExists(const std::string &path) { bool Utility::PathExists(const std::string& path)
{
#ifdef _WIN32 #ifdef _WIN32
struct _stat buffer; struct _stat buffer;
return (_stat(path.c_str(), &buffer) == 0); return (_stat(path.c_str(), &buffer) == 0);
...@@ -243,7 +269,8 @@ bool Utility::PathExists(const std::string &path) { ...@@ -243,7 +269,8 @@ bool Utility::PathExists(const std::string &path) {
#endif // !_WIN32 #endif // !_WIN32
} }
void Utility::CreateDir(const std::string &path) { void Utility::CreateDir(const std::string& path)
{
#ifdef _WIN32 #ifdef _WIN32
_mkdir(path.c_str()); _mkdir(path.c_str());
#else #else
...@@ -251,29 +278,36 @@ void Utility::CreateDir(const std::string &path) { ...@@ -251,29 +278,36 @@ void Utility::CreateDir(const std::string &path) {
#endif // !_WIN32 #endif // !_WIN32
} }
void Utility::print_result(const std::vector<OCRPredictResult> &ocr_result) { void Utility::print_result(const std::vector<OCRPredictResult>& ocr_result)
for (int i = 0; i < ocr_result.size(); i++) { {
for(int i = 0; i < ocr_result.size(); i++)
{
std::cout << i << "\t"; std::cout << i << "\t";
// det // det
std::vector<std::vector<int>> boxes = ocr_result[i].box; std::vector<std::vector<int>> boxes = ocr_result[i].box;
if (boxes.size() > 0) { if(boxes.size() > 0)
{
std::cout << "det boxes: ["; std::cout << "det boxes: [";
for (int n = 0; n < boxes.size(); n++) { for(int n = 0; n < boxes.size(); n++)
{
std::cout << '[' << boxes[n][0] << ',' << boxes[n][1] << "]"; std::cout << '[' << boxes[n][0] << ',' << boxes[n][1] << "]";
if (n != boxes.size() - 1) { if(n != boxes.size() - 1)
{
std::cout << ','; std::cout << ',';
} }
} }
std::cout << "] "; std::cout << "] ";
} }
// rec // rec
if (ocr_result[i].score != -1.0) { if(ocr_result[i].score != -1.0)
std::cout << "rec text: " << ocr_result[i].text {
<< " rec score: " << ocr_result[i].score << " "; std::cout << "rec text: " << ocr_result[i].text << " rec score: " << ocr_result[i].score
<< " ";
} }
// cls // cls
if (ocr_result[i].cls_label != -1) { if(ocr_result[i].cls_label != -1)
{
std::cout << "cls label: " << ocr_result[i].cls_label std::cout << "cls label: " << ocr_result[i].cls_label
<< " cls score: " << ocr_result[i].cls_score; << " cls score: " << ocr_result[i].cls_score;
} }
...@@ -281,7 +315,8 @@ void Utility::print_result(const std::vector<OCRPredictResult> &ocr_result) { ...@@ -281,7 +315,8 @@ void Utility::print_result(const std::vector<OCRPredictResult> &ocr_result) {
} }
} }
cv::Mat Utility::crop_image(cv::Mat &img, const std::vector<int> &box) { cv::Mat Utility::crop_image(cv::Mat& img, const std::vector<int>& box)
{
cv::Mat crop_im; cv::Mat crop_im;
int crop_x1 = std::max(0, box[0]); int crop_x1 = std::max(0, box[0]);
int crop_y1 = std::max(0, box[1]); int crop_y1 = std::max(0, box[1]);
...@@ -289,28 +324,31 @@ cv::Mat Utility::crop_image(cv::Mat &img, const std::vector<int> &box) { ...@@ -289,28 +324,31 @@ cv::Mat Utility::crop_image(cv::Mat &img, const std::vector<int> &box) {
int crop_y2 = std::min(img.rows - 1, box[3] - 1); int crop_y2 = std::min(img.rows - 1, box[3] - 1);
crop_im = cv::Mat::zeros(box[3] - box[1], box[2] - box[0], 16); crop_im = cv::Mat::zeros(box[3] - box[1], box[2] - box[0], 16);
cv::Mat crop_im_window = cv::Mat crop_im_window = crop_im(cv::Range(crop_y1 - box[1], crop_y2 + 1 - box[1]),
crop_im(cv::Range(crop_y1 - box[1], crop_y2 + 1 - box[1]),
cv::Range(crop_x1 - box[0], crop_x2 + 1 - box[0])); cv::Range(crop_x1 - box[0], crop_x2 + 1 - box[0]));
cv::Mat roi_img = cv::Mat roi_img = img(cv::Range(crop_y1, crop_y2 + 1), cv::Range(crop_x1, crop_x2 + 1));
img(cv::Range(crop_y1, crop_y2 + 1), cv::Range(crop_x1, crop_x2 + 1));
crop_im_window += roi_img; crop_im_window += roi_img;
return crop_im; return crop_im;
} }
cv::Mat Utility::crop_image(cv::Mat &img, const std::vector<float> &box) { cv::Mat Utility::crop_image(cv::Mat& img, const std::vector<float>& box)
std::vector<int> box_int = {(int)box[0], (int)box[1], (int)box[2], {
(int)box[3]}; std::vector<int> box_int = {(int)box[0], (int)box[1], (int)box[2], (int)box[3]};
return crop_image(img, box_int); return crop_image(img, box_int);
} }
void Utility::sorted_boxes(std::vector<OCRPredictResult> &ocr_result) { void Utility::sorted_boxes(std::vector<OCRPredictResult>& ocr_result)
{
std::sort(ocr_result.begin(), ocr_result.end(), Utility::comparison_box); std::sort(ocr_result.begin(), ocr_result.end(), Utility::comparison_box);
if (ocr_result.size() > 0) { if(ocr_result.size() > 0)
for (int i = 0; i < ocr_result.size() - 1; i++) { {
for (int j = i; j > 0; j--) { for(int i = 0; i < ocr_result.size() - 1; i++)
if (abs(ocr_result[j + 1].box[0][1] - ocr_result[j].box[0][1]) < 10 && {
(ocr_result[j + 1].box[0][0] < ocr_result[j].box[0][0])) { for(int j = i; j > 0; j--)
{
if(abs(ocr_result[j + 1].box[0][1] - ocr_result[j].box[0][1]) < 10 &&
(ocr_result[j + 1].box[0][0] < ocr_result[j].box[0][0]))
{
std::swap(ocr_result[i], ocr_result[i + 1]); std::swap(ocr_result[i], ocr_result[i + 1]);
} }
} }
...@@ -318,7 +356,8 @@ void Utility::sorted_boxes(std::vector<OCRPredictResult> &ocr_result) { ...@@ -318,7 +356,8 @@ void Utility::sorted_boxes(std::vector<OCRPredictResult> &ocr_result) {
} }
} }
std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<std::vector<int>> &box) { std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<std::vector<int>>& box)
{
int x_collect[4] = {box[0][0], box[1][0], box[2][0], box[3][0]}; int x_collect[4] = {box[0][0], box[1][0], box[2][0], box[3][0]};
int y_collect[4] = {box[0][1], box[1][1], box[2][1], box[3][1]}; int y_collect[4] = {box[0][1], box[1][1], box[2][1], box[3][1]};
int left = int(*std::min_element(x_collect, x_collect + 4)); int left = int(*std::min_element(x_collect, x_collect + 4));
...@@ -333,7 +372,8 @@ std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<std::vector<int>> &box) { ...@@ -333,7 +372,8 @@ std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<std::vector<int>> &box) {
return box1; return box1;
} }
std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<int> &box) { std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<int>& box)
{
int x_collect[4] = {box[0], box[2], box[4], box[6]}; int x_collect[4] = {box[0], box[2], box[4], box[6]};
int y_collect[4] = {box[1], box[3], box[5], box[7]}; int y_collect[4] = {box[1], box[3], box[5], box[7]};
int left = int(*std::min_element(x_collect, x_collect + 4)); int left = int(*std::min_element(x_collect, x_collect + 4));
...@@ -348,8 +388,10 @@ std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<int> &box) { ...@@ -348,8 +388,10 @@ std::vector<int> Utility::xyxyxyxy2xyxy(std::vector<int> &box) {
return box1; return box1;
} }
float Utility::fast_exp(float x) { float Utility::fast_exp(float x)
union { {
union
{
uint32_t i; uint32_t i;
float f; float f;
} v{}; } v{};
...@@ -357,26 +399,29 @@ float Utility::fast_exp(float x) { ...@@ -357,26 +399,29 @@ float Utility::fast_exp(float x) {
return v.f; return v.f;
} }
std::vector<float> std::vector<float> Utility::activation_function_softmax(std::vector<float>& src)
Utility::activation_function_softmax(std::vector<float> &src) { {
int length = src.size(); int length = src.size();
std::vector<float> dst; std::vector<float> dst;
dst.resize(length); dst.resize(length);
const float alpha = float(*std::max_element(&src[0], &src[0 + length])); const float alpha = float(*std::max_element(&src[0], &src[0 + length]));
float denominator{0}; float denominator{0};
for (int i = 0; i < length; ++i) { for(int i = 0; i < length; ++i)
{
dst[i] = fast_exp(src[i] - alpha); dst[i] = fast_exp(src[i] - alpha);
denominator += dst[i]; denominator += dst[i];
} }
for (int i = 0; i < length; ++i) { for(int i = 0; i < length; ++i)
{
dst[i] /= denominator; dst[i] /= denominator;
} }
return dst; return dst;
} }
float Utility::iou(std::vector<int> &box1, std::vector<int> &box2) { float Utility::iou(std::vector<int>& box1, std::vector<int>& box2)
{
int area1 = std::max(0, box1[2] - box1[0]) * std::max(0, box1[3] - box1[1]); int area1 = std::max(0, box1[2] - box1[0]) * std::max(0, box1[3] - box1[1]);
int area2 = std::max(0, box2[2] - box2[0]) * std::max(0, box2[3] - box2[1]); int area2 = std::max(0, box2[2] - box2[0]) * std::max(0, box2[3] - box2[1]);
...@@ -390,19 +435,21 @@ float Utility::iou(std::vector<int> &box1, std::vector<int> &box2) { ...@@ -390,19 +435,21 @@ float Utility::iou(std::vector<int> &box1, std::vector<int> &box2) {
int y2 = std::min(box1[3], box2[3]); int y2 = std::min(box1[3], box2[3]);
// judge if there is an intersect // judge if there is an intersect
if (y1 >= y2 || x1 >= x2) { if(y1 >= y2 || x1 >= x2)
{
return 0.0; return 0.0;
} else { }
else
{
int intersect = (x2 - x1) * (y2 - y1); int intersect = (x2 - x1) * (y2 - y1);
return intersect / (sum_area - intersect + 0.00000001); return intersect / (sum_area - intersect + 0.00000001);
} }
} }
float Utility::iou(std::vector<float> &box1, std::vector<float> &box2) { float Utility::iou(std::vector<float>& box1, std::vector<float>& box2)
float area1 = std::max((float)0.0, box1[2] - box1[0]) * {
std::max((float)0.0, box1[3] - box1[1]); float area1 = std::max((float)0.0, box1[2] - box1[0]) * std::max((float)0.0, box1[3] - box1[1]);
float area2 = std::max((float)0.0, box2[2] - box2[0]) * float area2 = std::max((float)0.0, box2[2] - box2[0]) * std::max((float)0.0, box2[3] - box2[1]);
std::max((float)0.0, box2[3] - box2[1]);
// computing the sum_area // computing the sum_area
float sum_area = area1 + area2; float sum_area = area1 + area2;
...@@ -414,9 +461,12 @@ float Utility::iou(std::vector<float> &box1, std::vector<float> &box2) { ...@@ -414,9 +461,12 @@ float Utility::iou(std::vector<float> &box1, std::vector<float> &box2) {
float y2 = std::min(box1[3], box2[3]); float y2 = std::min(box1[3], box2[3]);
// judge if there is an intersect // judge if there is an intersect
if (y1 >= y2 || x1 >= x2) { if(y1 >= y2 || x1 >= x2)
{
return 0.0; return 0.0;
} else { }
else
{
float intersect = (x2 - x1) * (y2 - y1); float intersect = (x2 - x1) * (y2 - y1);
return intersect / (sum_area - intersect + 0.00000001); return intersect / (sum_area - intersect + 0.00000001);
} }
......
Src/PaddleOCR/utility.h
View file @ 2475c919
...@@ -30,9 +30,11 @@ ...@@ -30,9 +30,11 @@
#include "opencv2/imgcodecs.hpp" #include "opencv2/imgcodecs.hpp"
#include "opencv2/imgproc.hpp" #include "opencv2/imgproc.hpp"
namespace migraphxSamples { namespace migraphxSamples
{
struct OCRPredictResult { struct OCRPredictResult
{
std::vector<std::vector<int>> box; std::vector<std::vector<int>> box;
std::string text; std::string text;
float score = -1.0; float score = -1.0;
...@@ -40,7 +42,8 @@ struct OCRPredictResult { ...@@ -40,7 +42,8 @@ struct OCRPredictResult {
int cls_label = -1; int cls_label = -1;
}; };
struct StructurePredictResult { struct StructurePredictResult
{
std::vector<float> box; std::vector<float> box;
std::vector<std::vector<int>> cell_box; std::vector<std::vector<int>> cell_box;
std::string type; std::string type;
...@@ -50,61 +53,65 @@ struct StructurePredictResult { ...@@ -50,61 +53,65 @@ struct StructurePredictResult {
float confidence; float confidence;
}; };
class Utility { class Utility
public: {
static std::vector<std::string> ReadDict(const std::string &path); public:
static std::vector<std::string> ReadDict(const std::string& path);
static void VisualizeBboxes(const cv::Mat &srcimg, static void VisualizeBboxes(const cv::Mat& srcimg,
const std::vector<OCRPredictResult> &ocr_result, const std::vector<OCRPredictResult>& ocr_result,
const std::string &save_path); const std::string& save_path);
static void VisualizeBboxes(const cv::Mat &srcimg, static void VisualizeBboxes(const cv::Mat& srcimg,
const StructurePredictResult &structure_result, const StructurePredictResult& structure_result,
const std::string &save_path); const std::string& save_path);
template <class ForwardIterator> template <class ForwardIterator>
inline static size_t argmax(ForwardIterator first, ForwardIterator last) { inline static size_t argmax(ForwardIterator first, ForwardIterator last)
{
return std::distance(first, std::max_element(first, last)); return std::distance(first, std::max_element(first, last));
} }
static void GetAllFiles(const char *dir_name, static void GetAllFiles(const char* dir_name, std::vector<std::string>& all_inputs);
std::vector<std::string> &all_inputs);
static cv::Mat GetRotateCropImage(const cv::Mat &srcimage, static cv::Mat GetRotateCropImage(const cv::Mat& srcimage, std::vector<std::vector<int>> box);
std::vector<std::vector<int>> box);
static std::vector<int> argsort(const std::vector<float> &array); static std::vector<int> argsort(const std::vector<float>& array);
static std::string basename(const std::string &filename); static std::string basename(const std::string& filename);
static bool PathExists(const std::string &path); static bool PathExists(const std::string& path);
static void CreateDir(const std::string &path); static void CreateDir(const std::string& path);
static void print_result(const std::vector<OCRPredictResult> &ocr_result); static void print_result(const std::vector<OCRPredictResult>& ocr_result);
static cv::Mat crop_image(cv::Mat &img, const std::vector<int> &area); static cv::Mat crop_image(cv::Mat& img, const std::vector<int>& area);
static cv::Mat crop_image(cv::Mat &img, const std::vector<float> &area); static cv::Mat crop_image(cv::Mat& img, const std::vector<float>& area);
static void sorted_boxes(std::vector<OCRPredictResult> &ocr_result); static void sorted_boxes(std::vector<OCRPredictResult>& ocr_result);
static std::vector<int> xyxyxyxy2xyxy(std::vector<std::vector<int>> &box); static std::vector<int> xyxyxyxy2xyxy(std::vector<std::vector<int>>& box);
static std::vector<int> xyxyxyxy2xyxy(std::vector<int> &box); static std::vector<int> xyxyxyxy2xyxy(std::vector<int>& box);
static float fast_exp(float x); static float fast_exp(float x);
static std::vector<float> static std::vector<float> activation_function_softmax(std::vector<float>& src);
activation_function_softmax(std::vector<float> &src); static float iou(std::vector<int>& box1, std::vector<int>& box2);
static float iou(std::vector<int> &box1, std::vector<int> &box2); static float iou(std::vector<float>& box1, std::vector<float>& box2);
static float iou(std::vector<float> &box1, std::vector<float> &box2);
private:
private: static bool comparison_box(const OCRPredictResult& result1, const OCRPredictResult& result2)
static bool comparison_box(const OCRPredictResult &result1, {
const OCRPredictResult &result2) { if(result1.box[0][1] < result2.box[0][1])
if (result1.box[0][1] < result2.box[0][1]) { {
return true; return true;
} else if (result1.box[0][1] == result2.box[0][1]) { }
else if(result1.box[0][1] == result2.box[0][1])
{
return result1.box[0][0] < result2.box[0][0]; return result1.box[0][0] < result2.box[0][0];
} else { }
else
{
return false; return false;
} }
} }
......
Src/Utility/CommonDefinition.h
View file @ 2475c919
...@@ -19,21 +19,21 @@ namespace migraphxSamples ...@@ -19,21 +19,21 @@ namespace migraphxSamples
typedef enum _ErrorCode typedef enum _ErrorCode
{ {
SUCCESS=0, // 0 SUCCESS = 0, // 0
MODEL_NOT_EXIST, // 模型不存在 MODEL_NOT_EXIST, // 模型不存在
CONFIG_FILE_NOT_EXIST, // 配置文件不存在 CONFIG_FILE_NOT_EXIST, // 配置文件不存在
FAIL_TO_LOAD_MODEL, // 加载模型失败 FAIL_TO_LOAD_MODEL, // 加载模型失败
FAIL_TO_OPEN_CONFIG_FILE, // 加载配置文件失败 FAIL_TO_OPEN_CONFIG_FILE, // 加载配置文件失败
IMAGE_ERROR, // 图像错误 IMAGE_ERROR, // 图像错误
}ErrorCode; } ErrorCode;
typedef struct _ResultOfPrediction typedef struct _ResultOfPrediction
{ {
float confidence; float confidence;
int label; int label;
_ResultOfPrediction():confidence(0.0f),label(0){} _ResultOfPrediction() : confidence(0.0f), label(0) {}
}ResultOfPrediction; } ResultOfPrediction;
typedef struct _ResultOfDetection typedef struct _ResultOfDetection
{ {
...@@ -43,15 +43,15 @@ typedef struct _ResultOfDetection ...@@ -43,15 +43,15 @@ typedef struct _ResultOfDetection
std::string className; std::string className;
bool exist; bool exist;
_ResultOfDetection():confidence(0.0f),classID(0),exist(true){} _ResultOfDetection() : confidence(0.0f), classID(0), exist(true) {}
}ResultOfDetection; } ResultOfDetection;
typedef struct _InitializationParameterOfDetector typedef struct _InitializationParameterOfDetector
{ {
std::string parentPath; std::string parentPath;
std::string configFilePath; std::string configFilePath;
}InitializationParameterOfDetector; } InitializationParameterOfDetector;
typedef struct _InitializationParameterOfDetector InitializationParameterOfClassifier; typedef struct _InitializationParameterOfDetector InitializationParameterOfClassifier;
typedef struct _InitializationParameterOfDetector InitializationParameterOfSuperresolution; typedef struct _InitializationParameterOfDetector InitializationParameterOfSuperresolution;
...@@ -61,7 +61,6 @@ typedef struct _InitializationParameterOfDetector InitializationParameterOfOcr; ...@@ -61,7 +61,6 @@ typedef struct _InitializationParameterOfDetector InitializationParameterOfOcr;
typedef struct _InitializationParameterOfDetector InitializationParameterOfDB; typedef struct _InitializationParameterOfDetector InitializationParameterOfDB;
typedef struct _InitializationParameterOfDetector InitializationParameterOfSVTR; typedef struct _InitializationParameterOfDetector InitializationParameterOfSVTR;
} } // namespace migraphxSamples
#endif #endif
Src/Utility/CommonUtility.cpp
View file @ 2475c919
...@@ -3,34 +3,37 @@ ...@@ -3,34 +3,37 @@
namespace migraphxSamples namespace migraphxSamples
{ {
bool CompareConfidence(const ResultOfDetection &L,const ResultOfDetection &R) bool CompareConfidence(const ResultOfDetection& L, const ResultOfDetection& R)
{ {
return L.confidence > R.confidence; return L.confidence > R.confidence;
} }
bool CompareArea(const ResultOfDetection &L,const ResultOfDetection &R) bool CompareArea(const ResultOfDetection& L, const ResultOfDetection& R)
{ {
return L.boundingBox.area() > R.boundingBox.area(); return L.boundingBox.area() > R.boundingBox.area();
} }
void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold) void NMS(std::vector<ResultOfDetection>& detections, float IOUThreshold)
{ {
// sort // sort
std::sort(detections.begin(), detections.end(), CompareConfidence); std::sort(detections.begin(), detections.end(), CompareConfidence);
for (int i = 0; i<detections.size(); ++i) for(int i = 0; i < detections.size(); ++i)
{ {
if (detections[i].exist) if(detections[i].exist)
{ {
for (int j = i + 1; j<detections.size(); ++j) for(int j = i + 1; j < detections.size(); ++j)
{ {
if (detections[j].exist) if(detections[j].exist)
{ {
// compute IOU // compute IOU
float intersectionArea = (detections[i].boundingBox & detections[j].boundingBox).area(); float intersectionArea =
float intersectionRate = intersectionArea / (detections[i].boundingBox.area() + detections[j].boundingBox.area() - intersectionArea); (detections[i].boundingBox & detections[j].boundingBox).area();
float intersectionRate =
intersectionArea / (detections[i].boundingBox.area() +
detections[j].boundingBox.area() - intersectionArea);
if (intersectionRate>IOUThreshold) if(intersectionRate > IOUThreshold)
{ {
detections[j].exist = false; detections[j].exist = false;
} }
...@@ -38,7 +41,6 @@ void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold) ...@@ -38,7 +41,6 @@ void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold)
} }
} }
} }
} }
} } // namespace migraphxSamples
Src/Utility/CommonUtility.h
View file @ 2475c919
...@@ -9,12 +9,12 @@ namespace migraphxSamples ...@@ -9,12 +9,12 @@ namespace migraphxSamples
{ {
// 排序规则: 按照置信度或者按照面积排序 // 排序规则: 按照置信度或者按照面积排序
bool CompareConfidence(const ResultOfDetection &L,const ResultOfDetection &R); bool CompareConfidence(const ResultOfDetection& L, const ResultOfDetection& R);
bool CompareArea(const ResultOfDetection &L,const ResultOfDetection &R); bool CompareArea(const ResultOfDetection& L, const ResultOfDetection& R);
// 非极大抑制 // 非极大抑制
void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold); void NMS(std::vector<ResultOfDetection>& detections, float IOUThreshold);
} } // namespace migraphxSamples
#endif #endif
Src/Utility/Filesystem.cpp
View file @ 2475c919
...@@ -28,32 +28,32 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -28,32 +28,32 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
{ {
std::string::size_type pos; std::string::size_type pos;
std::vector<std::string> result; std::vector<std::string> result;
str+=separator;//扩展字符串以方便操作 str += separator; // 扩展字符串以方便操作
int size=str.size(); int size = str.size();
for(int i=0; i<size; i++) for(int i = 0; i < size; i++)
{ {
pos=str.find(separator,i); pos = str.find(separator, i);
if(pos<size) if(pos < size)
{ {
std::string s=str.substr(i,pos-i); std::string s = str.substr(i, pos - i);
result.push_back(s); result.push_back(s);
i=pos+separator.size()-1; i = pos + separator.size() - 1;
} }
} }
return result; return result;
} }
#if defined _WIN32 || defined WINCE #if defined _WIN32 || defined WINCE
const char dir_separators[] = "/\\"; const char dir_separators[] = "/\\";
struct dirent struct dirent
{ {
const char* d_name; const char* d_name;
}; };
struct DIR struct DIR
{ {
#ifdef WINRT #ifdef WINRT
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
#else #else
...@@ -62,17 +62,17 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -62,17 +62,17 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
HANDLE handle; HANDLE handle;
dirent ent; dirent ent;
#ifdef WINRT #ifdef WINRT
DIR() { } DIR() {}
~DIR() ~DIR()
{ {
if (ent.d_name) if(ent.d_name)
delete[] ent.d_name; delete[] ent.d_name;
} }
#endif #endif
}; };
DIR* opendir(const char* path) DIR* opendir(const char* path)
{ {
DIR* dir = new DIR; DIR* dir = new DIR;
dir->ent.d_name = 0; dir->ent.d_name = 0;
#ifdef WINRT #ifdef WINRT
...@@ -80,27 +80,31 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -80,27 +80,31 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
wchar_t wfull_path[MAX_PATH]; wchar_t wfull_path[MAX_PATH];
size_t copied = mbstowcs(wfull_path, full_path.c_str(), MAX_PATH); size_t copied = mbstowcs(wfull_path, full_path.c_str(), MAX_PATH);
CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1)); CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
dir->handle = ::FindFirstFileExW(wfull_path, FindExInfoStandard, dir->handle = ::FindFirstFileExW(
&dir->data, FindExSearchNameMatch, NULL, 0); wfull_path, FindExInfoStandard, &dir->data, FindExSearchNameMatch, NULL, 0);
#else #else
dir->handle = ::FindFirstFileExA((string(path) + "\\*").c_str(), dir->handle = ::FindFirstFileExA((string(path) + "\\*").c_str(),
FindExInfoStandard, &dir->data, FindExSearchNameMatch, NULL, 0); FindExInfoStandard,
&dir->data,
FindExSearchNameMatch,
NULL,
0);
#endif #endif
if (dir->handle == INVALID_HANDLE_VALUE) if(dir->handle == INVALID_HANDLE_VALUE)
{ {
/*closedir will do all cleanup*/ /*closedir will do all cleanup*/
delete dir; delete dir;
return 0; return 0;
} }
return dir; return dir;
} }
dirent* readdir(DIR* dir) dirent* readdir(DIR* dir)
{ {
#ifdef WINRT #ifdef WINRT
if (dir->ent.d_name != 0) if(dir->ent.d_name != 0)
{ {
if (::FindNextFileW(dir->handle, &dir->data) != TRUE) if(::FindNextFileW(dir->handle, &dir->data) != TRUE)
return 0; return 0;
} }
size_t asize = wcstombs(NULL, dir->data.cFileName, 0); size_t asize = wcstombs(NULL, dir->data.cFileName, 0);
...@@ -110,33 +114,33 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -110,33 +114,33 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
wcstombs(aname, dir->data.cFileName, asize); wcstombs(aname, dir->data.cFileName, asize);
dir->ent.d_name = aname; dir->ent.d_name = aname;
#else #else
if (dir->ent.d_name != 0) if(dir->ent.d_name != 0)
{ {
if (::FindNextFileA(dir->handle, &dir->data) != TRUE) if(::FindNextFileA(dir->handle, &dir->data) != TRUE)
return 0; return 0;
} }
dir->ent.d_name = dir->data.cFileName; dir->ent.d_name = dir->data.cFileName;
#endif #endif
return &dir->ent; return &dir->ent;
} }
void closedir(DIR* dir) void closedir(DIR* dir)
{ {
::FindClose(dir->handle); ::FindClose(dir->handle);
delete dir; delete dir;
} }
#else #else
# include <dirent.h> #include <dirent.h>
# include <sys/stat.h> #include <sys/stat.h>
const char dir_separators[] = "/"; const char dir_separators[] = "/";
#endif #endif
static bool isDir(const string &path, DIR* dir) static bool isDir(const string& path, DIR* dir)
{ {
#if defined _WIN32 || defined WINCE #if defined _WIN32 || defined WINCE
DWORD attributes; DWORD attributes;
BOOL status = TRUE; BOOL status = TRUE;
if (dir) if(dir)
attributes = dir->data.dwFileAttributes; attributes = dir->data.dwFileAttributes;
else else
{ {
...@@ -156,20 +160,17 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -156,20 +160,17 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
#else #else
(void)dir; (void)dir;
struct stat stat_buf; struct stat stat_buf;
if (0 != stat(path.c_str(), &stat_buf)) if(0 != stat(path.c_str(), &stat_buf))
return false; return false;
int is_dir = S_ISDIR(stat_buf.st_mode); int is_dir = S_ISDIR(stat_buf.st_mode);
return is_dir != 0; return is_dir != 0;
#endif #endif
} }
bool IsDirectory(const string &path) bool IsDirectory(const string& path) { return isDir(path, NULL); }
{
return isDir(path, NULL);
}
bool Exists(const string& path) bool Exists(const string& path)
{ {
#if defined _WIN32 || defined WINCE #if defined _WIN32 || defined WINCE
BOOL status = TRUE; BOOL status = TRUE;
...@@ -190,28 +191,25 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -190,28 +191,25 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
struct stat stat_buf; struct stat stat_buf;
return (0 == stat(path.c_str(), &stat_buf)); return (0 == stat(path.c_str(), &stat_buf));
#endif #endif
} }
bool IsPathSeparator(char c) bool IsPathSeparator(char c) { return c == '/' || c == '\\'; }
{
return c == '/' || c == '\\';
}
string JoinPath(const string& base, const string& path) string JoinPath(const string& base, const string& path)
{ {
if (base.empty()) if(base.empty())
return path; return path;
if (path.empty()) if(path.empty())
return base; return base;
bool baseSep = IsPathSeparator(base[base.size() - 1]); bool baseSep = IsPathSeparator(base[base.size() - 1]);
bool pathSep = IsPathSeparator(path[0]); bool pathSep = IsPathSeparator(path[0]);
string result; string result;
if (baseSep && pathSep) if(baseSep && pathSep)
{ {
result = base + path.substr(1); result = base + path.substr(1);
} }
else if (!baseSep && !pathSep) else if(!baseSep && !pathSep)
{ {
result = base + PATH_SEPARATOR + path; result = base + PATH_SEPARATOR + path;
} }
...@@ -220,15 +218,15 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -220,15 +218,15 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
result = base + path; result = base + path;
} }
return result; return result;
} }
static bool wildcmp(const char *string, const char *wild) static bool wildcmp(const char* string, const char* wild)
{ {
const char *cp = 0, *mp = 0; const char *cp = 0, *mp = 0;
while ((*string) && (*wild != '*')) while((*string) && (*wild != '*'))
{ {
if ((*wild != *string) && (*wild != '?')) if((*wild != *string) && (*wild != '?'))
{ {
return false; return false;
} }
...@@ -237,11 +235,11 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -237,11 +235,11 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
string++; string++;
} }
while (*string) while(*string)
{ {
if (*wild == '*') if(*wild == '*')
{ {
if (!*++wild) if(!*++wild)
{ {
return true; return true;
} }
...@@ -249,7 +247,7 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -249,7 +247,7 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
mp = wild; mp = wild;
cp = string + 1; cp = string + 1;
} }
else if ((*wild == *string) || (*wild == '?')) else if((*wild == *string) || (*wild == '?'))
{ {
wild++; wild++;
string++; string++;
...@@ -261,47 +259,52 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -261,47 +259,52 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
} }
} }
while (*wild == '*') while(*wild == '*')
{ {
wild++; wild++;
} }
return *wild == 0; return *wild == 0;
} }
static void glob_rec(const string &directory, const string& wildchart, std::vector<string>& result, static void glob_rec(const string& directory,
bool recursive, bool includeDirectories, const string& pathPrefix) const string& wildchart,
{ std::vector<string>& result,
DIR *dir; bool recursive,
bool includeDirectories,
const string& pathPrefix)
{
DIR* dir;
if ((dir = opendir(directory.c_str())) != 0) if((dir = opendir(directory.c_str())) != 0)
{ {
/* find all the files and directories within directory */ /* find all the files and directories within directory */
try try
{ {
struct dirent *ent; struct dirent* ent;
while ((ent = readdir(dir)) != 0) while((ent = readdir(dir)) != 0)
{ {
const char* name = ent->d_name; const char* name = ent->d_name;
if ((name[0] == 0) || (name[0] == '.' && name[1] == 0) || (name[0] == '.' && name[1] == '.' && name[2] == 0)) if((name[0] == 0) || (name[0] == '.' && name[1] == 0) ||
(name[0] == '.' && name[1] == '.' && name[2] == 0))
continue; continue;
string path = JoinPath(directory, name); string path = JoinPath(directory, name);
string entry = JoinPath(pathPrefix, name); string entry = JoinPath(pathPrefix, name);
if (isDir(path, dir)) if(isDir(path, dir))
{ {
if (recursive) if(recursive)
glob_rec(path, wildchart, result, recursive, includeDirectories, entry); glob_rec(path, wildchart, result, recursive, includeDirectories, entry);
if (!includeDirectories) if(!includeDirectories)
continue; continue;
} }
if (wildchart.empty() || wildcmp(name, wildchart.c_str())) if(wildchart.empty() || wildcmp(name, wildchart.c_str()))
result.push_back(entry); result.push_back(entry);
} }
} }
catch (...) catch(...)
{ {
closedir(dir); closedir(dir);
throw; throw;
...@@ -312,23 +315,27 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -312,23 +315,27 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
{ {
printf("could not open directory: %s", directory.c_str()); printf("could not open directory: %s", directory.c_str());
} }
} }
void GetFileNameList(const string &directory, const string &pattern, std::vector<string>& result, bool recursive, bool addPath) void GetFileNameList(const string& directory,
{ const string& pattern,
std::vector<string>& result,
bool recursive,
bool addPath)
{
// split pattern // split pattern
vector<string> patterns=SplitString(pattern,","); vector<string> patterns = SplitString(pattern, ",");
result.clear(); result.clear();
for(int i=0;i<patterns.size();++i) for(int i = 0; i < patterns.size(); ++i)
{ {
string eachPattern=patterns[i]; string eachPattern = patterns[i];
std::vector<string> eachResult; std::vector<string> eachResult;
glob_rec(directory, eachPattern, eachResult, recursive, true, directory); glob_rec(directory, eachPattern, eachResult, recursive, true, directory);
for(int j=0;j<eachResult.size();++j) for(int j = 0; j < eachResult.size(); ++j)
{ {
if (IsDirectory(eachResult[j])) if(IsDirectory(eachResult[j]))
continue; continue;
if(addPath) if(addPath)
{ {
...@@ -341,41 +348,45 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -341,41 +348,45 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
} }
} }
std::sort(result.begin(), result.end()); std::sort(result.begin(), result.end());
} }
void GetFileNameList2(const string &directory, const string &pattern, std::vector<string>& result, bool recursive, bool addPath) void GetFileNameList2(const string& directory,
{ const string& pattern,
std::vector<string>& result,
bool recursive,
bool addPath)
{
// split pattern // split pattern
vector<string> patterns = SplitString(pattern, ","); vector<string> patterns = SplitString(pattern, ",");
result.clear(); result.clear();
for (int i = 0; i<patterns.size(); ++i) for(int i = 0; i < patterns.size(); ++i)
{ {
string eachPattern = patterns[i]; string eachPattern = patterns[i];
std::vector<string> eachResult; std::vector<string> eachResult;
glob_rec(directory, eachPattern, eachResult, recursive, true, directory); glob_rec(directory, eachPattern, eachResult, recursive, true, directory);
for (int j = 0; j<eachResult.size(); ++j) for(int j = 0; j < eachResult.size(); ++j)
{ {
string filePath = eachResult[j]; string filePath = eachResult[j];
if (IsDirectory(filePath)) if(IsDirectory(filePath))
{ {
filePath = filePath + "/"; filePath = filePath + "/";
for (int k = 0; k < filePath.size(); ++k) for(int k = 0; k < filePath.size(); ++k)
{ {
if (IsPathSeparator(filePath[k])) if(IsPathSeparator(filePath[k]))
{ {
filePath[k] = '/'; filePath[k] = '/';
} }
} }
} }
if (addPath) if(addPath)
{ {
result.push_back(filePath); result.push_back(filePath);
} }
else else
{ {
if (!IsDirectory(filePath)) if(!IsDirectory(filePath))
{ {
result.push_back(GetFileName(filePath)); result.push_back(GetFileName(filePath));
} }
...@@ -383,19 +394,19 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -383,19 +394,19 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
} }
} }
std::sort(result.begin(), result.end()); std::sort(result.begin(), result.end());
} }
void RemoveAll(const string& path) void RemoveAll(const string& path)
{ {
if (!Exists(path)) if(!Exists(path))
return; return;
if (IsDirectory(path)) if(IsDirectory(path))
{ {
std::vector<string> entries; std::vector<string> entries;
GetFileNameList2(path, string(), entries, false, true); GetFileNameList2(path, string(), entries, false, true);
for (size_t i = 0; i < entries.size(); i++) for(size_t i = 0; i < entries.size(); i++)
{ {
const string& e = entries[i]; const string& e = entries[i];
RemoveAll(e); RemoveAll(e);
...@@ -405,7 +416,7 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -405,7 +416,7 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
#else #else
bool result = rmdir(path.c_str()) == 0; bool result = rmdir(path.c_str()) == 0;
#endif #endif
if (!result) if(!result)
{ {
printf("can't remove directory: %s\n", path.c_str()); printf("can't remove directory: %s\n", path.c_str());
} }
...@@ -417,50 +428,50 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -417,50 +428,50 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
#else #else
bool result = unlink(path.c_str()) == 0; bool result = unlink(path.c_str()) == 0;
#endif #endif
if (!result) if(!result)
{ {
printf("can't remove file: %s\n", path.c_str()); printf("can't remove file: %s\n", path.c_str());
} }
} }
} }
void Remove(const string &directory, const string &extension) void Remove(const string& directory, const string& extension)
{ {
DIR *dir; DIR* dir;
static int numberOfFiles = 0; static int numberOfFiles = 0;
if ((dir = opendir(directory.c_str())) != 0) if((dir = opendir(directory.c_str())) != 0)
{ {
/* find all the files and directories within directory */ /* find all the files and directories within directory */
try try
{ {
struct dirent *ent; struct dirent* ent;
while ((ent = readdir(dir)) != 0) while((ent = readdir(dir)) != 0)
{ {
const char* name = ent->d_name; const char* name = ent->d_name;
if ((name[0] == 0) || (name[0] == '.' && name[1] == 0) || (name[0] == '.' && name[1] == '.' && name[2] == 0)) if((name[0] == 0) || (name[0] == '.' && name[1] == 0) ||
(name[0] == '.' && name[1] == '.' && name[2] == 0))
continue; continue;
string path = JoinPath(directory, name); string path = JoinPath(directory, name);
if (isDir(path, dir)) if(isDir(path, dir))
{ {
Remove(path, extension); Remove(path, extension);
} }
// �ж���չ�� // �ж���չ��
if (extension.empty() || wildcmp(name, extension.c_str())) if(extension.empty() || wildcmp(name, extension.c_str()))
{ {
RemoveAll(path); RemoveAll(path);
++numberOfFiles; ++numberOfFiles;
printf("%s deleted! number of deleted files:%d\n", path.c_str(), numberOfFiles); printf("%s deleted! number of deleted files:%d\n", path.c_str(), numberOfFiles);
} }
} }
} }
catch (...) catch(...)
{ {
closedir(dir); closedir(dir);
throw; throw;
...@@ -474,49 +485,49 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -474,49 +485,49 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
// ����RemoveAllɾ��Ŀ¼ // ����RemoveAllɾ��Ŀ¼
RemoveAll(directory); RemoveAll(directory);
} }
string GetFileName(const string &path) string GetFileName(const string& path)
{ {
string fileName; string fileName;
int indexOfPathSeparator = -1; int indexOfPathSeparator = -1;
for (int i = path.size() - 1; i >= 0; --i) for(int i = path.size() - 1; i >= 0; --i)
{ {
if (IsPathSeparator(path[i])) if(IsPathSeparator(path[i]))
{ {
fileName = path.substr(i + 1, path.size() - i - 1); fileName = path.substr(i + 1, path.size() - i - 1);
indexOfPathSeparator = i; indexOfPathSeparator = i;
break; break;
} }
} }
if (indexOfPathSeparator == -1) if(indexOfPathSeparator == -1)
{ {
fileName = path; fileName = path;
} }
return fileName; return fileName;
} }
string GetFileName_NoExtension(const string &path) string GetFileName_NoExtension(const string& path)
{ {
string fileName=GetFileName(path); string fileName = GetFileName(path);
string fileName_NoExtension; string fileName_NoExtension;
for(int i=fileName.size()-1;i>0;--i) for(int i = fileName.size() - 1; i > 0; --i)
{ {
if(fileName[i]=='.') if(fileName[i] == '.')
{ {
fileName_NoExtension=fileName.substr(0,i); fileName_NoExtension = fileName.substr(0, i);
break; break;
} }
} }
return fileName_NoExtension; return fileName_NoExtension;
} }
string GetExtension(const string &path) string GetExtension(const string& path)
{ {
string fileName; string fileName;
for (int i = path.size() - 1; i >= 0; --i) for(int i = path.size() - 1; i >= 0; --i)
{ {
if (path[i]=='.') if(path[i] == '.')
{ {
fileName = path.substr(i, path.size() - i); fileName = path.substr(i, path.size() - i);
break; break;
...@@ -524,56 +535,55 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -524,56 +535,55 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
} }
return fileName; return fileName;
}
} string GetParentPath(const string& path)
{
string GetParentPath(const string &path)
{
string fileName; string fileName;
for (int i = path.size() - 1; i >= 0; --i) for(int i = path.size() - 1; i >= 0; --i)
{ {
if (IsPathSeparator(path[i])) if(IsPathSeparator(path[i]))
{ {
fileName = path.substr(0, i+1); fileName = path.substr(0, i + 1);
break; break;
} }
} }
return fileName; return fileName;
} }
static bool CreateDirectory(const string &path) static bool CreateDirectory(const string& path)
{ {
#if defined WIN32 || defined _WIN32 || defined WINCE #if defined WIN32 || defined _WIN32 || defined WINCE
#ifdef WINRT #ifdef WINRT
wchar_t wpath[MAX_PATH]; wchar_t wpath[MAX_PATH];
size_t copied = mbstowcs(wpath, path.c_str(), MAX_PATH); size_t copied = mbstowcs(wpath, path.c_str(), MAX_PATH);
CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1)); CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
int result = CreateDirectoryA(wpath, NULL) ? 0 : -1; int result = CreateDirectoryA(wpath, NULL) ? 0 : -1;
#else #else
int result = _mkdir(path.c_str()); int result = _mkdir(path.c_str());
#endif #endif
#elif defined __linux__ || defined __APPLE__ #elif defined __linux__ || defined __APPLE__
int result = mkdir(path.c_str(), 0777); int result = mkdir(path.c_str(), 0777);
#else #else
int result = -1; int result = -1;
#endif #endif
if (result == -1) if(result == -1)
{ {
return IsDirectory(path); return IsDirectory(path);
} }
return true; return true;
} }
bool CreateDirectories(const string &directoryPath) bool CreateDirectories(const string& directoryPath)
{ {
string path = directoryPath; string path = directoryPath;
for (;;) for(;;)
{ {
char last_char = path.empty() ? 0 : path[path.length() - 1]; char last_char = path.empty() ? 0 : path[path.length() - 1];
if (IsPathSeparator(last_char)) if(IsPathSeparator(last_char))
{ {
path = path.substr(0, path.length() - 1); path = path.substr(0, path.length() - 1);
continue; continue;
...@@ -581,35 +591,35 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -581,35 +591,35 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
break; break;
} }
if (path.empty() || path == "./" || path == ".\\" || path == ".") if(path.empty() || path == "./" || path == ".\\" || path == ".")
return true; return true;
if (IsDirectory(path)) if(IsDirectory(path))
return true; return true;
size_t pos = path.rfind('/'); size_t pos = path.rfind('/');
if (pos == string::npos) if(pos == string::npos)
pos = path.rfind('\\'); pos = path.rfind('\\');
if (pos != string::npos) if(pos != string::npos)
{ {
string parent_directory = path.substr(0, pos); string parent_directory = path.substr(0, pos);
if (!parent_directory.empty()) if(!parent_directory.empty())
{ {
if (!CreateDirectories(parent_directory)) if(!CreateDirectories(parent_directory))
return false; return false;
} }
} }
return CreateDirectory(path); return CreateDirectory(path);
} }
bool CopyFile(const string srcPath, const string dstPath) bool CopyFile(const string srcPath, const string dstPath)
{ {
std::ifstream srcFile(srcPath,ios::binary); std::ifstream srcFile(srcPath, ios::binary);
std::ofstream dstFile(dstPath,ios::binary); std::ofstream dstFile(dstPath, ios::binary);
if(!srcFile.is_open()) if(!srcFile.is_open())
{ {
printf("can not open %s\n",srcPath.c_str()); printf("can not open %s\n", srcPath.c_str());
return false; return false;
} }
if(!dstFile.is_open()) if(!dstFile.is_open())
...@@ -617,27 +627,27 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -617,27 +627,27 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
printf("can not open %s\n", dstPath.c_str()); printf("can not open %s\n", dstPath.c_str());
return false; return false;
} }
if(srcPath==dstPath) if(srcPath == dstPath)
{ {
printf("src can not be same with dst\n"); printf("src can not be same with dst\n");
return false; return false;
} }
char buffer[2048]; char buffer[2048];
unsigned int numberOfBytes=0; unsigned int numberOfBytes = 0;
while(srcFile) while(srcFile)
{ {
srcFile.read(buffer,2048); srcFile.read(buffer, 2048);
dstFile.write(buffer,srcFile.gcount()); dstFile.write(buffer, srcFile.gcount());
numberOfBytes+=srcFile.gcount(); numberOfBytes += srcFile.gcount();
} }
srcFile.close(); srcFile.close();
dstFile.close(); dstFile.close();
return true; return true;
} }
bool CopyDirectories(string srcPath, const string dstPath) bool CopyDirectories(string srcPath, const string dstPath)
{ {
if(srcPath==dstPath) if(srcPath == dstPath)
{ {
printf("src can not be same with dst\n"); printf("src can not be same with dst\n");
return false; return false;
...@@ -649,45 +659,41 @@ static std::vector<std::string> SplitString(std::string str, std::string separat ...@@ -649,45 +659,41 @@ static std::vector<std::string> SplitString(std::string str, std::string separat
vector<string> fileNameList; vector<string> fileNameList;
GetFileNameList2(srcPath, "", fileNameList, true, true); GetFileNameList2(srcPath, "", fileNameList, true, true);
string parentPathOfSrc=GetParentPath(srcPath); string parentPathOfSrc = GetParentPath(srcPath);
int length=parentPathOfSrc.size(); int length = parentPathOfSrc.size();
// create all directories // create all directories
for(int i=0;i<fileNameList.size();++i) for(int i = 0; i < fileNameList.size(); ++i)
{ {
// create directory // create directory
string srcFilePath=fileNameList[i]; string srcFilePath = fileNameList[i];
string subStr=srcFilePath.substr(length,srcFilePath.size()-length); string subStr = srcFilePath.substr(length, srcFilePath.size() - length);
string dstFilePath=dstPath+subStr; string dstFilePath = dstPath + subStr;
string parentPathOfDst=GetParentPath(dstFilePath); string parentPathOfDst = GetParentPath(dstFilePath);
CreateDirectories(parentPathOfDst); CreateDirectories(parentPathOfDst);
} }
// copy file // copy file
for(int i=0;i<fileNameList.size();++i) for(int i = 0; i < fileNameList.size(); ++i)
{ {
string srcFilePath=fileNameList[i]; string srcFilePath = fileNameList[i];
if (IsDirectory(srcFilePath)) if(IsDirectory(srcFilePath))
{ {
continue; continue;
} }
string subStr=srcFilePath.substr(length,srcFilePath.size()-length); string subStr = srcFilePath.substr(length, srcFilePath.size() - length);
string dstFilePath=dstPath+subStr; string dstFilePath = dstPath + subStr;
// copy file // copy file
CopyFile(srcFilePath,dstFilePath); CopyFile(srcFilePath, dstFilePath);
// process // process
double process = (1.0*(i + 1) / fileNameList.size()) * 100; double process = (1.0 * (i + 1) / fileNameList.size()) * 100;
printf("%s done! %f% \n", GetFileName(fileNameList[i]).c_str(), process); printf("%s done! %f% \n", GetFileName(fileNameList[i]).c_str(), process);
} }
printf("all done!(the number of files:%d)\n", fileNameList.size()); printf("all done!(the number of files:%d)\n", fileNameList.size());
return true; return true;
}
} }
} // namespace migraphxSamples
Src/Utility/Filesystem.h
View file @ 2475c919
...@@ -10,19 +10,19 @@ namespace migraphxSamples ...@@ -10,19 +10,19 @@ namespace migraphxSamples
{ {
// 路径是否存在 // 路径是否存在
bool Exists(const std::string &path); bool Exists(const std::string& path);
// 路径是否为目录 // 路径是否为目录
bool IsDirectory(const std::string &path); bool IsDirectory(const std::string& path);
// 是否是路径分隔符(Linux:‘/’,Windows:’\\’) // 是否是路径分隔符(Linux:‘/’,Windows:’\\’)
bool IsPathSeparator(char c); bool IsPathSeparator(char c);
// 路径拼接 // 路径拼接
std::string JoinPath(const std::string &base, const std::string &path); std::string JoinPath(const std::string& base, const std::string& path);
// 创建多级目录,注意：创建多级目录的时候，目标目录是不能有文件存在的 // 创建多级目录,注意：创建多级目录的时候，目标目录是不能有文件存在的
bool CreateDirectories(const std::string &directoryPath); bool CreateDirectories(const std::string& directoryPath);
/** 生成符合指定模式的文件名列表(支持递归遍历) /** 生成符合指定模式的文件名列表(支持递归遍历)
* *
...@@ -36,25 +36,33 @@ bool CreateDirectories(const std::string &directoryPath); ...@@ -36,25 +36,33 @@ bool CreateDirectories(const std::string &directoryPath);
5. 不能返回子目录名 5. 不能返回子目录名
* *
*/ */
void GetFileNameList(const std::string &directory, const std::string &pattern, std::vector<std::string> &result, bool recursive, bool addPath); void GetFileNameList(const std::string& directory,
const std::string& pattern,
std::vector<std::string>& result,
bool recursive,
bool addPath);
// 与GetFileNameList的区别在于如果有子目录，在addPath为true的时候会返回子目录路径(目录名最后有"/") // 与GetFileNameList的区别在于如果有子目录，在addPath为true的时候会返回子目录路径(目录名最后有"/")
void GetFileNameList2(const std::string &directory, const std::string &pattern, std::vector<std::string> &result, bool recursive, bool addPath); void GetFileNameList2(const std::string& directory,
const std::string& pattern,
std::vector<std::string>& result,
bool recursive,
bool addPath);
// 删除文件或者目录,支持递归删除 // 删除文件或者目录,支持递归删除
void Remove(const std::string &directory, const std::string &extension=""); void Remove(const std::string& directory, const std::string& extension = "");
/** 获取路径的文件名和扩展名 /** 获取路径的文件名和扩展名
* *
* 示例：path为D:/1/1.txt,则GetFileName()为1.txt,GetFileName_NoExtension()为1,GetExtension()为.txt,GetParentPath()为D:/1/ * 示例：path为D:/1/1.txt,则GetFileName()为1.txt,GetFileName_NoExtension()为1,GetExtension()为.txt,GetParentPath()为D:/1/
*/ */
std::string GetFileName(const std::string &path); std::string GetFileName(const std::string& path);
std::string GetFileName_NoExtension(const std::string &path); std::string GetFileName_NoExtension(const std::string& path);
std::string GetExtension(const std::string &path); std::string GetExtension(const std::string& path);
std::string GetParentPath(const std::string &path); std::string GetParentPath(const std::string& path);
// 拷贝文件 // 拷贝文件
bool CopyFile(const std::string srcPath,const std::string dstPath); bool CopyFile(const std::string srcPath, const std::string dstPath);
/** 拷贝目录 /** 拷贝目录
* *
...@@ -63,8 +71,8 @@ bool CopyFile(const std::string srcPath,const std::string dstPath); ...@@ -63,8 +71,8 @@ bool CopyFile(const std::string srcPath,const std::string dstPath);
1.第一个参数的最后不能加”/” 1.第一个参数的最后不能加”/”
2.不能拷贝隐藏文件 2.不能拷贝隐藏文件
*/ */
bool CopyDirectories(std::string srcPath,const std::string dstPath); bool CopyDirectories(std::string srcPath, const std::string dstPath);
} } // namespace migraphxSamples
#endif #endif
Src/Utility/SimpleLog.h
View file @ 2475c919
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <map> #include <map>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#if (defined WIN32 || defined _WIN32) #if(defined WIN32 || defined _WIN32)
#include <Windows.h> #include <Windows.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
using namespace std; using namespace std;
/** 简易日志 /** 简易日志
* *
* 不依赖于其他第三方库，只需要包含一个头文件就可以使用。提供了4种日志级别，包括INFO,DEBUG,WARN和ERROR。 * 不依赖于其他第三方库，只需要包含一个头文件就可以使用。提供了4种日志级别，包括INFO,DEBUG,WARN和ERROR。
* *
* 示例1: * 示例1:
// 初始化日志，在./Log/目录下创建两个日志文件log1.log和log2.log(注意：目录./Log/需要存在，否则日志创建失败) //
初始化日志，在./Log/目录下创建两个日志文件log1.log和log2.log(注意：目录./Log/需要存在，否则日志创建失败)
LogManager::GetInstance()->Initialize("./Log/","log1"); LogManager::GetInstance()->Initialize("./Log/","log1");
LogManager::GetInstance()->Initialize("./Log/","log2"); LogManager::GetInstance()->Initialize("./Log/","log2");
...@@ -50,44 +50,43 @@ using namespace std; ...@@ -50,44 +50,43 @@ using namespace std;
class LogManager class LogManager
{ {
private: private:
LogManager(){} LogManager() {}
public: public:
~LogManager(){} ~LogManager() {}
inline void Initialize(const string &parentPath,const string &logName) inline void Initialize(const string& parentPath, const string& logName)
{ {
// 日志名为空表示输出到控制台 // 日志名为空表示输出到控制台
if(logName.size()==0) if(logName.size() == 0)
return; return;
// 查找该日志文件，如果没有则创建 // 查找该日志文件，如果没有则创建
std::map<string, FILE*>::const_iterator iter = logMap.find(logName); std::map<string, FILE*>::const_iterator iter = logMap.find(logName);
if (iter == logMap.end()) if(iter == logMap.end())
{ {
string pathOfLog = parentPath+ logName + ".log"; string pathOfLog = parentPath + logName + ".log";
FILE *logFile = fopen(pathOfLog.c_str(), "a"); // w:覆盖原有文件,a:追加 FILE* logFile = fopen(pathOfLog.c_str(), "a"); // w:覆盖原有文件,a:追加
if(logFile!=NULL) if(logFile != NULL)
{ {
logMap.insert(std::make_pair(logName, logFile)); logMap.insert(std::make_pair(logName, logFile));
} }
} }
} }
inline FILE* GetLogFile(const string &logName) inline FILE* GetLogFile(const string& logName)
{ {
std::map<string, FILE*>::const_iterator iter=logMap.find(logName); std::map<string, FILE*>::const_iterator iter = logMap.find(logName);
if(iter==logMap.end()) if(iter == logMap.end())
{ {
return NULL; return NULL;
} }
return (*iter).second; return (*iter).second;
} }
inline void Close(const string &logName) inline void Close(const string& logName)
{ {
std::map<string, FILE*>::const_iterator iter=logMap.find(logName); std::map<string, FILE*>::const_iterator iter = logMap.find(logName);
if(iter==logMap.end()) if(iter == logMap.end())
{ {
return; return;
} }
...@@ -95,10 +94,7 @@ public: ...@@ -95,10 +94,7 @@ public:
fclose((*iter).second); fclose((*iter).second);
logMap.erase(iter); logMap.erase(iter);
} }
inline std::mutex &GetLogMutex() inline std::mutex& GetLogMutex() { return logMutex; }
{
return logMutex;
}
// Singleton // Singleton
static LogManager* GetInstance() static LogManager* GetInstance()
...@@ -106,17 +102,18 @@ public: ...@@ -106,17 +102,18 @@ public:
static LogManager logManager; static LogManager logManager;
return &logManager; return &logManager;
} }
private:
private:
std::map<string, FILE*> logMap; std::map<string, FILE*> logMap;
std::mutex logMutex; std::mutex logMutex;
}; };
#ifdef LOG_MUTEX #ifdef LOG_MUTEX
#define LOCK LogManager::GetInstance()->GetLogMutex().lock() #define LOCK LogManager::GetInstance()->GetLogMutex().lock()
#define UNLOCK LogManager::GetInstance()->GetLogMutex().unlock() #define UNLOCK LogManager::GetInstance()->GetLogMutex().unlock()
#else #else
#define LOCK #define LOCK
#define UNLOCK #define UNLOCK
#endif #endif
// log time // log time
...@@ -131,53 +128,53 @@ typedef struct _LogTime ...@@ -131,53 +128,53 @@ typedef struct _LogTime
string millisecond; // ms string millisecond; // ms
string microsecond; // us string microsecond; // us
string weekDay; string weekDay;
}LogTime; } LogTime;
inline LogTime GetTime() inline LogTime GetTime()
{ {
LogTime currentTime; LogTime currentTime;
#if (defined WIN32 || defined _WIN32) #if(defined WIN32 || defined _WIN32)
SYSTEMTIME systemTime; SYSTEMTIME systemTime;
GetLocalTime(&systemTime); GetLocalTime(&systemTime);
char temp[8] = { 0 }; char temp[8] = {0};
sprintf(temp, "%04d", systemTime.wYear); sprintf(temp, "%04d", systemTime.wYear);
currentTime.year=string(temp); currentTime.year = string(temp);
sprintf(temp, "%02d", systemTime.wMonth); sprintf(temp, "%02d", systemTime.wMonth);
currentTime.month=string(temp); currentTime.month = string(temp);
sprintf(temp, "%02d", systemTime.wDay); sprintf(temp, "%02d", systemTime.wDay);
currentTime.day=string(temp); currentTime.day = string(temp);
sprintf(temp, "%02d", systemTime.wHour); sprintf(temp, "%02d", systemTime.wHour);
currentTime.hour=string(temp); currentTime.hour = string(temp);
sprintf(temp, "%02d", systemTime.wMinute); sprintf(temp, "%02d", systemTime.wMinute);
currentTime.minute=string(temp); currentTime.minute = string(temp);
sprintf(temp, "%02d", systemTime.wSecond); sprintf(temp, "%02d", systemTime.wSecond);
currentTime.second=string(temp); currentTime.second = string(temp);
sprintf(temp, "%03d", systemTime.wMilliseconds); sprintf(temp, "%03d", systemTime.wMilliseconds);
currentTime.millisecond=string(temp); currentTime.millisecond = string(temp);
sprintf(temp, "%d", systemTime.wDayOfWeek); sprintf(temp, "%d", systemTime.wDayOfWeek);
currentTime.weekDay=string(temp); currentTime.weekDay = string(temp);
#else #else
struct timeval tv; struct timeval tv;
struct tm *p; struct tm* p;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
p = localtime(&tv.tv_sec); p = localtime(&tv.tv_sec);
char temp[8]={0}; char temp[8] = {0};
sprintf(temp,"%04d",1900+p->tm_year); sprintf(temp, "%04d", 1900 + p->tm_year);
currentTime.year=string(temp); currentTime.year = string(temp);
sprintf(temp,"%02d",1+p->tm_mon); sprintf(temp, "%02d", 1 + p->tm_mon);
currentTime.month=string(temp); currentTime.month = string(temp);
sprintf(temp,"%02d",p->tm_mday); sprintf(temp, "%02d", p->tm_mday);
currentTime.day=string(temp); currentTime.day = string(temp);
sprintf(temp,"%02d",p->tm_hour); sprintf(temp, "%02d", p->tm_hour);
currentTime.hour=string(temp); currentTime.hour = string(temp);
sprintf(temp,"%02d",p->tm_min); sprintf(temp, "%02d", p->tm_min);
currentTime.minute=string(temp); currentTime.minute = string(temp);
sprintf(temp,"%02d",p->tm_sec); sprintf(temp, "%02d", p->tm_sec);
currentTime.second=string(temp); currentTime.second = string(temp);
sprintf(temp,"%03d",(int)(tv.tv_usec/1000)); sprintf(temp, "%03d", (int)(tv.tv_usec / 1000));
currentTime.millisecond = string(temp); currentTime.millisecond = string(temp);
sprintf(temp, "%03d", (int)(tv.tv_usec % 1000)); sprintf(temp, "%03d", (int)(tv.tv_usec % 1000));
currentTime.microsecond = string(temp); currentTime.microsecond = string(temp);
...@@ -188,60 +185,82 @@ inline LogTime GetTime() ...@@ -188,60 +185,82 @@ inline LogTime GetTime()
} }
#define LOG_TIME(logFile) \ #define LOG_TIME(logFile) \
do\ do \
{\ { \
LogTime currentTime=GetTime(); \ LogTime currentTime = GetTime(); \
fprintf(((logFile == NULL) ? stdout : logFile), "%s-%s-%s %s:%s:%s.%s\t",currentTime.year.c_str(),currentTime.month.c_str(),currentTime.day.c_str(),currentTime.hour.c_str(),currentTime.minute.c_str(),currentTime.second.c_str(),currentTime.millisecond.c_str()); \ fprintf(((logFile == NULL) ? stdout : logFile), \
}while (0) "%s-%s-%s %s:%s:%s.%s\t", \
currentTime.year.c_str(), \
currentTime.month.c_str(), \
#define LOG_INFO(logFile,logInfo, ...) \ currentTime.day.c_str(), \
do\ currentTime.hour.c_str(), \
{\ currentTime.minute.c_str(), \
currentTime.second.c_str(), \
currentTime.millisecond.c_str()); \
} while(0)
#define LOG_INFO(logFile, logInfo, ...) \
do \
{ \
LOCK; \ LOCK; \
LOG_TIME(logFile); \ LOG_TIME(logFile); \
fprintf(((logFile == NULL) ? stdout : logFile), "INFO\t"); \ fprintf(((logFile == NULL) ? stdout : logFile), "INFO\t"); \
fprintf(((logFile == NULL) ? stdout : logFile), "[%s:%d (%s) ]: ", __FILE__, __LINE__, __FUNCTION__); \ fprintf(((logFile == NULL) ? stdout : logFile), \
fprintf(((logFile == NULL) ? stdout : logFile), logInfo, ## __VA_ARGS__); \ "[%s:%d (%s) ]: ", \
__FILE__, \
__LINE__, \
__FUNCTION__); \
fprintf(((logFile == NULL) ? stdout : logFile), logInfo, ##__VA_ARGS__); \
fflush(logFile); \ fflush(logFile); \
UNLOCK; \ UNLOCK; \
} while (0) } while(0)
#define LOG_DEBUG(logFile,logInfo, ...) \ #define LOG_DEBUG(logFile, logInfo, ...) \
do\ do \
{\ { \
LOCK; \ LOCK; \
LOG_TIME(logFile);\ LOG_TIME(logFile); \
fprintf(((logFile==NULL)?stdout:logFile), "DEBUG\t"); \ fprintf(((logFile == NULL) ? stdout : logFile), "DEBUG\t"); \
fprintf(((logFile==NULL)?stdout:logFile), "[%s:%d (%s) ]: ", __FILE__, __LINE__, __FUNCTION__); \ fprintf(((logFile == NULL) ? stdout : logFile), \
fprintf(((logFile==NULL)?stdout:logFile),logInfo, ## __VA_ARGS__); \ "[%s:%d (%s) ]: ", \
__FILE__, \
__LINE__, \
__FUNCTION__); \
fprintf(((logFile == NULL) ? stdout : logFile), logInfo, ##__VA_ARGS__); \
fflush(logFile); \ fflush(logFile); \
UNLOCK; \ UNLOCK; \
} while (0) } while(0)
#define LOG_ERROR(logFile,logInfo, ...) \ #define LOG_ERROR(logFile, logInfo, ...) \
do\ do \
{\ { \
LOCK; \ LOCK; \
LOG_TIME(logFile);\ LOG_TIME(logFile); \
fprintf(((logFile==NULL)?stdout:logFile), "ERROR\t"); \ fprintf(((logFile == NULL) ? stdout : logFile), "ERROR\t"); \
fprintf(((logFile==NULL)?stdout:logFile), "[%s:%d (%s) ]: ", __FILE__, __LINE__, __FUNCTION__); \ fprintf(((logFile == NULL) ? stdout : logFile), \
fprintf(((logFile==NULL)?stdout:logFile),logInfo, ## __VA_ARGS__); \ "[%s:%d (%s) ]: ", \
__FILE__, \
__LINE__, \
__FUNCTION__); \
fprintf(((logFile == NULL) ? stdout : logFile), logInfo, ##__VA_ARGS__); \
fflush(logFile); \ fflush(logFile); \
UNLOCK; \ UNLOCK; \
} while (0) } while(0)
#define LOG_WARN(logFile,logInfo, ...) \ #define LOG_WARN(logFile, logInfo, ...) \
do\ do \
{\ { \
LOCK; \ LOCK; \
LOG_TIME(logFile);\ LOG_TIME(logFile); \
fprintf(((logFile==NULL)?stdout:logFile), "WARN\t"); \ fprintf(((logFile == NULL) ? stdout : logFile), "WARN\t"); \
fprintf(((logFile==NULL)?stdout:logFile), "[%s:%d (%s) ]: ", __FILE__, __LINE__, __FUNCTION__); \ fprintf(((logFile == NULL) ? stdout : logFile), \
fprintf(((logFile==NULL)?stdout:logFile),logInfo, ## __VA_ARGS__); \ "[%s:%d (%s) ]: ", \
__FILE__, \
__LINE__, \
__FUNCTION__); \
fprintf(((logFile == NULL) ? stdout : logFile), logInfo, ##__VA_ARGS__); \
fflush(logFile); \ fflush(logFile); \
UNLOCK; \ UNLOCK; \
} while (0) } while(0)
#endif // __SIMPLE_LOG_H__ #endif // __SIMPLE_LOG_H__
Src/main.cpp
View file @ 2475c919
...@@ -15,7 +15,7 @@ int main() ...@@ -15,7 +15,7 @@ int main()
vlpr.Initialize(initParamOfDB, initParamOfSVTR); vlpr.Initialize(initParamOfDB, initParamOfSVTR);
// 读取测试图片 // 读取测试图片
cv:: Mat Image=cv::imread("../Resource/Images/vlpr.jpg", 1); cv::Mat Image = cv::imread("../Resource/Images/vlpr.jpg", 1);
// 推理 // 推理
std::vector<std::string> recTexts; std::vector<std::string> recTexts;
...@@ -23,7 +23,7 @@ int main() ...@@ -23,7 +23,7 @@ int main()
vlpr.Infer(Image, recTexts, recTextScores); vlpr.Infer(Image, recTexts, recTextScores);
// 打印结果 // 打印结果
for (int i = 0; i < recTexts.size(); i++) for(int i = 0; i < recTexts.size(); i++)
{ {
printf("VLPR Result:%s\n", recTexts[i].c_str()); printf("VLPR Result:%s\n", recTexts[i].c_str());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment