提交 82f2c190 编写于 作者: L liuruilong

format files

上级 56db3b86
...@@ -125,7 +125,6 @@ bool ConvAddBNReluKernel<GPU_CL, float>::Init( ...@@ -125,7 +125,6 @@ bool ConvAddBNReluKernel<GPU_CL, float>::Init(
param->SetOffset(offset); param->SetOffset(offset);
/* /*
if (param->Filter()->dims()[2] == 1 && if (param->Filter()->dims()[2] == 1 &&
param->Filter()->dims()[3] == 1 && param->Filter()->dims()[3] == 1 &&
...@@ -136,8 +135,7 @@ bool ConvAddBNReluKernel<GPU_CL, float>::Init( ...@@ -136,8 +135,7 @@ bool ConvAddBNReluKernel<GPU_CL, float>::Init(
DLOG << " conv add bn relu conv 1x1 4"; DLOG << " conv add bn relu conv 1x1 4";
} }
*/ */
if (param->Filter()->dims()[2] == 1 && if (param->Filter()->dims()[2] == 1 && param->Filter()->dims()[3] == 1) {
param->Filter()->dims()[3] == 1) {
param->Filter()->InitNImage(cl_helper_.CLContext(), param->Filter()->InitNImage(cl_helper_.CLContext(),
cl_helper_.CLCommandQueue()); cl_helper_.CLCommandQueue());
this->cl_helper_.AddKernel("conv_1x1", "conv_add_bn_relu_kernel.cl"); this->cl_helper_.AddKernel("conv_1x1", "conv_add_bn_relu_kernel.cl");
......
...@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include <string>
#include <iostream> #include <iostream>
#include <string>
#include "../test_helper.h" #include "../test_helper.h"
#include "framework/loader.h" #include "framework/loader.h"
...@@ -37,8 +37,8 @@ int main() { ...@@ -37,8 +37,8 @@ int main() {
// auto program = loader.Load(g_mobilenet_ssd, true); // auto program = loader.Load(g_mobilenet_ssd, true);
// auto program = loader.Load(std::string(g_ocr) + "/model", // auto program = loader.Load(std::string(g_ocr) + "/model",
// std::string(g_ocr) + "/params", false); // std::string(g_ocr) + "/params", false);
// program.originProgram->Description("program desc: "); // program.originProgram->Description("program desc: ");
return 0; return 0;
......
...@@ -17,50 +17,50 @@ limitations under the License. */ ...@@ -17,50 +17,50 @@ limitations under the License. */
#include "../test_include.h" #include "../test_include.h"
int main() { int main() {
paddle_mobile::PaddleMobile<paddle_mobile::GPU_CL> paddle_mobile; paddle_mobile::PaddleMobile<paddle_mobile::GPU_CL> paddle_mobile;
// paddle_mobile.SetThreadNum(4); // paddle_mobile.SetThreadNum(4);
auto time1 = paddle_mobile::time(); auto time1 = paddle_mobile::time();
// auto isok = paddle_mobile.Load(std::string(g_mobilenet_detect) + "/model", // auto isok = paddle_mobile.Load(std::string(g_mobilenet_detect) + "/model",
// std::string(g_mobilenet_detect) + "/params", true); // std::string(g_mobilenet_detect) + "/params", true);
auto isok = paddle_mobile.Load(std::string(g_yolo_mul), true); auto isok = paddle_mobile.Load(std::string(g_yolo_mul), true);
if (isok) { if (isok) {
auto time2 = paddle_mobile::time(); auto time2 = paddle_mobile::time();
std::cout << "load cost :" << paddle_mobile::time_diff(time1, time2) << "ms" std::cout << "load cost :" << paddle_mobile::time_diff(time1, time2) << "ms"
<< std::endl; << std::endl;
std::vector<float> input; std::vector<float> input;
std::vector<int64_t> dims{1, 3, 416, 416}; std::vector<int64_t> dims{1, 3, 416, 416};
GetInput<float>(g_yolo_img, &input, dims); GetInput<float>(g_yolo_img, &input, dims);
std::vector<float> vec_result; std::vector<float> vec_result;
// = paddle_mobile.Predict(input, dims); // = paddle_mobile.Predict(input, dims);
auto time3 = paddle_mobile::time(); auto time3 = paddle_mobile::time();
int max = 10; int max = 10;
for (int i = 0; i < max; ++i) { for (int i = 0; i < max; ++i) {
vec_result = paddle_mobile.Predict(input, dims); vec_result = paddle_mobile.Predict(input, dims);
} }
auto time4 = paddle_mobile::time(); auto time4 = paddle_mobile::time();
// auto time3 = paddle_mobile::time(); // auto time3 = paddle_mobile::time();
// for (int i = 0; i < 10; ++i) { // for (int i = 0; i < 10; ++i) {
// auto vec_result = paddle_mobile.Predict(input, dims); // auto vec_result = paddle_mobile.Predict(input, dims);
// } // }
// auto time4 = paddle_mobile::time(); // auto time4 = paddle_mobile::time();
std::cout << "predict cost :" std::cout << "predict cost :"
<< paddle_mobile::time_diff(time3, time4) / max << "ms" << paddle_mobile::time_diff(time3, time4) / max << "ms"
<< std::endl; << std::endl;
std::vector<float>::iterator biggest = std::vector<float>::iterator biggest =
std::max_element(std::begin(vec_result), std::end(vec_result)); std::max_element(std::begin(vec_result), std::end(vec_result));
std::cout << " Max element is " << *biggest << " at position " std::cout << " Max element is " << *biggest << " at position "
<< std::distance(std::begin(vec_result), biggest) << std::endl; << std::distance(std::begin(vec_result), biggest) << std::endl;
// for (float i : vec_result) { // for (float i : vec_result) {
// std::cout << i << std::endl; // std::cout << i << std::endl;
// } // }
} }
return 0; return 0;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册