Commit d79cb4d9 authored by Manuel Günther's avatar Manuel Günther

cleaned up setup.py; removed LIBSVM_VERSION from the compiler command line

parent d8fd7b15
Pipeline #20963 passed with stage
in 22 minutes and 32 seconds
...@@ -54,23 +54,12 @@ class libsvm: ...@@ -54,23 +54,12 @@ class libsvm:
""" """
def __init__ (self, requirement='', only_static=False): def __init__ (self):
""" """
Searches for libsvm in stock locations. Allows user to override. Searches for libsvm in stock locations.
If the user sets the environment variable BOB_PREFIX_PATH, that prefixes If the user sets the environment variable BOB_PREFIX_PATH, that prefixes
the standard path locations. the standard path locations.
Parameters:
requirement, str
A string, indicating a version requirement for libsvm. For example,
``'>= 3.12'``.
only_static, boolean
A flag, that indicates if we intend to link against the static library
only. This will trigger our library search to disconsider shared
libraries when searching.
""" """
candidates = find_header('svm.h', subpaths=['', 'libsvm', 'libsvm-*/libsvm']) candidates = find_header('svm.h', subpaths=['', 'libsvm', 'libsvm-*/libsvm'])
...@@ -78,34 +67,8 @@ class libsvm: ...@@ -78,34 +67,8 @@ class libsvm:
if not candidates: if not candidates:
raise RuntimeError("could not find libsvm's `svm.h' - have you installed libsvm on this machine?") raise RuntimeError("could not find libsvm's `svm.h' - have you installed libsvm on this machine?")
found = False self.include_directory = os.path.dirname(candidates[0])
self.version = libsvm_version(candidates[0])
if not requirement:
self.include_directory = os.path.dirname(candidates[0])
self.version = libsvm_version(candidates[0])
found = True
else:
# requirement is 'operator' 'version'
operator, required = [k.strip() for k in requirement.split(' ', 1)]
# now check for user requirements
for candidate in candidates:
vv = libsvm_version(candidate)
available = LooseVersion(vv)
if (operator == '<' and available < required) or \
(operator == '<=' and available <= required) or \
(operator == '>' and available > required) or \
(operator == '>=' and available >= required) or \
(operator == '==' and available == required):
self.include_directory = os.path.dirname(candidate)
self.version = vv
found = True
break
if not found:
raise RuntimeError("could not find the required (%s) version of libsvm on the file system (looked at: %s)" % (requirement, ', '.join(candidates)))
# normalize # normalize
self.include_directory = os.path.normpath(self.include_directory) self.include_directory = os.path.normpath(self.include_directory)
...@@ -114,7 +77,7 @@ class libsvm: ...@@ -114,7 +77,7 @@ class libsvm:
prefix = os.path.dirname(os.path.dirname(self.include_directory)) prefix = os.path.dirname(os.path.dirname(self.include_directory))
module = 'svm' module = 'svm'
candidates = find_library(module, version=self.version, candidates = find_library(module, version=self.version,
prefixes=[prefix], only_static=only_static) prefixes=[prefix], only_static=False)
if not candidates: if not candidates:
raise RuntimeError("cannot find required libsvm binary module `%s' - make sure libsvm is installed on `%s'" % (module, prefix)) raise RuntimeError("cannot find required libsvm binary module `%s' - make sure libsvm is installed on `%s'" % (module, prefix))
...@@ -143,10 +106,10 @@ class libsvm: ...@@ -143,10 +106,10 @@ class libsvm:
>>> from bob.learn.libsvm import libsvm >>> from bob.learn.libsvm import libsvm
>>> pkg = libsvm() >>> pkg = libsvm()
>>> pkg.macros() >>> pkg.macros()
[('HAVE_LIBSVM', '1'), ('LIBSVM_VERSION', '"..."')] [('HAVE_LIBSVM', '1')]
""" """
return [('HAVE_LIBSVM', '1'), ('LIBSVM_VERSION', '"%s"' % self.version)] return [('HAVE_LIBSVM', '1')]
pkg = libsvm() pkg = libsvm()
system_include_dirs = [pkg.include_directory] system_include_dirs = [pkg.include_directory]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment