From 7ebc7ca8017ea612e2f95811ca2ea5a21a00271a Mon Sep 17 00:00:00 2001 From: hangq Date: Fri, 7 Aug 2020 11:02:07 +0800 Subject: [PATCH] remove securec --- build.sh | 3 +++ mindspore/lite/src/CMakeLists.txt | 1 - mindspore/lite/tools/benchmark/CMakeLists.txt | 4 ++-- mindspore/lite/tools/time_profile/CMakeLists.txt | 4 ++-- .../lite/tools/time_profile/time_profile.cc | 16 ++++++++-------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index 436b3f5882..23d26e4eab 100755 --- a/build.sh +++ b/build.sh @@ -634,6 +634,7 @@ build_lite() mkdir -p ${OUTPUT_DIR}/third_party cp ${BASEPATH}/mindspore/lite/build/tools/converter/converter_lite ${OUTPUT_DIR}/converter/ cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/ + cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/ cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/ mkdir -p ${OUTPUT_DIR}/include/ir/dtype/ cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/ @@ -657,6 +658,7 @@ build_lite() mkdir -p ${OUTPUT_DIR}/include && mkdir -p ${OUTPUT_DIR}/lib mkdir -p ${OUTPUT_DIR}/third_party cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/ + cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/ cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/ mkdir -p ${OUTPUT_DIR}/include/ir/dtype/ cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/ @@ -676,6 +678,7 @@ build_lite() mkdir -p ${OUTPUT_DIR}/include && mkdir -p ${OUTPUT_DIR}/lib mkdir -p ${OUTPUT_DIR}/third_party cp ${BASEPATH}/mindspore/lite/build/tools/benchmark/benchmark ${OUTPUT_DIR}/benchmark/ + cp ${BASEPATH}/mindspore/lite/build/tools/time_profile/timeprofile ${OUTPUT_DIR}/time_profile/ cp ${BASEPATH}/mindspore/lite/include/*.h ${OUTPUT_DIR}/include/ mkdir -p ${OUTPUT_DIR}/include/ir/dtype/ cp ${BASEPATH}/mindspore/core/ir/dtype/type_id.h ${OUTPUT_DIR}/include/ir/dtype/ diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 64cba2cf4b..8b96e731ab 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -75,7 +75,6 @@ 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 06cf4505b6..18d34bab56 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 ${SECUREC_LIBRARY}) + target_link_libraries(benchmark mindspore-lite) else() - target_link_libraries(benchmark mindspore-lite ${SECUREC_LIBRARY} pthread) + target_link_libraries(benchmark mindspore-lite pthread) endif() diff --git a/mindspore/lite/tools/time_profile/CMakeLists.txt b/mindspore/lite/tools/time_profile/CMakeLists.txt index 4eb61c24e3..410ec8f2b1 100644 --- a/mindspore/lite/tools/time_profile/CMakeLists.txt +++ b/mindspore/lite/tools/time_profile/CMakeLists.txt @@ -12,7 +12,7 @@ add_executable(timeprofile ${COMMON_SRC}) if (PLATFORM_ARM32 OR PLATFORM_ARM64) - target_link_libraries(timeprofile mindspore-lite ${SECUREC_LIBRARY}) + target_link_libraries(timeprofile mindspore-lite) else() - target_link_libraries(timeprofile mindspore-lite ${SECUREC_LIBRARY} pthread) + target_link_libraries(timeprofile mindspore-lite pthread) endif() diff --git a/mindspore/lite/tools/time_profile/time_profile.cc b/mindspore/lite/tools/time_profile/time_profile.cc index d17cdc2dad..65b375c284 100644 --- a/mindspore/lite/tools/time_profile/time_profile.cc +++ b/mindspore/lite/tools/time_profile/time_profile.cc @@ -112,8 +112,8 @@ int TimeProfile::InitSession() { int TimeProfile::InitCallbackParameter() { // before callback before_call_back_ = [&](const std::vector &before_inputs, - const std::vector &before_outputs, - const session::CallBackParam &callParam) { + const std::vector &before_outputs, + const session::CallBackParam &callParam) { if (before_inputs.empty()) { MS_LOG(INFO) << "The num of beforeInputs is empty"; } @@ -134,8 +134,8 @@ int TimeProfile::InitCallbackParameter() { // after callback after_call_back_ = [&](const std::vector &after_inputs, - const std::vector &after_outputs, - const session::CallBackParam &call_param) { + const std::vector &after_outputs, + const session::CallBackParam &call_param) { uint64_t opEnd = GetTimeUs(); if (after_inputs.empty()) { @@ -215,25 +215,25 @@ int TimeProfile::PrintResult(const std::vector &title, } columns.push_back(iter.first); - len = sprintf_s(stringBuf[1], 100, "%f", iter.second.second / _flags->loop_count_); + len = snprintf(stringBuf[1], sizeof(stringBuf[1]), "%f", iter.second.second / _flags->loop_count_); if (len > columnLenMax.at(1)) { columnLenMax.at(1) = len + 4; } columns.emplace_back(stringBuf[1]); - len = sprintf_s(stringBuf[2], 100, "%f", iter.second.second / op_cost_total_); + len = snprintf(stringBuf[2], sizeof(stringBuf[2]), "%f", iter.second.second / op_cost_total_); if (len > columnLenMax.at(2)) { columnLenMax.at(2) = len + 4; } columns.emplace_back(stringBuf[2]); - len = sprintf_s(stringBuf[3], 100, "%d", iter.second.first); + len = snprintf(stringBuf[3], sizeof(stringBuf[3]), "%d", iter.second.first); if (len > columnLenMax.at(3)) { columnLenMax.at(3) = len + 4; } columns.emplace_back(stringBuf[3]); - len = sprintf_s(stringBuf[4], 100, "%f", iter.second.second); + len = snprintf(stringBuf[4], sizeof(stringBuf[4]), "%f", iter.second.second); if (len > columnLenMax.at(4)) { columnLenMax.at(4) = len + 4; }