Minor test changes

ludv1x · Aug 12, 2015 · 7d2e745 · 7d2e745
1 parent b3dcc39
commit 7d2e745
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 57 deletions.
diff --git a/modules/dnn/test/cnpy.cpp b/modules/dnn/test/cnpy.cpp
@@ -189,8 +189,7 @@ cnpy::NpyArray cnpy::npz_load(std::string fname, std::string varname) {
     FILE* fp = fopen(fname.c_str(),"rb");
 
     if(!fp) {
-        printf("npz_load: Error! Unable to open file %s!\n",fname.c_str());
-        abort();
+        throw std::runtime_error("npz_load: Error! Unable to open file " + fname + "!\n");
     }
 
     while(1) {
@@ -227,17 +226,15 @@ cnpy::NpyArray cnpy::npz_load(std::string fname, std::string varname) {
     }
 
     fclose(fp);
-    printf("npz_load: Error! Variable name %s not found in %s!\n",varname.c_str(),fname.c_str());
-    abort();
+    throw std::runtime_error("npz_load: Error! Variable name " + varname + " not found in " + fname + "!\n");
 }
 
 cnpy::NpyArray cnpy::npy_load(std::string fname) {
 
     FILE* fp = fopen(fname.c_str(), "rb");
 
     if(!fp) {
-        printf("npy_load: Error! Unable to open file %s!\n",fname.c_str());
-        abort();
+        throw std::runtime_error("npy_load: Error! Unable to open file " + fname + "!\n");
     }
 
     NpyArray arr = load_the_npy_file(fp);

diff --git a/modules/dnn/test/npy_blob.hpp b/modules/dnn/test/npy_blob.hpp
@@ -18,7 +18,7 @@ inline cv::dnn::Blob blobFromNPY(const cv::String &path)
 inline void saveBlobToNPY(cv::dnn::Blob &blob, const cv::String &path)
 {
     cv::dnn::BlobShape shape = blob.shape();
-    cnpy::npy_save(path.c_str(), blob.ptr<float>(), (unsigned*)&shape[0], shape.dims());
+    cnpy::npy_save(path.c_str(), blob.ptrf(), (unsigned*)&shape[0], shape.dims());
 }
 
 #endif
diff --git a/modules/dnn/test/test_alexnet.cpp b/modules/dnn/test/test_alexnet.cpp
@@ -4,13 +4,11 @@
 namespace cvtest
 {
 
-using namespace std;
-using namespace testing;
 using namespace cv;
 using namespace cv::dnn;
 
 template<typename TString>
-static std::string getTestFile(TString filename)
+static std::string _tf(TString filename)
 {
     return (getOpenCVExtraDir() + "/dnn/") + filename;
 }
@@ -19,21 +17,21 @@ TEST(Reproducibility_AlexNet, Accuracy)
 {
     Net net;
     {
-        Ptr<Importer> importer = createCaffeImporter(getTestFile("bvlc_alexnet.prototxt"), getTestFile("bvlc_alexnet.caffemodel"));
+        Ptr<Importer> importer = createCaffeImporter(_tf("bvlc_alexnet.prototxt"), _tf("bvlc_alexnet.caffemodel"));
         ASSERT_TRUE(importer != NULL);
         importer->populateNet(net);
     }
 
     std::vector<Mat> inpMats;
-    inpMats.push_back( imread(getTestFile("alexnet_0.png")) );
-    inpMats.push_back( imread(getTestFile("alexnet_1.png")) );
+    inpMats.push_back( imread(_tf("alexnet_0.png")) );
+    inpMats.push_back( imread(_tf("alexnet_1.png")) );
     ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty());
 
     net.setBlob(".data", Blob(inpMats));
     net.forward();
 
     Blob out = net.getBlob("prob");
-    Blob ref = blobFromNPY(getTestFile("alexnet.npy"));
+    Blob ref = blobFromNPY(_tf("alexnet.npy"));
     normAssert(ref, out, "prob");
 }
 

diff --git a/modules/dnn/test/test_caffe_importer.cpp b/modules/dnn/test/test_caffe_importer.cpp
@@ -3,18 +3,11 @@
 namespace cvtest
 {
 
-using namespace std;
-using namespace testing;
 using namespace cv;
 using namespace cv::dnn;
 
-static std::string getOpenCVExtraDir()
-{
-    return cvtest::TS::ptr()->get_data_path();
-}
-
-template<typename TStr>
-static std::string getTestFile(TStr filename)
+template<typename TString>
+static std::string _tf(TString filename)
 {
     return (getOpenCVExtraDir() + "/dnn/") + filename;
 }
@@ -23,7 +16,7 @@ TEST(ReadCaffe_GTSRB, Accuracy)
 {
     Net net;
     {
-        Ptr<Importer> importer = createCaffeImporter(getTestFile("gtsrb.prototxt"), "");
+        Ptr<Importer> importer = createCaffeImporter(_tf("gtsrb.prototxt"), "");
         ASSERT_TRUE(importer != NULL);
         importer->populateNet(net);
     }
@@ -33,7 +26,7 @@ TEST(ReadCaffe_GoogLeNet, Accuracy)
 {
     Net net;
     {
-        Ptr<Importer> importer = createCaffeImporter(getTestFile("bvlc_googlenet.prototxt"), "");
+        Ptr<Importer> importer = createCaffeImporter(_tf("bvlc_googlenet.prototxt"), "");
         ASSERT_TRUE(importer != NULL);
         importer->populateNet(net);
     }

diff --git a/modules/dnn/test/test_common.hpp b/modules/dnn/test/test_common.hpp
@@ -6,18 +6,18 @@ inline const std::string &getOpenCVExtraDir()
     return cvtest::TS::ptr()->get_data_path();
 }
 
-inline void normAssert(cv::InputArray ref, cv::InputArray get, const char *comment = "")
+inline void normAssert(cv::InputArray ref, cv::InputArray test, const char *comment = "")
 {
-    double normL1 = cvtest::norm(ref, get, cv::NORM_L1)/ ref.getMat().total();
-    EXPECT_NEAR(normL1, 0, 0.0001) << comment;
+    double normL1 = cvtest::norm(ref, test, cv::NORM_L1) / ref.getMat().total();
+    EXPECT_LE(normL1, 0.0001) << comment;
 
-    double normInf = cvtest::norm(ref, get, cv::NORM_INF);
-    EXPECT_NEAR(normInf, 0, 0.001) << comment;
+    double normInf = cvtest::norm(ref, test, cv::NORM_INF);
+    EXPECT_LE(normInf, 0.001) << comment;
 }
 
 inline void normAssert(cv::dnn::Blob &ref, cv::dnn::Blob &test, const char *comment = "")
 {
-    ASSERT_EQ(ref.shape(), test.shape());
+    ASSERT_EQ(ref.shape(), test.shape()) << comment;
     normAssert(ref.getMatRef(), test.getMatRef(), comment);
 }
 

diff --git a/modules/dnn/test/test_googlenet.cpp b/modules/dnn/test/test_googlenet.cpp
@@ -4,13 +4,11 @@
 namespace cvtest
 {
 
-using namespace std;
-using namespace testing;
 using namespace cv;
 using namespace cv::dnn;
 
 template<typename TString>
-static std::string getTestFile(TString filename)
+static std::string _tf(TString filename)
 {
     return (getOpenCVExtraDir() + "/dnn/") + filename;
 }
@@ -19,22 +17,22 @@ TEST(Reproducibility_GoogLeNet, Accuracy)
 {
     Net net;
     {
-        Ptr<Importer> importer = createCaffeImporter(getTestFile("bvlc_googlenet.prototxt"), getTestFile("bvlc_googlenet.caffemodel"));
+        Ptr<Importer> importer = createCaffeImporter(_tf("bvlc_googlenet.prototxt"), _tf("bvlc_googlenet.caffemodel"));
         ASSERT_TRUE(importer != NULL);
         importer->populateNet(net);
     }
 
     std::vector<Mat> inpMats;
-    inpMats.push_back( imread(getTestFile("googlenet_0.jpg")) );
-    inpMats.push_back( imread(getTestFile("googlenet_1.jpg")) );
+    inpMats.push_back( imread(_tf("googlenet_0.jpg")) );
+    inpMats.push_back( imread(_tf("googlenet_1.jpg")) );
     ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty());
 
     Blob inp(inpMats);
     net.setBlob(".data", inp);
     net.forward();
 
     Blob out = net.getBlob("prob");
-    Blob ref = blobFromNPY(getTestFile("googlenet_prob.npy"));
+    Blob ref = blobFromNPY(_tf("googlenet_prob.npy"));
     normAssert(out, ref);
 }
 

diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp
@@ -5,18 +5,11 @@
 namespace cvtest
 {
 
-using namespace std;
-using namespace testing;
 using namespace cv;
 using namespace cv::dnn;
 
-static std::string getOpenCVExtraDir()
-{
-    return cvtest::TS::ptr()->get_data_path();
-}
-
-template<typename TStr>
-static String _tf(TStr filename)
+template<typename TString>
+static String _tf(TString filename)
 {
     return (getOpenCVExtraDir() + "/dnn/layers/") + filename;
 }
@@ -40,16 +33,7 @@ static void testLayer(String basename, bool useCaffeModel = false)
     net.forward();
     Blob out = net.getBlob("output");
 
-    EXPECT_EQ(ref.shape(), out.shape());
-
-    Mat &mRef = ref.getMatRef();
-    Mat &mOut = out.getMatRef();
-
-    double normL1 = cvtest::norm(mRef, mOut, NORM_L1) / ref.total();
-    EXPECT_LE(normL1, 0.0001);
-
-    double normInf = cvtest::norm(mRef, mOut, NORM_INF);
-    EXPECT_LE(normInf, 0.0001);
+    normAssert(ref, out);
 }
 
 TEST(Layer_Test_Softmax, Accuracy)