[opencv] 142/251: Fix SqueezeNet Halide performance test

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 70ff3804e967661b41c98f4df2c883c3d302f144
Author: dkurt <dmitry.kurtaev+github at gmail.com>
Date:   Mon Jul 24 10:45:04 2017 +0300

    Fix SqueezeNet Halide performance test
---
 modules/dnn/perf/perf_halide_net.cpp | 4 ++--
 modules/ts/src/ts_perf.cpp           | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/dnn/perf/perf_halide_net.cpp b/modules/dnn/perf/perf_halide_net.cpp
index 2213c1a..53bae9d 100644
--- a/modules/dnn/perf/perf_halide_net.cpp
+++ b/modules/dnn/perf/perf_halide_net.cpp
@@ -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();
diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
index a30ff81..07b692e 100644
--- a/modules/ts/src/ts_perf.cpp
+++ b/modules/ts/src/ts_perf.cpp
@@ -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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git