Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify API Result Docs #112

Merged
merged 124 commits into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
1684b05
first commit for yolov7
ziqi-jin Jul 13, 2022
71c00d9
pybind for yolov7
ziqi-jin Jul 14, 2022
21ab2f9
CPP README.md
ziqi-jin Jul 14, 2022
d63e862
CPP README.md
ziqi-jin Jul 14, 2022
7b3b0e2
modified yolov7.cc
ziqi-jin Jul 14, 2022
d039e80
README.md
ziqi-jin Jul 15, 2022
a34a815
python file modify
ziqi-jin Jul 18, 2022
eb010a8
merge test
ziqi-jin Jul 18, 2022
39f64f2
delete license in fastdeploy/
ziqi-jin Jul 18, 2022
d071b37
repush the conflict part
ziqi-jin Jul 18, 2022
d5026ca
README.md modified
ziqi-jin Jul 18, 2022
fb376ad
README.md modified
ziqi-jin Jul 18, 2022
4b8737c
file path modified
ziqi-jin Jul 18, 2022
ce922a0
file path modified
ziqi-jin Jul 18, 2022
6e00b82
file path modified
ziqi-jin Jul 18, 2022
8c359fb
file path modified
ziqi-jin Jul 18, 2022
906c730
file path modified
ziqi-jin Jul 18, 2022
80c1223
README modified
ziqi-jin Jul 18, 2022
6072757
README modified
ziqi-jin Jul 18, 2022
2c6e6a4
move some helpers to private
ziqi-jin Jul 18, 2022
48136f0
add examples for yolov7
ziqi-jin Jul 18, 2022
6feca92
api.md modified
ziqi-jin Jul 18, 2022
ae70d4f
api.md modified
ziqi-jin Jul 18, 2022
f591b85
api.md modified
ziqi-jin Jul 18, 2022
f0def41
YOLOv7
ziqi-jin Jul 18, 2022
15b9160
yolov7 release link
ziqi-jin Jul 18, 2022
4706e8c
yolov7 release link
ziqi-jin Jul 18, 2022
dc83584
yolov7 release link
ziqi-jin Jul 18, 2022
086debd
copyright
ziqi-jin Jul 18, 2022
4f980b9
change some helpers to private
ziqi-jin Jul 18, 2022
2e61c95
Merge branch 'develop' into develop
ziqi-jin Jul 19, 2022
80beadf
change variables to const and fix documents.
ziqi-jin Jul 19, 2022
8103772
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 19, 2022
f5f7a86
gitignore
ziqi-jin Jul 19, 2022
e6cec25
Transfer some funtions to private member of class
ziqi-jin Jul 19, 2022
e25e4f2
Transfer some funtions to private member of class
ziqi-jin Jul 19, 2022
e8a8439
Merge from develop (#9)
ziqi-jin Jul 20, 2022
a182893
first commit for yolor
ziqi-jin Jul 20, 2022
3aa015f
for merge
ziqi-jin Jul 20, 2022
d6b98aa
Develop (#11)
ziqi-jin Jul 20, 2022
871cfc6
Merge branch 'yolor' into develop
ziqi-jin Jul 20, 2022
013921a
Yolor (#16)
ziqi-jin Jul 21, 2022
7a5a6d9
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 21, 2022
c996117
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 22, 2022
0aefe32
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 26, 2022
2330414
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 26, 2022
4660161
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 27, 2022
033c18e
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 28, 2022
6c94d65
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 28, 2022
85fb256
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Jul 29, 2022
90ca4cb
add is_dynamic for YOLO series (#22)
ziqi-jin Jul 29, 2022
f6a4ed2
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 1, 2022
3682091
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 3, 2022
ca1e110
Merge remote-tracking branch 'upstream/develop' into develop
ziqi-jin Aug 8, 2022
93ba6a6
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 9, 2022
767842e
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 10, 2022
cc32733
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 10, 2022
3590990
first commit test photo
ziqi-jin Aug 10, 2022
09c64ef
yolov7 doc
ziqi-jin Aug 10, 2022
1915499
yolov7 doc
ziqi-jin Aug 10, 2022
c3cd455
yolov7 doc
ziqi-jin Aug 10, 2022
4c05253
yolov7 doc
ziqi-jin Aug 10, 2022
49486ce
add yolov5 docs
ziqi-jin Aug 10, 2022
6034490
modify yolov5 doc
ziqi-jin Aug 10, 2022
08bf982
first commit for retinaface
ziqi-jin Aug 10, 2022
5e95180
first commit for retinaface
ziqi-jin Aug 10, 2022
80d1ca6
firt commit for ultraface
ziqi-jin Aug 10, 2022
4b97d57
firt commit for ultraface
ziqi-jin Aug 10, 2022
7924e7e
firt commit for yolov5face
ziqi-jin Aug 10, 2022
1728856
firt commit for modnet and arcface
ziqi-jin Aug 10, 2022
3d83654
firt commit for modnet and arcface
ziqi-jin Aug 10, 2022
b53179d
first commit for partial_fc
ziqi-jin Aug 10, 2022
d2a12d1
first commit for partial_fc
ziqi-jin Aug 10, 2022
2aecb96
first commit for yolox
ziqi-jin Aug 10, 2022
7165e0e
first commit for yolov6
ziqi-jin Aug 10, 2022
1c7a578
first commit for nano_det
ziqi-jin Aug 10, 2022
d6a4289
first commit for scrfd
ziqi-jin Aug 11, 2022
dba0368
first commit for scrfd
ziqi-jin Aug 11, 2022
ed5ea33
first commit for retinaface
ziqi-jin Aug 11, 2022
53a89a7
first commit for ultraface
ziqi-jin Aug 11, 2022
c335b6b
first commit for yolov5face
ziqi-jin Aug 11, 2022
2771a3b
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 11, 2022
6ce781e
first commit for yolox yolov6 nano
ziqi-jin Aug 11, 2022
e1c6520
rm jpg
ziqi-jin Aug 11, 2022
483c4ef
first commit for modnet and modify nano
ziqi-jin Aug 11, 2022
a1e29ac
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 11, 2022
5ecc6fe
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 11, 2022
f72fef7
Merge branch 'test_pr_infer' into test_pr
ziqi-jin Aug 11, 2022
217bb39
yolor scaledyolov4 v5lite
ziqi-jin Aug 11, 2022
de3b4de
first commit for insightface
ziqi-jin Aug 11, 2022
eecf5ce
first commit for insightface
ziqi-jin Aug 11, 2022
c04773f
first commit for insightface
ziqi-jin Aug 11, 2022
6a7ed21
docs
ziqi-jin Aug 12, 2022
46497fb
docs
ziqi-jin Aug 12, 2022
fa29760
docs
ziqi-jin Aug 12, 2022
d76a4b7
docs
ziqi-jin Aug 12, 2022
569b4e4
docs
ziqi-jin Aug 12, 2022
1c6c992
add print for detect and modify docs
ziqi-jin Aug 12, 2022
16eb939
docs
ziqi-jin Aug 12, 2022
7219015
docs
ziqi-jin Aug 12, 2022
a1fbc84
docs
ziqi-jin Aug 12, 2022
9ddb5d2
docs test for insightface
ziqi-jin Aug 12, 2022
af3d357
docs test for insightface again
ziqi-jin Aug 12, 2022
eb0b421
docs test for insightface
ziqi-jin Aug 12, 2022
bc53d99
modify all wrong expressions in docs
ziqi-jin Aug 12, 2022
87cb228
modify all wrong expressions in docs
ziqi-jin Aug 12, 2022
b9ef49d
Merge branch 'develop' into test_pr
jiangjiajun Aug 12, 2022
bc7b362
modify all wrong expressions in docs
ziqi-jin Aug 12, 2022
f7e6a70
Merge branch 'test_pr' of github.com:ziqi-jin/FastDeploy into test_pr
ziqi-jin Aug 12, 2022
c68da87
modify all wrong expressions in docs
ziqi-jin Aug 12, 2022
2780588
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 12, 2022
5c542af
Merge branch 'newest' into fix_conflict
ziqi-jin Aug 12, 2022
2f80a40
modify docs expressions
ziqi-jin Aug 14, 2022
da2b481
Merge remote-tracking branch 'origin/test_pr' into fix_conflict
ziqi-jin Aug 14, 2022
a57c430
fix expression of detection part
ziqi-jin Aug 15, 2022
9d14b11
fix expression of detection part
ziqi-jin Aug 15, 2022
7000178
fix expression of detection part
ziqi-jin Aug 15, 2022
727b6f6
Merge branch 'develop' into fix_conflict
jiangjiajun Aug 15, 2022
5940f61
add face recognition result doc
ziqi-jin Aug 15, 2022
ea7f142
modify result docs
ziqi-jin Aug 15, 2022
964606b
modify result docs
ziqi-jin Aug 15, 2022
81ca1c3
modify result docs
ziqi-jin Aug 15, 2022
c00be81
Merge branch 'PaddlePaddle:develop' into develop
ziqi-jin Aug 15, 2022
71e3717
Merge pull request #31 from ziqi-jin/develop
ziqi-jin Aug 15, 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: 3 additions & 2 deletions docs/api/vision_results/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ FastDeploy根据视觉模型的任务类型,定义了不同的结构体(`csrcs
| :----- | :--- | :---- | :------- |
| ClassificationResult | [C++/Python文档](./classification_result.md) | 图像分类返回结果 | ResNet50、MobileNetV3等 |
| DetectionResult | [C++/Python文档](./detection_result.md) | 目标检测返回结果 | PPYOLOE、YOLOv7系列模型等 |
| FaceDetectionResult | [C++/Python文档](./face_detection_result.md) | 目标检测返回结果 | PPYOLOE、YOLOv7系列模型等 |
| MattingResult | [C++/Python文档](./matting_result.md) | 目标检测返回结果 | PPYOLOE、YOLOv7系列模型等 |
| FaceDetectionResult | [C++/Python文档](./face_detection_result.md) | 目标检测返回结果 | SCRFD、RetinaFace系列模型等 |
| FaceRecognitionResult | [C++/Python文档](./face_recognition_result.md) | 目标检测返回结果 | ArcFace、CosFace系列模型等 |
| MattingResult | [C++/Python文档](./matting_result.md) | 目标检测返回结果 | MODNet系列模型等 |
4 changes: 2 additions & 2 deletions docs/api/vision_results/classification_result.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ClassifyResult代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明图像的分类结果和置信度。

## C++ 结构体
## C++ 定义

`fastdeploy::vision::ClassifyResult`

Expand All @@ -20,7 +20,7 @@ struct ClassifyResult {
- **Clear()**: 成员函数,用于清除结构体中存储的结果
- **Str()**: 成员函数,将结构体中的信息以字符串形式输出(用于Debug)

## Python结构体
## Python 定义

`fastdeploy.vision.ClassifyResult`

Expand Down
6 changes: 3 additions & 3 deletions docs/api/vision_results/detection_result.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DetectionResult代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明图像检测出来的目标框、目标类别和目标置信度。

## C++ 结构体
## C++ 定义

`fastdeploy::vision::DetectionResult`

Expand All @@ -22,10 +22,10 @@ struct DetectionResult {
- **Clear()**: 成员函数,用于清除结构体中存储的结果
- **Str()**: 成员函数,将结构体中的信息以字符串形式输出(用于Debug)

## Python结构体
## Python 定义

`fastdeploy.vision.DetectionResult`

- **boxes**(list of list(float)): 成员变量,表示单张图片检测出来的所有目标框坐标。boxes是一个list,其每个元素为一个长度为4的list, 表示为一个框,每个框以4个float数值依次表示xmin, ymin, xmax, ymax, 即左上角和右下角坐标
- **scores**(list of float): 成员变量,表示单张图片检测出来的所有目标置信度
- **label_ids(list of int): 成员变量,表示单张图片检测出来的所有目标类别
- **label_ids**(list of int): 成员变量,表示单张图片检测出来的所有目标类别
8 changes: 4 additions & 4 deletions docs/api/vision_results/face_detection_result.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# FaceDetectionResult 人脸检测结果

FaceDetectionResult 代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明图像检测出来的目标框、目标类别和目标置信度
FaceDetectionResult 代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明人脸检测出来的目标框、人脸landmarks,目标置信度和每张人脸的landmark数量

## C++ 结构体
## C++ 定义

`fastdeploy::vision::FaceDetectionResult`

Expand All @@ -11,7 +11,6 @@ struct FaceDetectionResult {
std::vector<std::array<float, 4>> boxes;
std::vector<std::array<float, 2>> landmarks;
std::vector<float> scores;
ResultType type = ResultType::FACE_DETECTION;
int landmarks_per_face;
void Clear();
std::string Str();
Expand All @@ -25,10 +24,11 @@ struct FaceDetectionResult {
- **Clear()**: 成员函数,用于清除结构体中存储的结果
- **Str()**: 成员函数,将结构体中的信息以字符串形式输出(用于Debug)

## Python结构体
## Python 定义

`fastdeploy.vision.FaceDetectionResult`

- **boxes**(list of list(float)): 成员变量,表示单张图片检测出来的所有目标框坐标。boxes是一个list,其每个元素为一个长度为4的list, 表示为一个框,每个框以4个float数值依次表示xmin, ymin, xmax, ymax, 即左上角和右下角坐标
- **scores**(list of float): 成员变量,表示单张图片检测出来的所有目标置信度
- **landmarks**: 成员变量,表示单张图片检测出来的所有人脸的关键点
- **landmarks_per_face**: 成员变量,表示每个人脸框中的关键点的数量。
24 changes: 24 additions & 0 deletions docs/api/vision_results/face_recognition_result.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# FaceRecognitionResult 人脸识别结果

FaceRecognitionResult 代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明人脸识别模型对图像特征的embedding。
## C++ 定义

`fastdeploy::vision::FaceRecognitionResult`

```
struct FaceRecognitionResult {
std::vector<float> embedding;
void Clear();
std::string Str();
};
```

- **embedding**: 成员变量,表示人脸识别模型最终的提取的特征embedding,可以用来计算人脸之间的特征相似度。
- **Clear()**: 成员函数,用于清除结构体中存储的结果
- **Str()**: 成员函数,将结构体中的信息以字符串形式输出(用于Debug)

## Python 定义

`fastdeploy.vision.FaceRecognitionResult`

- **embedding**: 成员变量,表示人脸识别模型最终提取的特征embedding,可以用来计算人脸之间的特征相似度。
10 changes: 5 additions & 5 deletions docs/api/vision_results/matting_result.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# MattingResult 抠图结果

MattingResult 代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明图像检测出来的目标框、目标类别和目标置信度
MattingResult 代码定义在`csrcs/fastdeploy/vision/common/result.h`中,用于表明模型预测的alpha透明度的值,预测的前景等

## C++ 结构体
## C++ 定义

`fastdeploy::vision::MattingResult`

```
struct MattingResult {
std::vector<float> alpha; // h x w
std::vector<float> foreground; // h x w x c (c=3 default)
std::vector<float> alpha;
std::vector<float> foreground;
std::vector<int64_t> shape;
bool contain_foreground = false;
void Clear();
Expand All @@ -25,7 +25,7 @@ struct MattingResult {
- **Str()**: 成员函数,将结构体中的信息以字符串形式输出(用于Debug)


## Python结构体
## Python 定义

`fastdeploy.vision.MattingResult`

Expand Down
1 change: 1 addition & 0 deletions examples/vision/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
| Segmentation | 语义分割,输入图像,给出图像中每个像素的分类及置信度 | [SegmentationResult](../../docs/api/vision_results/segmentation_result.md) |
| Classification | 图像分类,输入图像,给出图像的分类结果和置信度 | [ClassifyResult](../../docs/api/vision_results/classification_result.md) |
| FaceDetection | 人脸检测,输入图像,检测图像中人脸位置,并返回检测框坐标及人脸关键点 | [FaceDetectionResult](../../docs/api/vision_results/face_detection_result.md) |
| FaceRecognition | 人脸识别,输入图像,返回可用于相似度计算的人脸特征的embedding | [FaceRecognitionResult](../../docs/api/vision_results/face_recognition_result.md) |
| Matting | 抠图,输入图像,返回图片的前景每个像素点的Alpha值 | [MattingResult](../../docs/api/vision_results/matting_result.md) |
## FastDeploy API设计

Expand Down