From 08ade5e10e3272117b8eb1c0483ac055d0925c20 Mon Sep 17 00:00:00 2001 From: Aleksandr Rybnikov Date: Thu, 18 May 2017 14:55:33 +0300 Subject: [PATCH] Disabled FCN test on win32, changed googlenet test --- modules/dnn/test/test_caffe_importer.cpp | 2 ++ modules/dnn/test/test_googlenet.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/dnn/test/test_caffe_importer.cpp b/modules/dnn/test/test_caffe_importer.cpp index 536bda6a0..aef994194 100644 --- a/modules/dnn/test/test_caffe_importer.cpp +++ b/modules/dnn/test/test_caffe_importer.cpp @@ -101,6 +101,7 @@ TEST(Reproducibility_AlexNet, Accuracy) normAssert(ref, out); } +#if !defined(_WIN32) || defined(_WIN64) TEST(Reproducibility_FCN, Accuracy) { Net net; @@ -126,5 +127,6 @@ TEST(Reproducibility_FCN, Accuracy) Mat ref = blobFromNPY(_tf("caffe_fcn8s_prob.npy")); normAssert(ref, out); } +#endif } diff --git a/modules/dnn/test/test_googlenet.cpp b/modules/dnn/test/test_googlenet.cpp index 4bf1429d4..1f9d8611f 100644 --- a/modules/dnn/test/test_googlenet.cpp +++ b/modules/dnn/test/test_googlenet.cpp @@ -68,11 +68,11 @@ static void launchGoogleNetTest() } std::vector inpMats; - inpMats.push_back( imread(_tf("googlenet_0.jpg")) ); - inpMats.push_back( imread(_tf("googlenet_1.jpg")) ); + inpMats.push_back( imread(_tf("googlenet_0.png")) ); + inpMats.push_back( imread(_tf("googlenet_1.png")) ); ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty()); - net.setBlob(".data", blobFromImages(inpMats, 1., false)); + net.setBlob(".data", blobFromImages(inpMats)); net.forward(); Mat out = net.getBlob("prob");