From 7faca1adbe38639b8002aa83f2e8db054cc5ff3e Mon Sep 17 00:00:00 2001 From: liuruilong Date: Fri, 18 Jan 2019 15:24:21 +0800 Subject: [PATCH] format files --- src/framework/executor.cpp | 3 +- src/io/paddle_mobile.cpp | 3 +- test/net/test_super.cpp | 154 ++++++++++++++++++++----------------- 3 files changed, 85 insertions(+), 75 deletions(-) diff --git a/src/framework/executor.cpp b/src/framework/executor.cpp index a52d1fad70..db48534097 100644 --- a/src/framework/executor.cpp +++ b/src/framework/executor.cpp @@ -237,8 +237,7 @@ void Executor::InitCombineMemory() { } template -void Executor::InitNoPersistableMemory( - const Tensor &input_tensor) { +void Executor::InitNoPersistableMemory(const Tensor &input_tensor) { for (const auto &block : program_desc_->Blocks()) { for (const auto &var_desc : block->Vars()) { auto var = program_.scope->Var(var_desc->Name()); diff --git a/src/io/paddle_mobile.cpp b/src/io/paddle_mobile.cpp index 9188755f8c..0f22788481 100644 --- a/src/io/paddle_mobile.cpp +++ b/src/io/paddle_mobile.cpp @@ -105,7 +105,8 @@ bool PaddleMobile::LoadCombinedMemory( executor_ = std::make_shared>( loader_->LoadCombinedMemory(model_len, model_buf, combined_params_len, combined_params_buf, optimize, - quantification), config_, batch_size, optimize, lod_mode); + quantification), + config_, batch_size, optimize, lod_mode); } else { LOG(kLOG_INFO) << "executor inited"; } diff --git a/test/net/test_super.cpp b/test/net/test_super.cpp index 28d9bfe170..dcae08887d 100644 --- a/test/net/test_super.cpp +++ b/test/net/test_super.cpp @@ -38,79 +38,87 @@ int main() { std::cout << "load cost :" << paddle_mobile::time_diff(time1, time2) << "ms" << std::endl; // 300*300 -// std::vector input; -// std::vector dims{1, 1, 300, 300}; -// GetInput(g_test_image_1x3x224x224, &input, dims); -// -// std::vector vec_result; + // std::vector input; + // std::vector dims{1, 1, 300, 300}; + // GetInput(g_test_image_1x3x224x224, &input, dims); + // + // std::vector vec_result; auto time3 = paddle_mobile::time(); int max = 1; -// for (int i = 0; i < max; ++i) { -// auto time5 = paddle_mobile::time(); -// vec_result = paddle_mobile.Predict(input, dims); -// auto time6 = paddle_mobile::time(); -// std::cout << "300 predict cost :第" << i << ": " -// << paddle_mobile::time_diff(time5, time6) << "ms" << std::endl; -// } -// auto time4 = paddle_mobile::time(); -// -// std::cout << "300 predict cost :" -// << paddle_mobile::time_diff(time3, time4) / max << "ms" -// << std::endl; -// auto biggest = -// std::max_element(std::begin(vec_result), std::end(vec_result)); -// std::cout << "300 Max element is " << *biggest << " at position " -// << std::distance(std::begin(vec_result), biggest) << std::endl; -// -// // 500*500 -// std::vector vec_result2; -// -// std::vector input2; -// std::vector dims2{1, 1, 500, 500}; -// GetInput(g_test_image_1x3x224x224, &input2, dims2); -// -// time3 = paddle_mobile::time(); -// for (int i = 0; i < max; ++i) { -// auto time5 = paddle_mobile::time(); -// vec_result2 = paddle_mobile.Predict(input2, dims2); -// auto time6 = paddle_mobile::time(); -// std::cout << "500 predict cost :第" << i << ": " -// << paddle_mobile::time_diff(time5, time6) << "ms" << std::endl; -// } -// -// time4 = paddle_mobile::time(); -// std::cout << "500 predict cost :" -// << paddle_mobile::time_diff(time3, time4) / max << "ms" -// << std::endl; -// biggest = std::max_element(std::begin(vec_result2), std::end(vec_result2)); -// std::cout << "500 Max element is " << *biggest << " at position " -// << std::distance(std::begin(vec_result2), biggest) << std::endl; -// -// // 1000*1000 -// -// std::vector vec_result3; -// std::vector input3; -// std::vector dims3{1, 1, 1000, 1000}; -// GetInput(g_test_image_1x3x224x224, &input3, dims3); -// -// time3 = paddle_mobile::time(); -// -// for (int i = 0; i < max; ++i) { -// auto time5 = paddle_mobile::time(); -// vec_result3 = paddle_mobile.Predict(input3, dims3); -// auto time6 = paddle_mobile::time(); -// std::cout << "1000*1000 predict cost :第" << i << ": " -// << paddle_mobile::time_diff(time5, time6) << "ms" << std::endl; -// } -// time4 = paddle_mobile::time(); -// std::cout << "1000*1000 predict cost :" -// << paddle_mobile::time_diff(time3, time4) / max << "ms" -// << std::endl; -// biggest = std::max_element(std::begin(vec_result3), std::end(vec_result3)); -// std::cout << "1000*1000 Max element is " << *biggest << " at position " -// << std::distance(std::begin(vec_result3), biggest) << std::endl; + // for (int i = 0; i < max; ++i) { + // auto time5 = paddle_mobile::time(); + // vec_result = paddle_mobile.Predict(input, dims); + // auto time6 = paddle_mobile::time(); + // std::cout << "300 predict cost :第" << i << ": " + // << paddle_mobile::time_diff(time5, time6) << "ms" << + // std::endl; + // } + // auto time4 = paddle_mobile::time(); + // + // std::cout << "300 predict cost :" + // << paddle_mobile::time_diff(time3, time4) / max << "ms" + // << std::endl; + // auto biggest = + // std::max_element(std::begin(vec_result), std::end(vec_result)); + // std::cout << "300 Max element is " << *biggest << " at position " + // << std::distance(std::begin(vec_result), biggest) << + // std::endl; + // + // // 500*500 + // std::vector vec_result2; + // + // std::vector input2; + // std::vector dims2{1, 1, 500, 500}; + // GetInput(g_test_image_1x3x224x224, &input2, dims2); + // + // time3 = paddle_mobile::time(); + // for (int i = 0; i < max; ++i) { + // auto time5 = paddle_mobile::time(); + // vec_result2 = paddle_mobile.Predict(input2, dims2); + // auto time6 = paddle_mobile::time(); + // std::cout << "500 predict cost :第" << i << ": " + // << paddle_mobile::time_diff(time5, time6) << "ms" << + // std::endl; + // } + // + // time4 = paddle_mobile::time(); + // std::cout << "500 predict cost :" + // << paddle_mobile::time_diff(time3, time4) / max << "ms" + // << std::endl; + // biggest = std::max_element(std::begin(vec_result2), + // std::end(vec_result2)); std::cout << "500 Max element is " << *biggest + // << " at position " + // << std::distance(std::begin(vec_result2), biggest) << + // std::endl; + // + // // 1000*1000 + // + // std::vector vec_result3; + // std::vector input3; + // std::vector dims3{1, 1, 1000, 1000}; + // GetInput(g_test_image_1x3x224x224, &input3, dims3); + // + // time3 = paddle_mobile::time(); + // + // for (int i = 0; i < max; ++i) { + // auto time5 = paddle_mobile::time(); + // vec_result3 = paddle_mobile.Predict(input3, dims3); + // auto time6 = paddle_mobile::time(); + // std::cout << "1000*1000 predict cost :第" << i << ": " + // << paddle_mobile::time_diff(time5, time6) << "ms" << + // std::endl; + // } + // time4 = paddle_mobile::time(); + // std::cout << "1000*1000 predict cost :" + // << paddle_mobile::time_diff(time3, time4) / max << "ms" + // << std::endl; + // biggest = std::max_element(std::begin(vec_result3), + // std::end(vec_result3)); std::cout << "1000*1000 Max element is " << + // *biggest << " at position " + // << std::distance(std::begin(vec_result3), biggest) << + // std::endl; // 224*224 std::vector vec_result4; @@ -131,9 +139,11 @@ int main() { std::cout << "224*224 predict cost :" << paddle_mobile::time_diff(time3, time4) / max << "ms" << std::endl; -// biggest = std::max_element(std::begin(vec_result4), std::end(vec_result4)); -// std::cout << "224*224 Max element is " << *biggest << " at position " -// << std::distance(std::begin(vec_result4), biggest) << std::endl; + // biggest = std::max_element(std::begin(vec_result4), + // std::end(vec_result4)); std::cout << "224*224 Max element is " << + // *biggest << " at position " + // << std::distance(std::begin(vec_result4), biggest) << + // std::endl; } return 0; -- GitLab