mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dnn: update tests for OpenVINO models

Browse Source
This commit is contained in:
Alexander Alekhin 2018-07-23 18:17:51 +03:00 committed by Dmitry Kurtaev
parent 6e767e2376
commit 4283309daa
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/dnn/test/test_ie_models.cpp
View File

@ -13,15 +13,22 @@
#include <ie_icnn_network.hpp> #include <ie_icnn_network.hpp>
#include <ie_extension.h> #include <ie_extension.h>
static std::string extraTestDataPath =
#ifdef WINRT
NULL;
#else
getenv("INTEL_CVSDK_DIR");
#endif
namespace opencv_test { namespace { namespace opencv_test { namespace {
static void initDLDTDataPath()
{
#ifndef WINRT
static bool initialized = false;
if (!initialized)
{
const char* dldtTestDataPath = getenv("INTEL_CVSDK_DIR");
if (dldtTestDataPath)
cvtest::addDataSearchPath(cv::utils::fs::join(dldtTestDataPath, "deployment_tools"));
initialized = true;
}
#endif
}
using namespace cv; using namespace cv;
using namespace cv::dnn; using namespace cv::dnn;
using namespace InferenceEngine; using namespace InferenceEngine;
@ -174,13 +181,11 @@ TEST_P(DNNTestOpenVINO, models)
throw SkipTestException(""); throw SkipTestException("");
std::string precision = (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD) ? "FP16" : "FP32"; std::string precision = (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD) ? "FP16" : "FP32";
std::string prefix = utils::fs::join(extraTestDataPath, std::string prefix = utils::fs::join("intel_models",
utils::fs::join("deployment_tools",
utils::fs::join("intel_models",
utils::fs::join(modelName, utils::fs::join(modelName,
utils::fs::join(precision, modelName))))); utils::fs::join(precision, modelName)));
std::string xmlPath = prefix + ".xml"; std::string xmlPath = findDataFile(prefix + ".xml");
std::string binPath = prefix + ".bin"; std::string binPath = findDataFile(prefix + ".bin");
std::map<std::string, cv::Mat> inputsMap; std::map<std::string, cv::Mat> inputsMap;
std::map<std::string, cv::Mat> ieOutputsMap, cvOutputsMap; std::map<std::string, cv::Mat> ieOutputsMap, cvOutputsMap;
@ -199,17 +204,30 @@ TEST_P(DNNTestOpenVINO, models)
static testing::internal::ParamGenerator<String> intelModels() static testing::internal::ParamGenerator<String> intelModels()
{ {
String path = utils::fs::join(utils::fs::join(extraTestDataPath, "deployment_tools"), "intel_models"); initDLDTDataPath();
std::vector<String> modelsNames; std::vector<String> modelsNames;
std::string path;
try
{
path = findDataDirectory("intel_models", false);
}
catch (...)
{
std::cerr << "ERROR: Can't find OpenVINO models. Check INTEL_CVSDK_DIR environment variable (run setup.sh)" << std::endl;
return ValuesIn(modelsNames); // empty list
}
cv::utils::fs::glob_relative(path, "", modelsNames, false, true); cv::utils::fs::glob_relative(path, "", modelsNames, false, true);
std::vector<String>::iterator end = modelsNames.erase(
std::remove_if(modelsNames.begin(), modelsNames.end(), std::remove_if(modelsNames.begin(), modelsNames.end(),
[&](const String& dir){ return !utils::fs::isDirectory(utils::fs::join(path, dir)); }); [&](const String& dir){ return !utils::fs::isDirectory(utils::fs::join(path, dir)); }),
modelsNames = std::vector<String>(modelsNames.begin(), end); modelsNames.end()
);
CV_Assert(!modelsNames.empty());
return testing::ValuesIn(modelsNames); return ValuesIn(modelsNames);
} }
INSTANTIATE_TEST_CASE_P(/**/, DNNTestOpenVINO, Combine( INSTANTIATE_TEST_CASE_P(/**/, DNNTestOpenVINO, Combine(

1
modules/ts/include/opencv2/ts.hpp
View File

@ -103,6 +103,7 @@ using std::pair;
using std::make_pair; using std::make_pair;
using testing::TestWithParam; using testing::TestWithParam;
using testing::Values; using testing::Values;
using testing::ValuesIn;
using testing::Combine; using testing::Combine;
using cv::Mat; using cv::Mat;