Skip to content

Commit dd19eb9

Browse files
committed
Merge remote-tracking branch 'official/develop' into feat/optimize_ppstructurev3
2 parents 47fed33 + c7e439b commit dd19eb9

File tree

840 files changed

+2994
-918
lines changed

Some content is hidden

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

840 files changed

+2994
-918
lines changed

.precommit/check_imports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"pyclipper": "pyclipper",
6666
"pycocotools": "pycocotools",
6767
"pydantic": "pydantic",
68-
"fitz": "PyMuPDF",
68+
"pypdfium2": "pypdfium2",
6969
"yaml": "PyYAML",
7070
"regex": "regex",
7171
"requests": "requests",

docs/module_usage/tutorials/ocr_modules/formula_recognition.en.md

Lines changed: 23 additions & 1 deletion

docs/module_usage/tutorials/ocr_modules/formula_recognition.md

Lines changed: 23 additions & 1 deletion

docs/module_usage/tutorials/ocr_modules/layout_detection.en.md

Lines changed: 26 additions & 1 deletion

docs/module_usage/tutorials/ocr_modules/layout_detection.md

Lines changed: 30 additions & 2 deletions

docs/support_list/models_list.md

Lines changed: 74 additions & 0 deletions

libs/ultra-infer/CMakeLists.txt

100755100644
File mode changed.

libs/ultra-infer/LICENSE

100755100644
File mode changed.

libs/ultra-infer/ThirdPartyNotices.txt

100755100644
File mode changed.

libs/ultra-infer/UltraInfer.cmake.in

100755100644
File mode changed.

libs/ultra-infer/UltraInferCSharp.cmake.in

100755100644
File mode changed.

libs/ultra-infer/VERSION_NUMBER

100755100644
File mode changed.

libs/ultra-infer/cmake/UltraInferConfig.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/ascend.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/build_paddle2onnx.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/build_tools.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/check.cmake

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ if(IOS)
2626
message(FATAL_ERROR "Not support OpenVINO backend for IOS now. Please set ENABLE_OPENVINO_BACKEND=OFF.")
2727
endif()
2828
if(ENABLE_TRT_BACKEND)
29-
message(FATAL_ERROR "Not support TensorRT backend for Andorid/IOS now. Please set ENABLE_TRT_BACKEND=OFF.")
29+
message(FATAL_ERROR "Not support TensorRT backend for Android/IOS now. Please set ENABLE_TRT_BACKEND=OFF.")
3030
endif()
3131
endif()
3232

3333
if(WITH_GPU)
3434
if(APPLE)
35-
message(FATAL_ERROR "Cannot enable GPU while compling in Mac OSX.")
35+
message(FATAL_ERROR "Cannot enable GPU while compiling in Mac OSX.")
3636
elseif(IOS)
37-
message(FATAL_ERROR "Cannot enable GPU while compling in IOS.")
37+
message(FATAL_ERROR "Cannot enable GPU while compiling in IOS.")
3838
endif()
3939
endif()
4040

4141
if(WITH_OPENCL)
4242
if(NOT ENABLE_LITE_BACKEND)
43-
message(FATAL_ERROR "Cannot enable OpenCL while compling unless in Paddle Lite backend is enbaled.")
43+
message(FATAL_ERROR "Cannot enable OpenCL while compiling unless in Paddle Lite backend is enabled.")
4444
endif()
4545
endif()

libs/ultra-infer/cmake/config_cpack.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/cuda.cmake

100755100644
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(BUILD_ON_JETSON)
1010
set(fd_known_gpu_archs "53 62 72")
1111
set(fd_known_gpu_archs10 "53 62 72")
1212
else()
13-
message("Using New Release Strategy - All Arches Packge")
13+
message("Using New Release Strategy - All Arches Package")
1414
set(fd_known_gpu_archs "35 50 52 60 61 70 75 80 86")
1515
set(fd_known_gpu_archs10 "35 50 52 60 61 70 75")
1616
set(fd_known_gpu_archs11 "50 60 61 70 75 80")
@@ -58,7 +58,7 @@ function(detect_installed_gpus out_variable)
5858
set(CUDA_gpu_detect_output
5959
${nvcc_out}
6060
CACHE INTERNAL
61-
"Returned GPU architetures from detect_installed_gpus tool"
61+
"Returned GPU architectures from detect_installed_gpus tool"
6262
FORCE)
6363
endif()
6464
endif()
@@ -98,7 +98,7 @@ function(select_nvcc_arch_flags out_variable)
9898
# set CUDA_ARCH_NAME strings (so it will be seen as dropbox in CMake-Gui)
9999
set(CUDA_ARCH_NAME
100100
${archs_name_default}
101-
CACHE STRING "Select target NVIDIA GPU achitecture.")
101+
CACHE STRING "Select target NVIDIA GPU architecture.")
102102
set_property(CACHE CUDA_ARCH_NAME PROPERTY STRINGS "" ${archs_names})
103103
mark_as_advanced(CUDA_ARCH_NAME)
104104

