Skip to content

Commit a51e5a6

Browse files
authored
[Android] Add android aar package (#416)
* [Android] Add Android build docs and demo (#26) * [Backend] Add override flag to lite backend * [Docs] Add Android C++ SDK build docs * [Doc] fix android_build_docs typos * Update CMakeLists.txt * Update android.md * [Doc] Add PicoDet Android demo docs * [Doc] Update PicoDet Andorid demo docs * [Doc] Update PaddleClasModel Android demo docs * [Doc] Update fastdeploy android jni docs * [Doc] Update fastdeploy android jni usage docs * [Android] init fastdeploy android jar package * [Backend] support int8 option for lite backend * [Model] add Backend::Lite to paddle model * [Backend] use CopyFromCpu for lite backend. * [Android] package jni srcs and java api into aar * Update infer.cc * Update infer.cc * [Android] Update package build.gradle * [Android] Update android app examples * [Android] update android detection app
1 parent b064ddf commit a51e5a6

File tree

137 files changed

+4664
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+4664
-37
lines changed

examples/vision/detection/paddledetection/cpp/infer_faster_rcnn.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::FasterRCNN(
28-
model_file, params_file, config_file);
30+
model_file, params_file, config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_mask_rcnn.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::MaskRCNN(model_file, params_file,
28-
config_file);
30+
config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_picodet.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::PicoDet(model_file, params_file,
28-
config_file);
30+
config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_ppyolo.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::PPYOLO(model_file, params_file,
28-
config_file);
30+
config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_ppyoloe.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::PPYOLOE(model_file, params_file,
28-
config_file);
30+
config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_yolov3.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::YOLOv3(model_file, params_file,
28-
config_file);
30+
config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/detection/paddledetection/cpp/infer_yolox.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "infer_cfg.yml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::detection::PaddleYOLOX(
28-
model_file, params_file, config_file);
30+
model_file, params_file, config_file, option);
2931
if (!model.Initialized()) {
3032
std::cerr << "Failed to initialize." << std::endl;
3133
return;

examples/vision/keypointdetection/tiny_pose/cpp/pptinypose_infer.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ void CpuInfer(const std::string& tinypose_model_dir,
2525
auto tinypose_model_file = tinypose_model_dir + sep + "model.pdmodel";
2626
auto tinypose_params_file = tinypose_model_dir + sep + "model.pdiparams";
2727
auto tinypose_config_file = tinypose_model_dir + sep + "infer_cfg.yml";
28+
auto option = fastdeploy::RuntimeOption();
29+
option.UseCpu();
2830
auto tinypose_model = fastdeploy::vision::keypointdetection::PPTinyPose(
29-
tinypose_model_file, tinypose_params_file, tinypose_config_file);
31+
tinypose_model_file, tinypose_params_file, tinypose_config_file, option);
3032
if (!tinypose_model.Initialized()) {
3133
std::cerr << "TinyPose Model Failed to initialize." << std::endl;
3234
return;

examples/vision/matting/ppmatting/cpp/infer.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file,
2626
auto params_file = model_dir + sep + "model.pdiparams";
2727
auto config_file = model_dir + sep + "deploy.yaml";
2828
auto option = fastdeploy::RuntimeOption();
29+
option.UseCpu();
2930
auto model = fastdeploy::vision::matting::PPMatting(model_file, params_file,
3031
config_file, option);
3132
if (!model.Initialized()) {

examples/vision/segmentation/paddleseg/cpp/infer.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ void CpuInfer(const std::string& model_dir, const std::string& image_file) {
2424
auto model_file = model_dir + sep + "model.pdmodel";
2525
auto params_file = model_dir + sep + "model.pdiparams";
2626
auto config_file = model_dir + sep + "deploy.yaml";
27+
auto option = fastdeploy::RuntimeOption();
28+
option.UseCpu();
2729
auto model = fastdeploy::vision::segmentation::PaddleSegModel(
28-
model_file, params_file, config_file);
30+
model_file, params_file, config_file, option);
2931

3032
if (!model.Initialized()) {
3133
std::cerr << "Failed to initialize." << std::endl;

0 commit comments

Comments
 (0)