提交 143c7e5e 编写于 作者: J Jiansong Wang

Define IMAGINIATION_NNA_SDK_ROOT with cmake configure_file instead of

hard coding in source code.
上级 ad0d70db
......@@ -2,5 +2,7 @@ if(NOT LITE_WITH_IMAGINATION_NNA)
return()
endif()
configure_file(ImgdnnManagerConfig.h.in ImgdnnManagerConfig.h)
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})
target_include_directories(device_imagination_nna PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
#cmakedefine IMAGINATION_NNA_SDK_ROOT "@IMAGINATION_NNA_SDK_ROOT@"
......@@ -14,6 +14,7 @@
#include "imgdnn_manager.h" // NOLINT
#include <utility>
#include "ImgdnnManagerConfig.h"
namespace paddle {
namespace lite {
......@@ -367,15 +368,14 @@ imgdnn_network_object ImgdnnManager::createNetworkObject(
imgdnn_tensor *outputs) {
const imgdnn_network_object_flags flags = 0;
// Add " --dump_debug_binaries enabled" to options_str if need debug info.
std::string options_str;
std::string ddk_root{"/home/jasonwang/imgtools/imagination_nna_sdk/"};
// std::string ddk_root{STR2(IMAGINATION_NNA_SDK_ROOT)};
std::string ddk_root{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";
options_str += "-h " + hwconfig;
options_str += " -m " + mapconfig;
// options_str += " --dump_debug_binaries enabled";
net_obj_ = imgdnnCreateNetworkObject(device_,
context_,
......
......@@ -44,9 +44,6 @@ 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_;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册