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

[Release/1.0] Update version to 1.0.1 #802

Merged
merged 72 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
13fd52c
Update README_CN.md
leiqing1 Nov 29, 2022
8cac5d6
Update 报告issue.md
jiangjiajun Nov 29, 2022
2e29c57
Update README_CN.md
leiqing1 Nov 29, 2022
7dfdd7b
Update README_EN.md
leiqing1 Nov 29, 2022
a7de3e0
Update README_EN.md
leiqing1 Nov 29, 2022
30ccd37
Update README_CN.md (#745)
DefTruth Nov 29, 2022
fed3cfc
Update README_EN.md (#744)
DefTruth Nov 29, 2022
298a408
[Android] Update ui module structure. (#706)
WinterGeng Nov 29, 2022
19b99d3
[Other] Delete coco_label_list.txt (#748)
yunyaoXYY Nov 29, 2022
eb65e91
[Android] add enableCamera method app examples (#751)
WinterGeng Nov 30, 2022
3d8bda7
Update cpp.md
jiangjiajun Nov 30, 2022
0c52c3b
update version to 1.0.0
jiangjiajun Nov 30, 2022
3f8ed9b
add linux aarch64 library
jiangjiajun Nov 30, 2022
d95094c
[Diffusion] Add C++ dpm solver (#714)
joey12300 Nov 30, 2022
d7c4d72
[Doc] Update java/android README.md (#753)
DefTruth Nov 30, 2022
8399092
[Doc] Fix PP-OCRv2 Readme (#754)
yunyaoXYY Nov 30, 2022
e79dc86
[Doc][Serving]serving doc update version to 1.0.0 (#755)
heliqi Nov 30, 2022
9d78b1d
[Other] Fix compile error on linux aarch64 (#752)
jiangjiajun Nov 30, 2022
8e4a38c
[Android] Support PPTinyPose on Android (#746)
DefTruth Nov 30, 2022
d6e5c66
update main page for cpp docs
jiangjiajun Nov 30, 2022
d13a55b
Update download_prebuilt_libraries.md
jiangjiajun Nov 30, 2022
49061bf
[Compile] Fix compile with ninja (#761)
jiangjiajun Nov 30, 2022
9afb4d4
Update README_CN.md
leiqing1 Dec 1, 2022
63f60aa
[Android] Add PP-OCRv3 int8 docs and fix NULL cls result error (#762)
DefTruth Dec 1, 2022
5a0eaa1
[Compile] Fix compile on windows (#765)
jiangjiajun Dec 1, 2022
11995e5
[Bug Fix] Fix AdaptivePool2d for ORT (#767)
yeliang2258 Dec 1, 2022
0d53ebb
[Android] add app welcome page (#766)
WinterGeng Dec 1, 2022
4fd333f
[Bug Fix] Modify TRT dynamic shape in PP-OCRv2 example. (#769)
yunyaoXYY Dec 1, 2022
e811e9e
[Doc] API docs for Visualize module (#770)
ziqi-jin Dec 1, 2022
08cb335
Update README.md
jiangjiajun Dec 2, 2022
42c3e7c
Update README.md
jiangjiajun Dec 2, 2022
de0da9e
[Bug Fix] Modify TRT dynamic input shape for PP-OCRv2 python demo. (#…
yunyaoXYY Dec 2, 2022
136fa87
Update README_CN.md
leiqing1 Dec 2, 2022
9531e99
Update README_EN.md
leiqing1 Dec 2, 2022
d74e120
[Diffusion] Add StableDiffusionInpaint pipeline (#760)
joey12300 Dec 2, 2022
6c31198
[Other] Update deprecated segmentation apis && segmentation label map…
felixhjh Dec 5, 2022
8c2d582
[Backend]Add DisablePaddleTrtOPs (#788)
joey12300 Dec 5, 2022
1860d3a
[Benchmark] Add PPOCR benchmark (#771)
wjj19950828 Dec 5, 2022
a0caf9f
[Doc] Update PaddleSeg comments (#785)
felixhjh Dec 5, 2022
ea0bac4
[Benchmark] Add GPU OpenVIVO Option in benchmark (#786)
wjj19950828 Dec 5, 2022
8b2f231
[Android] change welcome page. (#792)
WinterGeng Dec 5, 2022
65f270d
[FastTokenizer] Support FastTokenizer on Android (#783)
DefTruth Dec 5, 2022
a88c6a6
Add trt backend
joey12300 Dec 5, 2022
c6d943b
[Doc] Fixed quantize.md (#795)
wjj19950828 Dec 5, 2022
763da98
Update README.md (#797)
HexToString Dec 5, 2022
104d965
[Backend] Add YOLOv5、PPYOLOE and PP-Liteseg for RV1126 (#647)
yeliang2258 Dec 5, 2022
cdae9f0
Update PULL_REQUEST_TEMPLATE.md
jiangjiajun Dec 5, 2022
50dd3c3
Add trt cache file
joey12300 Dec 5, 2022
fdea6f1
Add configs
joey12300 Dec 5, 2022
49559a8
Fix cv:resize bug
joey12300 Dec 5, 2022
ffea55e
[Bug Fix] add __aarch64__ to limit int64 in armv8 (#794)
DefTruth Dec 5, 2022
1080d35
Add example for initial noise input
joey12300 Dec 5, 2022
d3bf594
Update paddle inference version
joey12300 Dec 5, 2022
8b6bb17
[Compile] Force `GLIBCXX_USE_CXX11_ABI`=1 (#799)
jiangjiajun Dec 5, 2022
655145f
[Backend]update p2o version to 1.0.4 (#800)
yeliang2258 Dec 5, 2022
714bba8
Merge pull request #796 from joey12300/add_trt_backend_for_sd
joey12300 Dec 5, 2022
d0ee21a
Merge pull request #801 from joey12300/update_paddle_version
joey12300 Dec 5, 2022
17f5e22
[Android] add Android CI build scripts (#805)
DefTruth Dec 6, 2022
3ffb293
Create custom_opencv.md
jiangjiajun Dec 6, 2022
0d179af
Create custom_opencv.md
jiangjiajun Dec 6, 2022
89b30d9
Delete custom_opencv.md
jiangjiajun Dec 6, 2022
a1eec0e
Create custom_opencv.md
jiangjiajun Dec 6, 2022
b41e626
Update custom_opencv.md
jiangjiajun Dec 6, 2022
945998c
Update custom_opencv.md
jiangjiajun Dec 6, 2022
c4bb83e
Update custom_opencv.md
jiangjiajun Dec 6, 2022
a7dd481
Update README.md
jiangjiajun Dec 7, 2022
1921350
Update README.md
jiangjiajun Dec 7, 2022
13842e6
[Doc] Update RuntimeOption API docs (#813)
DefTruth Dec 7, 2022
e6af8f2
[Benchmark] Update the hardware monitoring method through Monitor cla…
wjj19950828 Dec 7, 2022
5df6248
[Bug Fix] add ocr new feature and fix codestyle (#764)
HexToString Dec 7, 2022
07833b7
[Bug Fix] Fix SortBoxes function for PPOCR det model (#814)
yunyaoXYY Dec 7, 2022
647d611
[Backend] Return paddle inference back to dev3 version (#824)
joey12300 Dec 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/报告issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ assignees: ''
- 性能问题,描述清楚对比的方式
- - 注意性能测试,循环跑N次,取后80%的用时平均(模型启动时,刚开始受限于资源分配,速度会较慢)
- - FastDeploy的Predict包含模型本身之外的数据前后处理用时
- 模型部署出错
- - 先执行`examples`下的部署示例,包括使用examples提供的模型,确认是否可以正确执行
- - 如若`examples`下的代码可以运行,但自己的模型,或自己的代码不能运行
- - - 提供自己的代码使用方式或自己的模型,供工程师快速定位问题
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
### PR types(PR类型)
<!-- One of PR types [ Model | Backend | Serving | Quantization | Doc | Bug Fix | Other] -->

### Describe
### Description
<!-- Describe what this PR does -->


18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
if(NOT MSVC)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "-Wno-format")
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
endif(NOT MSVC)

if(UNIX AND (NOT APPLE) AND (NOT ANDROID) AND (NOT ENABLE_TIMVX))
Expand Down Expand Up @@ -425,13 +426,6 @@ if(ENABLE_VISION)
endif()
endif()

if(ANDROID OR IOS)
if(ENABLE_TEXT)
set(ENABLE_TEXT OFF CACHE BOOL "Force ENABLE_TEXT OFF" FORCE)
message(STATUS "Found Android or IOS, force ENABLE_TEXT OFF. We do not support fast_tokenizer with Android/IOS now.")
endif()
endif()

if(ENABLE_TEXT)
add_definitions(-DENABLE_TEXT)
list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_TEXT_SRCS})
Expand Down Expand Up @@ -488,6 +482,8 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES VERSION ${FASTDEPLOY_VERSION})
if(MSVC)
# disable warnings for dll export
target_compile_options(${LIBRARY_NAME} PRIVATE "$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CXX>>:/wd4251>$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CUDA>>:-Xcompiler=/wd4251>")
file(GLOB FD_FILES_REQUIRE_BIGOBJ ${CSRCS_DIR_NAME}/fastdeploy/function/reduce.cc)
set_source_files_properties(${FD_FILES_REQUIRE_BIGOBJ} PROPERTIES COMPILE_FLAGS "/bigobj")
endif()

# extra depend libs for android
Expand All @@ -506,8 +502,12 @@ target_link_libraries(${LIBRARY_NAME} ${DEPEND_LIBS})

if(WIN32)
if(ENABLE_VISION)
add_custom_target(copy_yaml_library ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/third_party/yaml-cpp/Release ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/yaml-cpp/lib DEPENDS ${LIBRARY_NAME})
add_custom_target(copy_yaml_include ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/yaml-cpp/include DEPENDS ${LIBRARY_NAME})
if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
add_custom_target(copy_yaml_library ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/third_party/yaml-cpp ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/yaml-cpp/lib DEPENDS ${LIBRARY_NAME})
else()
add_custom_target(copy_yaml_library ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/third_party/yaml-cpp/Release ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/yaml-cpp/lib DEPENDS ${LIBRARY_NAME})
add_custom_target(copy_yaml_include ALL COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/yaml-cpp/include DEPENDS ${LIBRARY_NAME})
endif()
endif()
endif()

Expand Down
22 changes: 16 additions & 6 deletions FastDeploy.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ list(APPEND FASTDEPLOY_INCS ${CMAKE_CURRENT_LIST_DIR}/include)
# Note(zhoushunjie): include some useful utils function
include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake)

if(NOT CMAKE_CXX_STANDARD)
# Set C++11 as standard for the whole project
if(NOT MSVC)
set(CMAKE_CXX_STANDARD 11)
endif()
set(CMAKE_CXX_FLAGS "-Wno-format")
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
endif(NOT MSVC)

if(ANDROID)
add_library(fastdeploy STATIC IMPORTED GLOBAL)
Expand Down Expand Up @@ -210,11 +213,18 @@ endif()

if (ENABLE_TEXT)
if(ANDROID)
message(FATAL_ERROR "Not support fastdeploy text APIs with Android now!")
if(NOT ANDROID_TOOLCHAIN MATCHES "clang")
message(FATAL_ERROR "Currently, only support clang toolchain while cross compiling FastDeploy for Android with FastTokenizer, but found ${ANDROID_TOOLCHAIN}.")
endif()
add_library(core_tokenizers STATIC IMPORTED GLOBAL)
set_property(TARGET core_tokenizers PROPERTY IMPORTED_LOCATION
${CMAKE_CURRENT_LIST_DIR}/third_libs/install/fast_tokenizer/lib/${ANDROID_ABI}/libcore_tokenizers.so)
list(APPEND FASTDEPLOY_LIBS core_tokenizers)
else()
# Add dependency libs later: Linux/Mac/Win/...
find_library(FAST_TOKENIZER_LIB core_tokenizers ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/fast_tokenizer/lib NO_DEFAULT_PATH)
list(APPEND FASTDEPLOY_LIBS ${FAST_TOKENIZER_LIB})
endif()
# Add dependency libs later
find_library(FAST_TOKENIZER_LIB core_tokenizers ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/fast_tokenizer/lib NO_DEFAULT_PATH)
list(APPEND FASTDEPLOY_LIBS ${FAST_TOKENIZER_LIB})
list(APPEND FASTDEPLOY_INCS ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/fast_tokenizer/include)
list(APPEND FASTDEPLOY_INCS ${CMAKE_CURRENT_LIST_DIR}/third_libs/install/fast_tokenizer/third_party/include)
endif()
Expand Down
11 changes: 5 additions & 6 deletions README_CN.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

* **📲 移动端和端侧部署**

* [Paddle Lite NPU部署](#fastdeploy-edge-sdk-npu)
* [端侧模型支持列表](#fastdeploy-edge-models)

* **🌐 Web和小程序部署**
Expand All @@ -69,8 +68,8 @@

<div id="fastdeploy-quick-start-python"></div>

<details close>
<details close>

<summary><b>Python SDK快速开始(点开查看详情)</b></summary><div>

#### 快速安装
Expand Down Expand Up @@ -132,7 +131,7 @@ cv2.imwrite("vis_image.jpg", vis_im)
<div id="fastdeploy-quick-start-cpp"></div>

<details close>

<summary><b>C++ SDK快速开始(点开查看详情)</b></summary><div>


Expand Down Expand Up @@ -256,7 +255,7 @@ int main(int argc, char* argv[]) {
| Video Super-Resolution | [PaddleGAN/PP-MSVSR](./examples/vision/sr/ppmsvsr) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ✅ | ❔ | ❔ |
| Information Extraction | [PaddleNLP/UIE](./examples/text/uie) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ✅ | ❔ | |
| NLP | [PaddleNLP/ERNIE-3.0](./examples/text/ernie-3.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | ❔ | ✅ |
| Speech | [PaddleSpeech/PP-TTS](./examples/text/uie) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | -- | ✅ |
| Speech | [PaddleSpeech/PP-TTS](./examples/audio/pp-tts) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | -- | ✅ |


</div></details>
Expand All @@ -275,7 +274,7 @@ int main(int argc, char* argv[]) {
<img src="https://user-images.githubusercontent.com/54695910/198619323-c9b1cbce-1c1c-4f92-9737-4805c7c0ff2f.png" />
</div>

| 任务场景 | 模型 | 大小(MB) | Linux | Android | iOS | Linux | Linux | Linux | Linux | 更新中... |
| 任务场景 | 模型 | 大小(MB) | Linux | Android | Linux | Linux | Linux | Linux | Linux | 更新中... |
|:------------------:|:-----------------------------------------------------------------------------------------:|:--------:|:-------:|:-------:|:-------:|:-----------------------:|:------------------------------:|:---------------------------:|:--------------------------------:|:-------:|
| --- | --- | --- | ARM CPU | ARM CPU | 瑞芯微NPU<br>RK3568/RK3588 | 瑞芯微NPU<br>RV1109/RV1126/RK1808 | 晶晨NPU <br>A311D/S905D/C308X | 恩智浦NPU<br>i.MX&nbsp;8M&nbsp;Plus | 更新中...| |
| Classification | [PaddleClas/ResNet50](examples/vision/classification/paddleclas) | 98 | ✅ | ✅ | ❔ | ✅ | | | |
Expand Down
2 changes: 1 addition & 1 deletion README_EN.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ Notes: ✅: already supported; ❔: to be supported in the future; N/A: Not Ava
| Video Super-Resolution | [PaddleGAN/PP-MSVSR](./examples/vision/sr/ppmsvsr) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ✅ | ❔ | ❔ |
| Information Extraction | [PaddleNLP/UIE](./examples/text/uie) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ✅ | ❔ | |
| NLP | [PaddleNLP/ERNIE-3.0](./examples/text/ernie-3.0) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | ❔ | ✅ |
| Speech | [PaddleSpeech/PP-TTS](./examples/text/uie) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | -- | ✅ |
| Speech | [PaddleSpeech/PP-TTS](./examples/audio/pp-tts) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | ❔ | -- | ✅ |

</div></details>

Expand Down
Loading