From e03ef4fa419b4acb16ca433155a5aed66bc16be6 Mon Sep 17 00:00:00 2001 From: Chunseok Lee Date: Fri, 3 Jan 2020 15:58:49 +0900 Subject: [PATCH] cherry-pick : neurun-Fix-x86-64-gcc-9-build-error-9790 original patch : 0fcc13aee87530c7aa7b228f Change-Id: I05a189d7da6123a6bf64dc828ca1bcf6ad9035d3 Signed-off-by: Chunseok Lee --- infra/nnfw/cmake/packages/EigenConfig.cmake | 2 +- runtime/neurun/api/src/CustomKernelRegistry.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/nnfw/cmake/packages/EigenConfig.cmake b/infra/nnfw/cmake/packages/EigenConfig.cmake index 0feb089..7a8d3d5 100644 --- a/infra/nnfw/cmake/packages/EigenConfig.cmake +++ b/infra/nnfw/cmake/packages/EigenConfig.cmake @@ -8,7 +8,7 @@ function(_Eigen_import) if(NOT TARGET eigen) add_library(eigen INTERFACE) - target_include_directories(eigen INTERFACE "${EigenSource_DIR}") + target_include_directories(eigen SYSTEM INTERFACE "${EigenSource_DIR}") endif(NOT TARGET eigen) set(Eigen_FOUND TRUE PARENT_SCOPE) diff --git a/runtime/neurun/api/src/CustomKernelRegistry.cc b/runtime/neurun/api/src/CustomKernelRegistry.cc index b23da93..b223682 100644 --- a/runtime/neurun/api/src/CustomKernelRegistry.cc +++ b/runtime/neurun/api/src/CustomKernelRegistry.cc @@ -54,7 +54,7 @@ KernelBuilder::buildKernel(const std::string &id, auto kernel = _registry->buildKernelForOp(id); kernel->configure(std::move(params)); - return std::move(kernel); + return kernel; } KernelBuilder::KernelBuilder(KernelRegistry *registry) : _registry(registry) {} -- 2.7.4