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

open dvpp utils by absolute path 

Signed-off-by: zhoufeng <zhoufeng54@huawei.com>
This commit is contained in:
zhoufeng 2023-01-03 19:58:57 +08:00
parent 60b419d560
commit cb0de9dbb9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/package_tar.cmake
View File

@ -100,7 +100,7 @@ if(ENABLE_MINDDATA)
if(ENABLE_ACL)
install(
TARGETS dvpp_utils
DESTINATION ${INSTALL_PLUGIN_DIR}
DESTINATION ${INSTALL_PLUGIN_DIR}/ascend
COMPONENT mindspore
)
endif()

15
mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/acl_adapter.cc
View File

@ -14,13 +14,14 @@
* limitations under the License.
*/
#include "minddata/dataset/kernels/image/dvpp/acl_adapter.h"
#include <libgen.h>
#include <algorithm>
#include "utils/ms_context.h"
namespace mindspore {
namespace dataset {
namespace {
constexpr auto kAclPluginFileName = "libdvpp_utils.so";
constexpr auto kAclPluginRelatedPath = "./lib/plugin/ascend/libdvpp_utils.so";
} // namespace
AclAdapter &AclAdapter::GetInstance() {
static AclAdapter instance{};
@ -40,9 +41,17 @@ void AclAdapter::InitPlugin() {
}
#endif
#if !defined(_WIN32) && !defined(_WIN64)
plugin_handle_ = dlopen(kAclPluginFileName, RTLD_LAZY | RTLD_LOCAL);
Dl_info dl_info;
if (dladdr(reinterpret_cast<void *>(AclAdapter::GetInstance), &dl_info) == 0) {
MS_LOG(INFO) << "Get dladdr error";
return;
}
std::string cur_so_path = dl_info.dli_fname;
std::string acl_plugin_path = std::string(dirname(cur_so_path.data())) + "/" + kAclPluginRelatedPath;
plugin_handle_ = dlopen(acl_plugin_path.c_str(), RTLD_LAZY | RTLD_LOCAL);
if (plugin_handle_ == nullptr) {
MS_LOG(INFO) << "Cannot dlopen " << kAclPluginFileName << ", result = " << GetDlErrorMsg()
MS_LOG(INFO) << "Cannot dlopen " << acl_plugin_path << ", result = " << GetDlErrorMsg()
<< ", it can be ignored if not running on ascend.";
return;
}