Commit 70ff3804 authored by dkurt's avatar dkurt

Fix SqueezeNet Halide performance test

parent 8741d97a
...@@ -83,7 +83,7 @@ PERF_TEST(ResNet50, HalidePerfTest) ...@@ -83,7 +83,7 @@ PERF_TEST(ResNet50, HalidePerfTest)
PERF_TEST(SqueezeNet_v1_1, HalidePerfTest) PERF_TEST(SqueezeNet_v1_1, HalidePerfTest)
{ {
Net net; Net net;
loadNet("dnn/squeezenet_v1_1.caffemodel", "dnn/squeezenet_v1_1.prototxt", loadNet("dnn/squeezenet_v1.1.caffemodel", "dnn/squeezenet_v1.1.prototxt",
"dnn/halide_scheduler_squeezenet_v1_1.yml", 227, 227, "prob", "dnn/halide_scheduler_squeezenet_v1_1.yml", 227, 227, "prob",
"caffe", DNN_TARGET_CPU, &net); "caffe", DNN_TARGET_CPU, &net);
TEST_CYCLE() net.forward(); TEST_CYCLE() net.forward();
...@@ -144,7 +144,7 @@ PERF_TEST(ResNet50_opencl, HalidePerfTest) ...@@ -144,7 +144,7 @@ PERF_TEST(ResNet50_opencl, HalidePerfTest)
PERF_TEST(SqueezeNet_v1_1_opencl, HalidePerfTest) PERF_TEST(SqueezeNet_v1_1_opencl, HalidePerfTest)
{ {
Net net; Net net;
loadNet("dnn/squeezenet_v1_1.caffemodel", "dnn/squeezenet_v1_1.prototxt", loadNet("dnn/squeezenet_v1.1.caffemodel", "dnn/squeezenet_v1.1.prototxt",
"dnn/halide_scheduler_opencl_squeezenet_v1_1.yml", 227, 227, "prob", "dnn/halide_scheduler_opencl_squeezenet_v1_1.yml", 227, 227, "prob",
"caffe", DNN_TARGET_OPENCL, &net); "caffe", DNN_TARGET_OPENCL, &net);
TEST_CYCLE() net.forward(); TEST_CYCLE() net.forward();
......
...@@ -197,6 +197,10 @@ void Regression::init(const std::string& testSuitName, const std::string& ext) ...@@ -197,6 +197,10 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
#else #else
const char *data_path_dir = OPENCV_TEST_DATA_PATH; const char *data_path_dir = OPENCV_TEST_DATA_PATH;
#endif #endif
cvtest::addDataSearchSubDirectory("");
cvtest::addDataSearchSubDirectory(testSuitName);
const char *path_separator = "/"; const char *path_separator = "/";
if (data_path_dir) if (data_path_dir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment