Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts: modules/calib3d/include/opencv2/calib3d/calib3d.hpp modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/cuda/limits.hpp modules/core/include/opencv2/core/internal.hpp modules/core/src/matrix.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/hog.cpp modules/ocl/test/test_haar.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/test_pyrup.cpp modules/ts/src/precomp.hpp samples/ocl/facedetect.cpp samples/ocl/hog.cpp samples/ocl/pyrlk_optical_flow.cpp samples/ocl/surf_matcher.cpp
This commit is contained in:
Roman Donchenko
@@ -100,34 +100,39 @@ class TestInfo(object):
|
||||
def dump(self, units="ms"):
|
||||
print "%s ->\t\033[1;31m%s\033[0m = \t%.2f%s" % (str(self), self.status, self.get("gmean", units), units)
|
||||
|
||||
def shortName(self):
|
||||
|
||||
def getName(self):
|
||||
pos = self.name.find("/")
|
||||
if pos > 0:
|
||||
name = self.name[:pos]
|
||||
else:
|
||||
name = self.name
|
||||
if self.fixture.endswith(name):
|
||||
fixture = self.fixture[:-len(name)]
|
||||
return self.name[:pos]
|
||||
return self.name
|
||||
|
||||
|
||||
def getFixture(self):
|
||||
if self.fixture.endswith(self.getName()):
|
||||
fixture = self.fixture[:-len(self.getName())]
|
||||
else:
|
||||
fixture = self.fixture
|
||||
if fixture.endswith("_"):
|
||||
fixture = fixture[:-1]
|
||||
return fixture
|
||||
|
||||
|
||||
def param(self):
|
||||
return '::'.join(filter(None, [self.type_param, self.value_param]))
|
||||
|
||||
def shortName(self):
|
||||
name = self.getName()
|
||||
fixture = self.getFixture()
|
||||
return '::'.join(filter(None, [name, fixture]))
|
||||
|
||||
|
||||
def __str__(self):
|
||||
pos = self.name.find("/")
|
||||
if pos > 0:
|
||||
name = self.name[:pos]
|
||||
else:
|
||||
name = self.name
|
||||
if self.fixture.endswith(name):
|
||||
fixture = self.fixture[:-len(name)]
|
||||
else:
|
||||
fixture = self.fixture
|
||||
if fixture.endswith("_"):
|
||||
fixture = fixture[:-1]
|
||||
name = self.getName()
|
||||
fixture = self.getFixture()
|
||||
return '::'.join(filter(None, [name, fixture, self.type_param, self.value_param]))
|
||||
|
||||
|
||||
def __cmp__(self, other):
|
||||
r = cmp(self.fixture, other.fixture);
|
||||
if r != 0:
|
||||
|
||||
167
modules/ts/misc/xls-report.py
Executable file
167
modules/ts/misc/xls-report.py
Executable file
@@ -0,0 +1,167 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import division
|
||||
|
||||
import ast
|
||||
import logging
|
||||
import numbers
|
||||
import os, os.path
|
||||
import re
|
||||
|
||||
from argparse import ArgumentParser
|
||||
from collections import OrderedDict
|
||||
from glob import glob
|
||||
from itertools import ifilter
|
||||
|
||||
import xlwt
|
||||
|
||||
from testlog_parser import parseLogFile
|
||||
|
||||
# To build XLS report you neet to put your xmls (OpenCV tests output) in the
|
||||
# following way:
|
||||
#
|
||||
# "root" --- folder, representing the whole XLS document. It contains several
|
||||
# subfolders --- sheet-paths of the XLS document. Each sheet-path contains it's
|
||||
# subfolders --- config-paths. Config-paths are columns of the sheet and
|
||||
# they contains xmls files --- output of OpenCV modules testing.
|
||||
# Config-path means OpenCV build configuration, including different
|
||||
# options such as NEON, TBB, GPU enabling/disabling.
|
||||
#
|
||||
# root
|
||||
# root\sheet_path
|
||||
# root\sheet_path\configuration1 (column 1)
|
||||
# root\sheet_path\configuration2 (column 2)
|
||||
|
||||
re_image_size = re.compile(r'^ \d+ x \d+$', re.VERBOSE)
|
||||
re_data_type = re.compile(r'^ (?: 8 | 16 | 32 | 64 ) [USF] C [1234] $', re.VERBOSE)
|
||||
|
||||
time_style = xlwt.easyxf(num_format_str='#0.00')
|
||||
no_time_style = xlwt.easyxf('pattern: pattern solid, fore_color gray25')
|
||||
|
||||
speedup_style = time_style
|
||||
good_speedup_style = xlwt.easyxf('font: color green', num_format_str='#0.00')
|
||||
bad_speedup_style = xlwt.easyxf('font: color red', num_format_str='#0.00')
|
||||
no_speedup_style = no_time_style
|
||||
error_speedup_style = xlwt.easyxf('pattern: pattern solid, fore_color orange')
|
||||
header_style = xlwt.easyxf('font: bold true; alignment: horizontal centre, vertical top, wrap True')
|
||||
|
||||
def collect_xml(collection, configuration, xml_fullname):
|
||||
xml_fname = os.path.split(xml_fullname)[1]
|
||||
module = xml_fname[:xml_fname.index('_')]
|
||||
|
||||
module_tests = collection.setdefault(module, OrderedDict())
|
||||
|
||||
for test in sorted(parseLogFile(xml_fullname)):
|
||||
test_results = module_tests.setdefault((test.shortName(), test.param()), {})
|
||||
test_results[configuration] = test.get("gmean") if test.status == 'run' else test.status
|
||||
|
||||
def main():
|
||||
arg_parser = ArgumentParser(description='Build an XLS performance report.')
|
||||
arg_parser.add_argument('sheet_dirs', nargs='+', metavar='DIR', help='directory containing perf test logs')
|
||||
arg_parser.add_argument('-o', '--output', metavar='XLS', default='report.xls', help='name of output file')
|
||||
arg_parser.add_argument('-c', '--config', metavar='CONF', help='global configuration file')
|
||||
|
||||
args = arg_parser.parse_args()
|
||||
|
||||
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
|
||||
|
||||
if args.config is not None:
|
||||
with open(args.config) as global_conf_file:
|
||||
global_conf = ast.literal_eval(global_conf_file.read())
|
||||
else:
|
||||
global_conf = {}
|
||||
|
||||
wb = xlwt.Workbook()
|
||||
|
||||
for sheet_path in args.sheet_dirs:
|
||||
try:
|
||||
with open(os.path.join(sheet_path, 'sheet.conf')) as sheet_conf_file:
|
||||
sheet_conf = ast.literal_eval(sheet_conf_file.read())
|
||||
except Exception:
|
||||
sheet_conf = {}
|
||||
logging.debug('no sheet.conf for %s', sheet_path)
|
||||
|
||||
sheet_conf = dict(global_conf.items() + sheet_conf.items())
|
||||
|
||||
if 'configurations' in sheet_conf:
|
||||
config_names = sheet_conf['configurations']
|
||||
else:
|
||||
try:
|
||||
config_names = [p for p in os.listdir(sheet_path)
|
||||
if os.path.isdir(os.path.join(sheet_path, p))]
|
||||
except Exception as e:
|
||||
logging.warning('error while determining configuration names for %s: %s', sheet_path, e)
|
||||
continue
|
||||
|
||||
collection = {}
|
||||
|
||||
for configuration, configuration_path in \
|
||||
[(c, os.path.join(sheet_path, c)) for c in config_names]:
|
||||
logging.info('processing %s', configuration_path)
|
||||
for xml_fullname in glob(os.path.join(configuration_path, '*.xml')):
|
||||
collect_xml(collection, configuration, xml_fullname)
|
||||
|
||||
sheet = wb.add_sheet(sheet_conf.get('sheet_name', os.path.basename(os.path.abspath(sheet_path))))
|
||||
|
||||
sheet.row(0).height = 800
|
||||
sheet.panes_frozen = True
|
||||
sheet.remove_splits = True
|
||||
sheet.horz_split_pos = 1
|
||||
sheet.horz_split_first_visible = 1
|
||||
|
||||
sheet_comparisons = sheet_conf.get('comparisons', [])
|
||||
|
||||
for i, w in enumerate([2000, 15000, 2500, 2000, 15000]
|
||||
+ (len(config_names) + 1 + len(sheet_comparisons)) * [3000]):
|
||||
sheet.col(i).width = w
|
||||
|
||||
for i, caption in enumerate(['Module', 'Test', 'Image\nsize', 'Data\ntype', 'Parameters']
|
||||
+ config_names + [None]
|
||||
+ [comp['to'] + '\nvs\n' + comp['from'] for comp in sheet_comparisons]):
|
||||
sheet.row(0).write(i, caption, header_style)
|
||||
|
||||
row = 1
|
||||
|
||||
module_colors = sheet_conf.get('module_colors', {})
|
||||
module_styles = {module: xlwt.easyxf('pattern: pattern solid, fore_color {}'.format(color))
|
||||
for module, color in module_colors.iteritems()}
|
||||
|
||||
for module, tests in sorted(collection.iteritems()):
|
||||
for ((test, param), configs) in tests.iteritems():
|
||||
sheet.write(row, 0, module, module_styles.get(module, xlwt.Style.default_style))
|
||||
sheet.write(row, 1, test)
|
||||
|
||||
param_list = param[1:-1].split(", ")
|
||||
sheet.write(row, 2, next(ifilter(re_image_size.match, param_list), None))
|
||||
sheet.write(row, 3, next(ifilter(re_data_type.match, param_list), None))
|
||||
|
||||
sheet.row(row).write(4, param)
|
||||
for i, c in enumerate(config_names):
|
||||
if c in configs:
|
||||
sheet.write(row, 5 + i, configs[c], time_style)
|
||||
else:
|
||||
sheet.write(row, 5 + i, None, no_time_style)
|
||||
|
||||
for i, comp in enumerate(sheet_comparisons):
|
||||
cmp_from = configs.get(comp["from"])
|
||||
cmp_to = configs.get(comp["to"])
|
||||
col = 5 + len(config_names) + 1 + i
|
||||
|
||||
if isinstance(cmp_from, numbers.Number) and isinstance(cmp_to, numbers.Number):
|
||||
try:
|
||||
speedup = cmp_from / cmp_to
|
||||
sheet.write(row, col, speedup, good_speedup_style if speedup > 1.1 else
|
||||
bad_speedup_style if speedup < 0.9 else
|
||||
speedup_style)
|
||||
except ArithmeticError as e:
|
||||
sheet.write(row, col, None, error_speedup_style)
|
||||
else:
|
||||
sheet.write(row, col, None, no_speedup_style)
|
||||
|
||||
row += 1
|
||||
if row % 1000 == 0: sheet.flush_row_data()
|
||||
|
||||
wb.save(args.output)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -2,6 +2,10 @@
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
|
||||
#ifdef HAVE_TEGRA_OPTIMIZATION
|
||||
#include "tegra.hpp"
|
||||
#endif
|
||||
|
||||
using namespace cv;
|
||||
|
||||
namespace cvtest
|
||||
@@ -2939,28 +2943,76 @@ MatComparator::operator()(const char* expr1, const char* expr2,
|
||||
|
||||
void printVersionInfo(bool useStdOut)
|
||||
{
|
||||
::testing::Test::RecordProperty("CV_VERSION", CV_VERSION);
|
||||
::testing::Test::RecordProperty("cv_version", CV_VERSION);
|
||||
if(useStdOut) std::cout << "OpenCV version: " << CV_VERSION << std::endl;
|
||||
|
||||
std::string buildInfo( cv::getBuildInformation() );
|
||||
|
||||
size_t pos1 = buildInfo.find("Version control");
|
||||
size_t pos2 = buildInfo.find("\n", pos1);\
|
||||
size_t pos2 = buildInfo.find('\n', pos1);
|
||||
if(pos1 != std::string::npos && pos2 != std::string::npos)
|
||||
{
|
||||
std::string ver( buildInfo.substr(pos1, pos2-pos1) );
|
||||
::testing::Test::RecordProperty("Version_control", ver);
|
||||
if(useStdOut) std::cout << ver << std::endl;
|
||||
size_t value_start = buildInfo.rfind(' ', pos2) + 1;
|
||||
std::string ver( buildInfo.substr(value_start, pos2 - value_start) );
|
||||
::testing::Test::RecordProperty("cv_vcs_version", ver);
|
||||
if (useStdOut) std::cout << "OpenCV VCS version: " << ver << std::endl;
|
||||
}
|
||||
|
||||
pos1 = buildInfo.find("inner version");
|
||||
pos2 = buildInfo.find("\n", pos1);\
|
||||
pos2 = buildInfo.find('\n', pos1);
|
||||
if(pos1 != std::string::npos && pos2 != std::string::npos)
|
||||
{
|
||||
std::string ver( buildInfo.substr(pos1, pos2-pos1) );
|
||||
::testing::Test::RecordProperty("inner_version", ver);
|
||||
if(useStdOut) std::cout << ver << std::endl;
|
||||
size_t value_start = buildInfo.rfind(' ', pos2) + 1;
|
||||
std::string ver( buildInfo.substr(value_start, pos2 - value_start) );
|
||||
::testing::Test::RecordProperty("cv_inner_vcs_version", ver);
|
||||
if(useStdOut) std::cout << "Inner VCS version: " << ver << std::endl;
|
||||
}
|
||||
|
||||
#ifdef CV_PARALLEL_FRAMEWORK
|
||||
::testing::Test::RecordProperty("cv_parallel_framework", CV_PARALLEL_FRAMEWORK);
|
||||
if (useStdOut)
|
||||
{
|
||||
std::cout << "Parallel framework: " << CV_PARALLEL_FRAMEWORK << std::endl;
|
||||
}
|
||||
#endif
|
||||
|
||||
std::string cpu_features;
|
||||
|
||||
#if CV_SSE
|
||||
if (checkHardwareSupport(CV_CPU_SSE)) cpu_features += " sse";
|
||||
#endif
|
||||
#if CV_SSE2
|
||||
if (checkHardwareSupport(CV_CPU_SSE2)) cpu_features += " sse2";
|
||||
#endif
|
||||
#if CV_SSE3
|
||||
if (checkHardwareSupport(CV_CPU_SSE3)) cpu_features += " sse3";
|
||||
#endif
|
||||
#if CV_SSSE3
|
||||
if (checkHardwareSupport(CV_CPU_SSSE3)) cpu_features += " ssse3";
|
||||
#endif
|
||||
#if CV_SSE4_1
|
||||
if (checkHardwareSupport(CV_CPU_SSE4_1)) cpu_features += " sse4.1";
|
||||
#endif
|
||||
#if CV_SSE4_2
|
||||
if (checkHardwareSupport(CV_CPU_SSE4_2)) cpu_features += " sse4.2";
|
||||
#endif
|
||||
#if CV_AVX
|
||||
if (checkHardwareSupport(CV_CPU_AVX)) cpu_features += " avx";
|
||||
#endif
|
||||
#if CV_NEON
|
||||
cpu_features += " neon"; // NEON is currently not checked at runtime
|
||||
#endif
|
||||
|
||||
cpu_features.erase(0, 1); // erase initial space
|
||||
|
||||
::testing::Test::RecordProperty("cv_cpu_features", cpu_features);
|
||||
if (useStdOut) std::cout << "CPU features: " << cpu_features << std::endl;
|
||||
|
||||
#ifdef HAVE_TEGRA_OPTIMIZATION
|
||||
const char * tegra_optimization = tegra::isDeviceSupported() ? "enabled" : "disabled";
|
||||
::testing::Test::RecordProperty("cv_tegra_optimization", tegra_optimization);
|
||||
if (useStdOut) std::cout << "Tegra optimization: " << tegra_optimization << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user