mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9222 from dkurt:fix_dnn_tests

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-25 09:09:23 +00:00
commit 0194d5a2d5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/dnn/perf/perf_halide_net.cpp
View File

@ -83,7 +83,7 @@ PERF_TEST(ResNet50, HalidePerfTest)
PERF_TEST(SqueezeNet_v1_1, HalidePerfTest)
{
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",
"caffe", DNN_TARGET_CPU, &net);
TEST_CYCLE() net.forward();
@ -144,7 +144,7 @@ PERF_TEST(ResNet50_opencl, HalidePerfTest)
PERF_TEST(SqueezeNet_v1_1_opencl, HalidePerfTest)
{
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",
"caffe", DNN_TARGET_OPENCL, &net);
TEST_CYCLE() net.forward();

4
modules/ts/src/ts_perf.cpp
View File

@ -197,6 +197,10 @@ void Regression::init(const std::string& testSuitName, const std::string& ext)
#else
const char *data_path_dir = OPENCV_TEST_DATA_PATH;
#endif
cvtest::addDataSearchSubDirectory("");
cvtest::addDataSearchSubDirectory(testSuitName);
const char *path_separator = "/";
if (data_path_dir)