generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added option to automatically run all accuracy tests with run.py

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-05 12:53:25 +00:00
parent 849e3cfac0
commit d80651d99a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/ts/misc/run.py
View File

@ -4,7 +4,6 @@ from subprocess import Popen, PIPE
hostos = os.name # 'nt', 'posix' hostos = os.name # 'nt', 'posix'
hostmachine = platform.machine() # 'x86', 'AMD64', 'x86_64' hostmachine = platform.machine() # 'x86', 'AMD64', 'x86_64'
nameprefix = "opencv_perf_"
SIMD_DETECTION_PROGRAM=""" SIMD_DETECTION_PROGRAM="""
#if __SSE5__ #if __SSE5__
@ -51,6 +50,7 @@ SIMD_DETECTION_PROGRAM="""
parse_patterns = ( parse_patterns = (
{'name': "has_perf_tests", 'default': "OFF", 'pattern': re.compile("^BUILD_PERF_TESTS:BOOL=(ON)$")}, {'name': "has_perf_tests", 'default': "OFF", 'pattern': re.compile("^BUILD_PERF_TESTS:BOOL=(ON)$")},
{'name': "has_accuracy_tests", 'default': "OFF", 'pattern': re.compile("^BUILD_TESTS:BOOL=(ON)$")},
{'name': "cmake_home", 'default': None, 'pattern': re.compile("^CMAKE_HOME_DIRECTORY:INTERNAL=(.+)$")}, {'name': "cmake_home", 'default': None, 'pattern': re.compile("^CMAKE_HOME_DIRECTORY:INTERNAL=(.+)$")},
{'name': "opencv_home", 'default': None, 'pattern': re.compile("^OpenCV_SOURCE_DIR:STATIC=(.+)$")}, {'name': "opencv_home", 'default': None, 'pattern': re.compile("^OpenCV_SOURCE_DIR:STATIC=(.+)$")},
{'name': "tests_dir", 'default': None, 'pattern': re.compile("^EXECUTABLE_OUTPUT_PATH:PATH=(.+)$")}, {'name': "tests_dir", 'default': None, 'pattern': re.compile("^EXECUTABLE_OUTPUT_PATH:PATH=(.+)$")},
@ -201,6 +201,7 @@ class RunInfo(object):
self.options = options self.options = options
self.path = path self.path = path
self.error = None self.error = None
self.nameprefix = "opencv_" + options.mode + "_"
for p in parse_patterns: for p in parse_patterns:
setattr(self, p["name"], p["default"]) setattr(self, p["name"], p["default"])
cachefile = open(os.path.join(path, "CMakeCache.txt"), "rt") cachefile = open(os.path.join(path, "CMakeCache.txt"), "rt")
@ -268,6 +269,7 @@ class RunInfo(object):
# fix has_perf_tests param # fix has_perf_tests param
self.has_perf_tests = self.has_perf_tests == "ON" self.has_perf_tests = self.has_perf_tests == "ON"
self.has_accuracy_tests = self.has_accuracy_tests == "ON"
# fix is_x64 flag # fix is_x64 flag
self.is_x64 = self.is_x64 == "ON" self.is_x64 = self.is_x64 == "ON"
if not self.is_x64 and ("X64" in "%s %s %s" % (self.cxx_flags, self.cxx_flags_release, self.cxx_flags_debug) or "Win64" in self.cmake_generator): if not self.is_x64 and ("X64" in "%s %s %s" % (self.cxx_flags, self.cxx_flags_release, self.cxx_flags_debug) or "Win64" in self.cmake_generator):
@ -376,7 +378,7 @@ class RunInfo(object):
def getAvailableTestApps(self): def getAvailableTestApps(self):
if self.tests_dir and os.path.isdir(self.tests_dir): if self.tests_dir and os.path.isdir(self.tests_dir):
files = glob.glob(os.path.join(self.tests_dir, nameprefix + "*")) files = glob.glob(os.path.join(self.tests_dir, self.nameprefix + "*"))
if self.targetos == hostos: if self.targetos == hostos:
files = [f for f in files if self.isTest(f)] files = [f for f in files if self.isTest(f)]
return files return files
@ -386,8 +388,8 @@ class RunInfo(object):
app = os.path.basename(app) app = os.path.basename(app)
if app.endswith(".exe"): if app.endswith(".exe"):
app = app[:-4] app = app[:-4]
if app.startswith(nameprefix): if app.startswith(self.nameprefix):
app = app[len(nameprefix):] app = app[len(self.nameprefix):]
if self.cmake_home_svn: if self.cmake_home_svn:
if self.cmake_home_svn == self.opencv_home_svn: if self.cmake_home_svn == self.opencv_home_svn:
@ -518,8 +520,8 @@ class RunInfo(object):
fname = fname[:-4] fname = fname[:-4]
if fname == name: if fname == name:
return t return t
if fname.startswith(nameprefix): if fname.startswith(self.nameprefix):
fname = fname[len(nameprefix):] fname = fname[len(self.nameprefix):]
if fname == name: if fname == name:
return t return t
return None return None
@ -579,7 +581,7 @@ class RunInfo(object):
if self.targetos == "android": if self.targetos == "android":
hostlogpath = "" hostlogpath = ""
try: try:
andoidcwd = "/data/bin/" + getpass.getuser().replace(" ","") + "_perf/" andoidcwd = "/data/bin/" + getpass.getuser().replace(" ","") + "_" + self.options.mode +"/"
exename = os.path.basename(exe) exename = os.path.basename(exe)
androidexe = andoidcwd + exename androidexe = andoidcwd + exename
#upload #upload
@ -656,6 +658,7 @@ if __name__ == "__main__":
parser = OptionParser() parser = OptionParser()
parser.add_option("-t", "--tests", dest="tests", help="comma-separated list of modules to test", metavar="SUITS", default="") parser.add_option("-t", "--tests", dest="tests", help="comma-separated list of modules to test", metavar="SUITS", default="")
parser.add_option("-w", "--cwd", dest="cwd", help="working directory for tests", metavar="PATH", default=".") parser.add_option("-w", "--cwd", dest="cwd", help="working directory for tests", metavar="PATH", default=".")
parser.add_option("-a", "--accuracy", dest="accuracy", help="look for accuracy tests instead of performance tests", action="store_true", default=False)
parser.add_option("-l", "--longname", dest="useLongNames", action="store_true", help="generate log files with long names", default=False) parser.add_option("-l", "--longname", dest="useLongNames", action="store_true", help="generate log files with long names", default=False)
parser.add_option("", "--android_test_data_path", dest="test_data_path", help="OPENCV_TEST_DATA_PATH for Android run", metavar="PATH", default="/sdcard/opencv_testdata/") parser.add_option("", "--android_test_data_path", dest="test_data_path", help="OPENCV_TEST_DATA_PATH for Android run", metavar="PATH", default="/sdcard/opencv_testdata/")
parser.add_option("", "--configuration", dest="configuration", help="force Debug or Release donfiguration", metavar="CFG", default="") parser.add_option("", "--configuration", dest="configuration", help="force Debug or Release donfiguration", metavar="CFG", default="")
@ -663,6 +666,11 @@ if __name__ == "__main__":
parser.add_option("", "--help-tests", dest="help", help="Show help for test executable", action="store_true", default=False) parser.add_option("", "--help-tests", dest="help", help="Show help for test executable", action="store_true", default=False)
(options, args) = parser.parse_args(argv) (options, args) = parser.parse_args(argv)
if options.accuracy:
options.mode = "test"
else:
options.mode = "perf"
run_args = [] run_args = []