p04896132
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!46507 Fix dvpp utils undefined symbol error. 

Merge pull request !46507 from youshu/ys_dvpp_symbol_2_0
This commit is contained in:
i-robot 2022-12-09 01:14:25 +00:00 committed by Gitee
parent b0e97f81bf 89b7831cd5
commit 48fe0dd804
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/utils/CMakeLists.txt
View File

@ -29,7 +29,7 @@ add_library(dvpp_utils SHARED ${DVPP_UTILS_SRC})
if(MSLITE_ENABLE_ACL)
find_library(acl_dvpp libacl_dvpp.so ${ASCEND_CANN_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH})
find_library(acl libascendcl.so ${ASCEND_CANN_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH})
target_link_libraries(dvpp_utils PRIVATE ${acl} ${acl_dvpp} mindspore_core)
target_link_libraries(dvpp_utils PRIVATE minddata-lite ${acl} ${acl_dvpp} mindspore_core)
else()
target_link_libraries(dvpp_utils PRIVATE _c_dataengine ${ACL} ${ACL_DVPP} mindspore_core mindspore_shared_lib)
endif()

15
mindspore/lite/minddata/CMakeLists.txt
View File

@ -370,6 +370,21 @@ if(MSLITE_MINDDATA_IMPLEMENT STREQUAL "full")
Threads::Threads
)
if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE AND MSLITE_ENABLE_ACL)
target_link_libraries(minddata-lite
mindspore_core
mindspore::opencv_core
mindspore::opencv_imgcodecs
mindspore::opencv_imgproc
)
target_link_libraries(minddata-lite_static
mindspore_core
mindspore::opencv_core
mindspore::opencv_imgcodecs
mindspore::opencv_imgproc
)
endif()
# ref: https://github.com/android/ndk/issues/1202
if(ANDROID_NDK)
if(PLATFORM_ARM32)