apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-05 16:48:03 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Bug Fix] fix libomp.so not found error (#715)

Browse Source 
* [Android] Add VisSegmentation NEON support

* [ARM] change vqaddq_u8 -> vaddq_u8

* [ARM] change vqaddq_u8 -> vaddq_u8

* [Bug Fix] add FDASSERT

* update assert info

* add QuantizeBlendingWeight8

* Update QuantizeBlendingWeight8

* Update VisSegmentation

* [Visualize] add DefaultVisualizeType and EnableFastVisuzlie

* fix typos

* fix typo

* Update VisSegmentation

* [Android] Add omp parallel support for Android

* Add omp schedule(static)

* [Bug Fix] fix libomp.so not found error
This commit is contained in:
DefTruth
2022-11-28 13:32:28 +08:00
committed by GitHub
parent 95036392e7
commit 2a7705d7e8
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -68,6 +68,7 @@ option(WITH_TESTING "Whether to compile with unittest." OFF)
############################# Options for Android cross compiling ######################### ############################# Options for Android cross compiling #########################
option(WITH_OPENCV_STATIC "Use OpenCV static lib for Android." OFF) option(WITH_OPENCV_STATIC "Use OpenCV static lib for Android." OFF)
option(WITH_LITE_STATIC "Use Paddle Lite static lib for Android." OFF) option(WITH_LITE_STATIC "Use Paddle Lite static lib for Android." OFF)
option(WITH_OPENMP "Use OpenMP support for Android." OFF)
# Please don't open this flag now, some bugs exists. # Please don't open this flag now, some bugs exists.
# Only support Linux Now # Only support Linux Now
@@ -489,13 +490,16 @@ if(MSVC)
target_compile_options(${LIBRARY_NAME} PRIVATE "$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CXX>>:/wd4251>$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CUDA>>:-Xcompiler=/wd4251>") target_compile_options(${LIBRARY_NAME} PRIVATE "$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CXX>>:/wd4251>$<$<BUILD_INTERFACE:$<COMPILE_LANGUAGE:CUDA>>:-Xcompiler=/wd4251>")
endif() endif()
if (ANDROID) # extra depend libs for android
if(ANDROID)
find_library(log-lib log) find_library(log-lib log)
list(APPEND DEPEND_LIBS ${log-lib}) list(APPEND DEPEND_LIBS ${log-lib})
if(WITH_OPENMP)
find_package(OpenMP) find_package(OpenMP)
if(OpenMP_CXX_FOUND) if(OpenMP_CXX_FOUND)
list(APPEND DEPEND_LIBS OpenMP::OpenMP_CXX) list(APPEND DEPEND_LIBS OpenMP::OpenMP_CXX)
endif() endif()
endif()
endif() endif()
target_link_libraries(${LIBRARY_NAME} ${DEPEND_LIBS}) target_link_libraries(${LIBRARY_NAME} ${DEPEND_LIBS})

5
java/android/fastdeploy/build.gradle
View File

@@ -31,6 +31,11 @@ android {
version "3.10.2" version "3.10.2"
} }
} }
sourceSets {
main {
jniLibs.srcDirs = ['libs']
}
}
ndkVersion '20.1.5948944' ndkVersion '20.1.5948944'
} }