Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
018b902
add paddle_trt in benchmark
wjj19950828 Nov 1, 2022
05a4666
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 1, 2022
0000234
update benchmark in device
wjj19950828 Nov 2, 2022
f5c1f63
resolve conflict
wjj19950828 Nov 2, 2022
20ddf39
update benchmark
wjj19950828 Nov 3, 2022
f212502
resolve conflict
wjj19950828 Nov 3, 2022
9a4797e
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 4, 2022
2ce4005
update result doc
wjj19950828 Nov 4, 2022
565e373
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 4, 2022
36889ff
fixed for CI
wjj19950828 Nov 4, 2022
c523ae2
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 4, 2022
f32a09a
update python api_docs
wjj19950828 Nov 7, 2022
335712e
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 7, 2022
7fa4dea
update index.rst
wjj19950828 Nov 7, 2022
4389060
add runtime cpp examples
wjj19950828 Nov 7, 2022
1aa7b96
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 7, 2022
84d564f
deal with comments
wjj19950828 Nov 7, 2022
e6f4e63
Update infer_paddle_tensorrt.py
jiangjiajun Nov 7, 2022
050e6ae
resolve conflict
wjj19950828 Nov 8, 2022
1952c99
Add runtime quick start
wjj19950828 Nov 8, 2022
6fada61
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 8, 2022
ff0b121
Merge branch 'update_benchmark' of https://github.com/wjj19950828/Fas…
wjj19950828 Nov 8, 2022
42f6a5e
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 8, 2022
d495b8e
deal with comments
wjj19950828 Nov 8, 2022
731b822
fixed reused_input_tensors&&reused_output_tensors
wjj19950828 Nov 8, 2022
c7d89ef
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 8, 2022
568d5ae
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 9, 2022
f8e10a8
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 9, 2022
c5c741d
fixed docs
wjj19950828 Nov 9, 2022
d4ebde0
fixed headpose typo
wjj19950828 Nov 9, 2022
a4bc615
Merge remote-tracking branch 'upstream/develop' into update_benchmark
wjj19950828 Nov 9, 2022
6f653da
fixed typo
wjj19950828 Nov 9, 2022
72477e1
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 9, 2022
005897c
refactor yolov5
wjj19950828 Nov 9, 2022
0509089
update model infer
wjj19950828 Nov 9, 2022
0e8c38c
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 10, 2022
febb2c1
refactor pybind for yolov5
wjj19950828 Nov 10, 2022
177995c
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 10, 2022
92dc352
rm origin yolov5
wjj19950828 Nov 10, 2022
983301b
fixed bugs
wjj19950828 Nov 10, 2022
27113e3
rm cuda preprocess
wjj19950828 Nov 10, 2022
f7d9d20
fixed bugs
wjj19950828 Nov 10, 2022
448806a
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 10, 2022
d2629e7
fixed bugs
wjj19950828 Nov 10, 2022
0a5611b
fixed bug
wjj19950828 Nov 10, 2022
5706ff6
fixed bug
wjj19950828 Nov 10, 2022
5817564
fix pybind
wjj19950828 Nov 10, 2022
3e94507
rm useless code
wjj19950828 Nov 10, 2022
b97542f
add convert_and_permute
wjj19950828 Nov 13, 2022
632dd87
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 13, 2022
d83fd12
fixed bugs
wjj19950828 Nov 13, 2022
302ca01
fixed im_info for bs_predict
wjj19950828 Nov 13, 2022
4b9cc78
fixed bug
wjj19950828 Nov 13, 2022
c72cafa
add bs_predict for yolov5
wjj19950828 Nov 13, 2022
26a1281
resolve conflict
wjj19950828 Nov 14, 2022
0f3b4a7
Add runtime test and batch eval
wjj19950828 Nov 14, 2022
b9b719a
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 14, 2022
386b908
deal with comments
wjj19950828 Nov 14, 2022
810d7cd
fixed bug
wjj19950828 Nov 14, 2022
b200232
update testcase
wjj19950828 Nov 14, 2022
97085a2
fixed batch eval bug
wjj19950828 Nov 14, 2022
fb111e1
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 14, 2022
ac9b1a7
fixed preprocess bug
wjj19950828 Nov 14, 2022
feec5e8
Merge remote-tracking branch 'upstream/develop' into refactor_yolov5
wjj19950828 Nov 14, 2022
22feb4b
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 15, 2022
31682cf
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 15, 2022
aa06dc6
refactor yolov7
wjj19950828 Nov 16, 2022
4129408
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 16, 2022
9c5f766
add yolov7 testcase
wjj19950828 Nov 16, 2022
e39d60a
rm resize_after_load and add is_scale_up
wjj19950828 Nov 17, 2022
9204e78
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 17, 2022
bb1b8fc
fixed bug
wjj19950828 Nov 17, 2022
4d4117a
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 17, 2022
ae21139
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 17, 2022
5f7b935
set multi_label true
wjj19950828 Nov 17, 2022
5746cc2
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 17, 2022
6fabf86
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 17, 2022
eff67e3
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 18, 2022
845f7a6
optimize rvm preprocess
wjj19950828 Nov 22, 2022
1f5dcfb
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 22, 2022
e7e7fa3
Merge branch 'develop' into refactor_yolov7
jiangjiajun Nov 22, 2022
2cff499
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 22, 2022
9f3f2b8
Merge branch 'refactor_yolov7' of https://github.com/wjj19950828/Fast…
wjj19950828 Nov 22, 2022
8489624
optimizer rvm postprocess
wjj19950828 Nov 23, 2022
8211bec
resolve conflict
wjj19950828 Nov 23, 2022
f1d23c8
fixed bug
wjj19950828 Nov 23, 2022
a460206
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Nov 25, 2022
4ca1a7e
deal with comments
wjj19950828 Nov 25, 2022
44d5ae7
fixed bugs
wjj19950828 Dec 3, 2022
1650b3d
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Dec 3, 2022
ed617b9
add gpu ov for benchmark
wjj19950828 Dec 3, 2022
20780b3
Merge remote-tracking branch 'upstream/develop' into refactor_yolov7
wjj19950828 Dec 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions benchmark/benchmark_ppcls.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ def build_option(args):
option.use_ort_backend()
elif backend == "paddle":
option.use_paddle_backend()
elif backend == "ov":
option.use_openvino_backend()
option.set_openvino_device(name="GPU")
# change name and shape for models
option.set_openvino_shape_info({"x": [1, 3, 224, 224]})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里把默认的都改成GPU了吗?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在device为gpu且backend为ov时,才会开启GPU的ov

