Skip to content

Commit

Permalink
[Other] Update old Api to new ones (#861)
Browse files Browse the repository at this point in the history 
* Update keypointdetection result docs

* Update im.copy() to im in examples

* Update new Api, fastdeploy::vision::Visualize to fastdeploy::vision

* Update SwapBackgroundSegmentation && SwapBackgroundMatting to SwapBackground

* Update README_CN.md

* Update README_CN.md
  • Loading branch information
@felixhjh
felixhjh authored Dec 14, 2022
1 parent e7c2440 commit 376fdbf
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 115 deletions.
2 changes: 1 addition & 1 deletion README_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ int main(int argc, char* argv[]) {
vision::DetectionResult res;
model.Predict(im, &res);

auto vis_im = vision::Visualize::VisDetection(im, res, 0.5);
auto vis_im = vision::VisDetection(im, res, 0.5);
cv::imwrite("vis_image.jpg", vis_im);
return 0;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/nanodet_plus/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
std::cerr << "Failed to predict." << std::endl;
return;
}
std::cout << res.Str() << std::endl;
auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -46,7 +45,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -55,7 +53,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -73,7 +71,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -82,7 +79,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/scaledyolov4/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -47,7 +46,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -56,7 +54,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -74,7 +72,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -83,7 +80,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/yolor/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -46,7 +45,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -55,7 +53,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -72,7 +70,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -81,7 +78,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/yolov5/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -46,7 +45,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -55,7 +53,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -72,7 +70,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -81,7 +78,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
3 changes: 1 addition & 2 deletions examples/vision/detection/yolov5/quantize/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file,
assert(model.Initialized());

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -39,7 +38,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file,

std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/yolov5lite/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -47,7 +46,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -56,7 +54,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -74,7 +72,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -83,7 +80,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/yolov6/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -46,7 +45,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -55,7 +53,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -72,7 +70,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -81,7 +78,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
3 changes: 1 addition & 2 deletions examples/vision/detection/yolov6/quantize/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file,
assert(model.Initialized());

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -39,7 +38,7 @@ void InitAndInfer(const std::string& model_dir, const std::string& image_file,

std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
9 changes: 3 additions & 6 deletions examples/vision/detection/yolov7/cpp/infer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -31,7 +30,7 @@ void CpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -46,7 +45,6 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -55,7 +53,7 @@ void GpuInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand All @@ -72,7 +70,6 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}

auto im = cv::imread(image_file);
auto im_bak = im.clone();

fastdeploy::vision::DetectionResult res;
if (!model.Predict(&im, &res)) {
Expand All @@ -81,7 +78,7 @@ void TrtInfer(const std::string& model_file, const std::string& image_file) {
}
std::cout << res.Str() << std::endl;

auto vis_im = fastdeploy::vision::Visualize::VisDetection(im_bak, res);
auto vis_im = fastdeploy::vision::VisDetection(im, res);
cv::imwrite("vis_result.jpg", vis_im);
std::cout << "Visualized result saved in ./vis_result.jpg" << std::endl;
}
Expand Down
Loading

0 comments on commit 376fdbf

Please sign in to comment.