From 4a8bf7f6a54d6a2b365ff38300856146841bf624 Mon Sep 17 00:00:00 2001 From: Jiansong Wang Date: Tue, 15 Sep 2020 14:24:46 +0800 Subject: [PATCH] Use IMAGINATION_NNA_SDK_ROOT in imgdnn_manager.cc --- lite/backends/imagination_nna/CMakeLists.txt | 1 + lite/backends/imagination_nna/imgdnn_manager.cc | 3 ++- lite/backends/imagination_nna/imgdnn_manager.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lite/backends/imagination_nna/CMakeLists.txt b/lite/backends/imagination_nna/CMakeLists.txt index f42282917c..748011dbc1 100644 --- a/lite/backends/imagination_nna/CMakeLists.txt +++ b/lite/backends/imagination_nna/CMakeLists.txt @@ -3,3 +3,4 @@ if(NOT LITE_WITH_IMAGINATION_NNA) endif() lite_cc_library(device_imagination_nna SRCS imgdnn_manager.cc DEPS ${imagination_nna_builder_libs} ${imagination_nna_runtime_libs}) +target_compile_definitions(device_imagination_nna PRIVATE IMAGINATION_NNA_SDK_ROOT=${IMAGINATION_NNA_SDK_ROOT}) diff --git a/lite/backends/imagination_nna/imgdnn_manager.cc b/lite/backends/imagination_nna/imgdnn_manager.cc index 5e2bccd79a..ba50545379 100644 --- a/lite/backends/imagination_nna/imgdnn_manager.cc +++ b/lite/backends/imagination_nna/imgdnn_manager.cc @@ -368,7 +368,8 @@ imgdnn_network_object ImgdnnManager::createNetworkObject( const imgdnn_network_object_flags flags = 0; std::string options_str; - std::string ddk_root{"/home/jasonwang/imgtools/ndk/main/"}; + // std::string ddk_root{"/home/jasonwang/imgtools/ndk/main/"}; + std::string ddk_root{STR2(IMAGINATION_NNA_SDK_ROOT)}; std::string hwconfig = ddk_root + "nna-tools/config/mirage_hw_config06_23_2_6500_301.json"; std::string mapconfig = ddk_root + "nna-tools/config/mapconfig_q8a.json"; diff --git a/lite/backends/imagination_nna/imgdnn_manager.h b/lite/backends/imagination_nna/imgdnn_manager.h index 00d8a8e019..27bddefc71 100644 --- a/lite/backends/imagination_nna/imgdnn_manager.h +++ b/lite/backends/imagination_nna/imgdnn_manager.h @@ -44,6 +44,9 @@ static inline void CheckAndPrint(bool cond, #define ASSERT(statement, msg) \ lite::imagination_nna::CheckAndPrint(statement, msg, __LINE__, __FILE__) +#define STR1(R) #R +#define STR2(R) STR1(R) + class ImgdnnManager { imgdnn_err_code err_; imgdnn_device device_; -- GitLab