@@ -252,7 +252,7 @@ else()
252252
message(WARNING "Detected custom CMAKE_CUDA_STANDARD is using: ${CMAKE_CUDA_STANDARD}")
253253
endif()
254254

255-
# (Note) For windows, if delete /W[1-4], /W1 will be added defaultly and conflic with -w
255+
# (Note) For windows, if delete /W[1-4], /W1 will be added defaultly and conflict with -w
256256
# So replace /W[1-4] with /W0
257257
if(WIN32)
258258
string(REGEX REPLACE "/W[1-4]" " /W0 " CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS}")

libs/ultra-infer/cmake/cvcuda.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/faiss.cmake

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ else() # Linux
113113
list(APPEND FAISS_LIBRARIES ${LAPACK_LIBRARIES})
114114
endif()
115115

116-
# Add OpenMP (REQUIRED), OpenMP must be avaliable.
116+
# Add OpenMP (REQUIRED), OpenMP must be available.
117117
find_package(OpenMP REQUIRED)
118118
list(APPEND FAISS_LIBRARIES OpenMP::OpenMP_CXX)
119119

libs/ultra-infer/cmake/fast_tokenizer.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/flycv.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/gflags.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/glog.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/gtest.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/horizon.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/kunlunxin.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/onnxruntime.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/opencv.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/openvino.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/paddle2onnx.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/paddle_inference.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/paddlelite.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/poros.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/rknpu2.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/sophgo.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/summary.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/timvx.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/toolchain.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/tvm.cmake

100755100644
File mode changed.

libs/ultra-infer/cmake/utils.cmake

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function(bundle_static_library tgt_name bundled_tgt_name fake_target)
152152

153153
list(REMOVE_DUPLICATES static_libs)
154154
list(REMOVE_ITEM static_libs ${REDUNDANT_STATIC_LIBS})
155-
message(STATUS "WITH_STATIC_LIB=${WITH_STATIC_LIB}, Found all needed static libs from dependecy tree: ${static_libs}")
155+
message(STATUS "WITH_STATIC_LIB=${WITH_STATIC_LIB}, Found all needed static libs from dependency tree: ${static_libs}")
156156
message(STATUS "Exclude some redundant static libs: ${REDUNDANT_STATIC_LIBS}")
157157

158158
set(bundled_tgt_full_name

libs/ultra-infer/cpack/debian_postinst.in

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ case "$1" in
1616
LIBS_DIRECOTRIES[${#LIBS_DIRECOTRIES[@]}]=${SO_FILE%/*}
1717
done
1818

19-
# Remove the dumplicate directories
19+
# Remove the duplicate directories
2020
LIBS_DIRECOTRIES=($(awk -v RS=' ' '!a[$1]++' <<< ${LIBS_DIRECOTRIES[@]}))
2121

2222
IMPORT_PATH=""

libs/ultra-infer/cpack/debian_prerm.in

100755100644
File mode changed.

libs/ultra-infer/cpack/rpm_postinst.in

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for SO_FILE in $ALL_SO_FILES;do
1414
LIBS_DIRECOTRIES[${#LIBS_DIRECOTRIES[@]}]=${SO_FILE%/*}
1515
done
1616

17-
# Remove the dumplicate directories
17+
# Remove the duplicate directories
1818
LIBS_DIRECOTRIES=($(awk -v RS=' ' '!a[$1]++' <<< ${LIBS_DIRECOTRIES[@]}))
1919

2020
IMPORT_PATH=""

libs/ultra-infer/cpack/rpm_postrm.in

100755100644
File mode changed.

libs/ultra-infer/python/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/requirements.txt

100755100644
File mode changed.

libs/ultra-infer/python/scripts/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/scripts/build_gpu.sh

100755100644
File mode changed.

libs/ultra-infer/python/scripts/process_libraries.py.in

100755100644
File mode changed.

libs/ultra-infer/python/setup.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/c_lib_wrap.py.in

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/download.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/model.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/pipeline/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/pipeline/pptinypose/__init__.py

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def predict(self, input_image):
4040

4141
@property
4242
def detection_model_score_threshold(self):
43-
"""Atrribute of PPTinyPose pipeline model. Stating the score threshold for detectin model to filter bbox before inputting pptinypose model
43+
"""Attribute of PPTinyPose pipeline model. Stating the score threshold for detectin model to filter bbox before inputting pptinypose model
4444
4545
:return: value of detection_model_score_threshold(float)
4646
"""

libs/ultra-infer/python/ultra_infer/py_only/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/py_only/base.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/py_only/ts/__init__.py

100755100644
File mode changed.

libs/ultra-infer/python/ultra_infer/py_only/ts/model.py

100755100644
File mode changed.

0 commit comments

Comments
 (0)