diff --git a/mindspore/core/utils/log_adapter.h b/mindspore/core/utils/log_adapter.h index 703cf7494c..ce31ce9ab8 100644 --- a/mindspore/core/utils/log_adapter.h +++ b/mindspore/core/utils/log_adapter.h @@ -24,6 +24,7 @@ #include #include #include "utils/overload.h" +#include "./securec.h" #ifndef USE_ANDROID_LOG #ifdef USE_GLOG #include "glog/logging.h" diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index b3e8e31c0d..59715ebd99 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -16,6 +16,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${TOP_DIR}/third_party) include_directories(${TOP_DIR}/third_party/flatbuffers/include) +include(${TOP_DIR}/cmake/utils.cmake) +include(${TOP_DIR}/cmake/dependency_utils.cmake) +include(${TOP_DIR}/cmake/dependency_securec.cmake) + option(CMAKE_BUILD_TYPE "build type" Release) option(BUILD_DEVICE "if build device" on) option(SUPPORT_TRAIN "if build for on-device train" off) @@ -91,10 +95,10 @@ if (BUILD_CONVERTER) set(PYTHON_LIBRARIES "${py_lib}") endif() include_directories(${PYTHON_INCLUDE_DIRS}) - include(${TOP_DIR}/cmake/utils.cmake) - include(${TOP_DIR}/cmake/dependency_utils.cmake) +# include(${TOP_DIR}/cmake/utils.cmake) +# include(${TOP_DIR}/cmake/dependency_utils.cmake) include(${TOP_DIR}/cmake/external_libs/json.cmake) - include(${TOP_DIR}/cmake/dependency_securec.cmake) +# include(${TOP_DIR}/cmake/dependency_securec.cmake) include(${TOP_DIR}/cmake/external_libs/pybind11.cmake) include(${TOP_DIR}/cmake/external_libs/eigen.cmake) include_directories(${TOP_DIR}/third_party/protobuf/build/include) diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 8b96e731ab..64cba2cf4b 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -75,6 +75,7 @@ add_library(mindspore-lite SHARED ${LITE_SRC} ${ANF_SRC}) target_link_libraries(mindspore-lite cpu_kernel_mid_ ops_mid_ + ${SECUREC_LIBRARY} ) add_subdirectory(runtime/kernel/arm) diff --git a/mindspore/lite/tools/benchmark/CMakeLists.txt b/mindspore/lite/tools/benchmark/CMakeLists.txt index 18d34bab56..06cf4505b6 100644 --- a/mindspore/lite/tools/benchmark/CMakeLists.txt +++ b/mindspore/lite/tools/benchmark/CMakeLists.txt @@ -11,7 +11,7 @@ add_executable(benchmark ${COMMON_SRC}) if (PLATFORM_ARM32 OR PLATFORM_ARM64) - target_link_libraries(benchmark mindspore-lite) + target_link_libraries(benchmark mindspore-lite ${SECUREC_LIBRARY}) else() - target_link_libraries(benchmark mindspore-lite pthread) + target_link_libraries(benchmark mindspore-lite ${SECUREC_LIBRARY} pthread) endif() diff --git a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc b/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc index 0b23502ad2..9190c5627f 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc +++ b/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc @@ -54,13 +54,13 @@ FusionPattern &FusionPattern::AddPatternOp(const std::string &id, const std::vec if (op == nullptr) { // MS_LOG(ERROR) << "new an object failed"); hasError = true; + } else { + op->id = id; + op->types = types; + ops.push_back(op); + opMap[id] = op; } - op->id = id; - op->types = types; - ops.push_back(op); - opMap[id] = op; - return *this; }