elif backend in ["trt", "paddle_trt"]:
option.use_trt_backend()
if backend == "paddle_trt":
Expand Down
11 changes: 11 additions & 0 deletions benchmark/benchmark_ppdet.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ def build_option(args):
option.use_ort_backend()
elif backend == "paddle":
option.use_paddle_backend()
elif backend == "ov":
option.use_openvino_backend()
# Using GPU and CPU heterogeneous execution mode
option.set_openvino_device("HETERO:GPU,CPU")
# change name and shape for models
option.set_openvino_shape_info({
"image": [1, 3, 320, 320],
"scale_factor": [1, 2]
})
# Set CPU up operator
option.set_openvino_cpu_operators(["MulticlassNms"])
elif backend in ["trt", "paddle_trt"]:
option.use_trt_backend()
if backend == "paddle_trt":
Expand Down
5 changes: 5 additions & 0 deletions benchmark/benchmark_ppseg.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ def build_option(args):
option.use_ort_backend()
elif backend == "paddle":
option.use_paddle_backend()
elif backend == "ov":
option.use_openvino_backend()
option.set_openvino_device(name="GPU") # use gpu
# change name and shape for models
option.set_openvino_shape_info({"x": [1, 3, 512, 512]})
elif backend in ["trt", "paddle_trt"]:
option.use_trt_backend()
if backend == "paddle_trt":
Expand Down
5 changes: 5 additions & 0 deletions benchmark/benchmark_yolo.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ def build_option(args):
option.use_ort_backend()
elif backend == "paddle":
option.use_paddle_backend()
elif backend == "ov":
option.use_openvino_backend()
option.set_openvino_device(name="GPU")
# change name and shape for models
option.set_openvino_shape_info({"images": [1, 3, 640, 640]})
elif backend in ["trt", "paddle_trt"]:
option.use_trt_backend()
if backend == "paddle_trt":
Expand Down
Empty file modified examples/vision/detection/paddledetection/cpp/infer_ppyoloe.cc
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions fastdeploy/backends/openvino/ov_backend.cc
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ bool OpenVINOBackend::InitFromPaddle(const std::string& model_file,
}

ov::AnyMap properties;
if (option_.cpu_thread_num > 0) {
if (option_.device == "CPU" && option_.cpu_thread_num > 0) {
properties["INFERENCE_NUM_THREADS"] = option_.cpu_thread_num;
}
if (option_.device == "CPU") {
Expand Down Expand Up @@ -306,7 +306,7 @@ bool OpenVINOBackend::InitFromOnnx(const std::string& model_file,
}

ov::AnyMap properties;
if (option_.cpu_thread_num > 0) {
if (option_.device == "CPU" && option_.cpu_thread_num > 0) {
properties["INFERENCE_NUM_THREADS"] = option_.cpu_thread_num;
}
if (option_.device == "CPU") {
Expand Down