Skip to content

D
dlib
Commit 635747e6 authored by Davis King's avatar Davis King
Browse files
Options

Cleaned up setup.py and the python cmake script.

parent e975eeed
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 716 deletions
setup.py
View file @ 635747e6
...@@ -16,288 +16,71 @@ To upload the binary wheel to PyPi ...@@ -16,288 +16,71 @@ To upload the binary wheel to PyPi
twine upload dist/*.whl twine upload dist/*.whl
To upload the source distribution to PyPi To upload the source distribution to PyPi
python setup.py sdist upload python setup.py sdist upload
To repackage the previously built package as wheel (bypassing build):
python setup.py bdist_wheel --repackage
To install a develop version (egg with symbolic link):
python setup.py develop
To exclude/include certain options in the cmake config use --yes and --no: To exclude/include certain options in the cmake config use --yes and --no:
for example: for example:
--yes DLIB_NO_GUI_SUPPORT: will set -DDLIB_NO_GUI_SUPPORT=yes --yes USE_AVX_INSTRUCTIONS: will set -DUSE_AVX_INSTRUCTIONS=yes
--no DLIB_NO_GUI_SUPPORT: will set -DDLIB_NO_GUI_SUPPORT=no --no USE_AVX_INSTRUCTIONS: will set -DUSE_AVX_INSTRUCTIONS=no
Additional options: Additional options:
--compiler-flags: pass flags onto the compiler, e.g. --compiler-flag "-Os -Wall" passes -Os -Wall onto GCC. --compiler-flags: pass flags onto the compiler, e.g. --compiler-flag "-Os -Wall" passes -Os -Wall onto GCC.
--debug: makes a debug build --clean: delete any previous build folders and rebuild. You should do this if you change any build options
--cmake: path to specific cmake executable by setting --compiler-flags or --yes or --no since last time you ran a build to make sure the changes
--G or -G: name of a build system generator (equivalent of passing -G "name" to cmake) take effect.
""" """
from __future__ import print_function
import shutil
import stat
import errno
import subprocess
from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
from setuptools.command.develop import develop as _develop
from distutils.command.build_ext import build_ext as _build_ext
from distutils.command.build import build as _build
from distutils.errors import DistutilsSetupError
from distutils.spawn import find_executable
from distutils.sysconfig import get_python_inc, get_python_version, get_config_var
from distutils.version import LooseVersion
from distutils import log
import os import os
import re
import sys import sys
from setuptools import Extension, setup import shutil
import platform import platform
from subprocess import Popen, PIPE, STDOUT import subprocess
import signal from distutils import log
from threading import Thread
import time
import re
import pkg_resources
import textwrap
# change directory to this module path from setuptools import setup, Extension
try: from setuptools.command.build_ext import build_ext
this_file = __file__ from distutils.version import LooseVersion
except NameError:
this_file = sys.argv[0]
this_file = os.path.abspath(this_file)
if os.path.dirname(this_file):
os.chdir(os.path.dirname(this_file))
script_dir = os.getcwd()
def _get_options(): def get_extra_cmake_options():
"""read arguments and creates options """read --clean, --yes, --no, and --compiler-flag options from the command line and add them as cmake switches.
""" """
_cmake_path = find_executable("cmake") _cmake_extra_options = []
_cmake_extra = [] _clean_build_folder = False
_cmake_config = 'Release'
_options = []
opt_key = None opt_key = None
_generator_set = False # if a build generator is set
argv = [arg for arg in sys.argv] # take a copy argv = [arg for arg in sys.argv] # take a copy
# parse commandline options and consume those we care about # parse command line options and consume those we care about
for opt_idx, arg in enumerate(argv): for opt_idx, arg in enumerate(argv):
if opt_key == 'cmake': if opt_key == 'compiler-flags':
_cmake_path = arg _cmake_extra_options.append('-DCMAKE_CXX_FLAGS={arg}'.format(arg=arg.strip()))
elif opt_key == 'compiler-flags':
_cmake_extra.append('-DCMAKE_CXX_FLAGS={arg}'.format(arg=arg.strip()))
elif opt_key == 'yes': elif opt_key == 'yes':
_cmake_extra.append('-D{arg}=yes'.format(arg=arg.strip())) _cmake_extra_options.append('-D{arg}=yes'.format(arg=arg.strip()))
elif opt_key == 'no': elif opt_key == 'no':
_cmake_extra.append('-D{arg}=no'.format(arg=arg.strip())) _cmake_extra_options.append('-D{arg}=no'.format(arg=arg.strip()))
elif opt_key == 'G':
_cmake_extra += ['-G', arg.strip()]
_generator_set = True
if opt_key: if opt_key:
sys.argv.remove(arg) sys.argv.remove(arg)
opt_key = None opt_key = None
continue continue
# Keep -G to resemble cmake's if arg == '--clean':
if arg == '-G' or arg.lower() == '--g': _clean_build_folder = True
opt_key = 'G'
sys.argv.remove(arg) sys.argv.remove(arg)
continue continue
if not arg.startswith('--'): if arg in ['--yes', '--no', '--compiler-flags']:
continue opt_key = arg[2:].lower()
opt = arg[2:].lower()
if opt == 'cmake':
_cmake_path = None
opt_key = opt
sys.argv.remove(arg) sys.argv.remove(arg)
continue continue
elif opt in ['yes', 'no', 'compiler-flags']:
opt_key = opt
sys.argv.remove(arg)
continue
custom_arg = True
if opt == 'debug':
_cmake_config = 'Debug'
elif opt == 'release':
_cmake_config = 'Release'
elif opt in ['repackage']:
_options.append(opt)
else:
custom_arg = False
if custom_arg:
sys.argv.remove(arg)
return _options, _cmake_config, _cmake_path, _cmake_extra, _generator_set
options, cmake_config, cmake_path, cmake_extra, generator_set = _get_options()
def reg_value(rk, rname):
"""enumerate the subkeys in a registry key
:param rk: root key in registry
:param rname: name of the value we are interested in
"""
try:
import _winreg as winreg
except ImportError:
# noinspection PyUnresolvedReferences
import winreg
count = 0
try:
while True:
name, value, _ = winreg.EnumValue(rk, count)
if rname == name:
return value
count += 1
except OSError:
pass
return None
def enum_reg_key(rk):
"""enumerate the subkeys in a registry key
:param rk: root key in registry
"""
try:
import _winreg as winreg
except ImportError:
# noinspection PyUnresolvedReferences
import winreg
sub_keys = []
count = 0
try:
while True:
name = winreg.EnumKey(rk, count)
sub_keys.append(name)
count += 1
except OSError:
pass
return sub_keys
try:
from Queue import Queue, Empty
except ImportError:
# noinspection PyUnresolvedReferences
from queue import Queue, Empty # python 3.x
_ON_POSIX = 'posix' in sys.builtin_module_names
def enqueue_output(out, queue):
for line in iter(out.readline, b''):
queue.put(line)
def _log_buf(buf):
if not buf:
return
if sys.stdout.encoding:
buf = buf.decode(sys.stdout.encoding)
buf = buf.rstrip()
lines = buf.splitlines()
for line in lines:
log.info(line)
def get_cmake_version(cmake_path):
p = re.compile("version ([0-9.]+)")
cmake_output = subprocess.check_output(cmake_path + " --version").decode("utf-8");
return p.search(cmake_output).group(1)
def run_process(cmds, timeout=None): return _cmake_extra_options, _clean_build_folder
"""run a process asynchronously
:param cmds: list of commands to invoke on a shell e.g. ['make', 'install']
:param timeout: timeout in seconds (optional)
"""
# open process as its own session, and with no stdout buffering
p = Popen(cmds,
stdout=PIPE, stderr=STDOUT,
bufsize=1,
close_fds=_ON_POSIX, preexec_fn=os.setsid if _ON_POSIX else None)
q = Queue()
t = Thread(target=enqueue_output, args=(p.stdout, q))
t.daemon = True # thread dies with the program
t.start()
_time = time.time()
e = None
try:
while t.isAlive():
try:
buf = q.get(timeout=.1)
except Empty:
buf = b''
_log_buf(buf)
elapsed = time.time() - _time
if timeout and elapsed > timeout:
break
# Make sure we print all the output from the process.
if p.stdout:
for line in p.stdout:
_log_buf(line)
p.wait()
except (KeyboardInterrupt, SystemExit) as e:
# if user interrupted
pass
# noinspection PyBroadException
try:
os.kill(p.pid, signal.SIGINT)
except (KeyboardInterrupt, SystemExit) as e:
pass
except:
pass
# noinspection PyBroadException
try:
if e:
os.kill(p.pid, signal.SIGKILL)
else:
p.wait()
except (KeyboardInterrupt, SystemExit) as e:
# noinspection PyBroadException
try:
os.kill(p.pid, signal.SIGKILL)
except:
pass
except:
pass
t.join(timeout=0.1)
if e:
raise e
return p.returncode cmake_extra_options,clean_build_folder = get_extra_cmake_options()
def readme(fname): class CMakeExtension(Extension):
"""Read text out of a file relative to setup.py. def __init__(self, name, sourcedir=''):
""" Extension.__init__(self, name, sources=[])
return open(os.path.join(script_dir, fname)).read() self.sourcedir = os.path.abspath(sourcedir)
def read_version():
"""Read version information
"""
major = re.findall("set\(CPACK_PACKAGE_VERSION_MAJOR.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
minor = re.findall("set\(CPACK_PACKAGE_VERSION_MINOR.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
patch = re.findall("set\(CPACK_PACKAGE_VERSION_PATCH.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
return major + '.' + minor + '.' + patch
def rmtree(name): def rmtree(name):
"""remove a directory and its subdirectories. """remove a directory and its subdirectories.
...@@ -309,287 +92,105 @@ def rmtree(name): ...@@ -309,287 +92,105 @@ def rmtree(name):
func(path) func(path)
else: else:
raise raise
shutil.rmtree(name, ignore_errors=False, onerror=remove_read_only)
def copy_file(src, dst):
"""copy a single file and log
"""
log.info("Copying file %s -> %s." % (src, dst))
shutil.copy2(src, dst)
def clean_dist():
"""re-create the dist folder
"""
dist_dir = os.path.join(script_dir, "./dist")
if os.path.exists(dist_dir):
log.info('Removing distribution directory %s' % dist_dir)
rmtree(dist_dir)
dist_dir = os.path.join(script_dir, "./dist/dlib") if os.path.exists(name):
try: log.info('Removing old directory {}'.format(name))
os.makedirs(dist_dir) shutil.rmtree(name, ignore_errors=False, onerror=remove_read_only)
except OSError:
pass
# always start with a clean slate class CMakeBuild(build_ext):
clean_dist()
def get_cmake_version(self):
# noinspection PyPep8Naming
class build(_build):
def run(self):
repackage = 'repackage' in options
if not repackage:
self.build_dlib()
# this is where the extension examples go
dist_dir_examples = os.path.join(script_dir, "./dist/dlib/examples")
try: try:
os.makedirs(dist_dir_examples) out = subprocess.check_output(['cmake', '--version'])
except OSError: except OSError:
pass raise RuntimeError("CMake must be installed to build the following extensions: " +
", ".join(e.name for e in self.extensions))
# this is where the extension goes return re.search(r'version\s*([\d.]+)', out.decode()).group(1)
dist_dir = os.path.join(script_dir, "./dist/dlib")
log.info('Populating the distribution directory %s ...' % dist_dir)
# create the module init files
with open(os.path.join(dist_dir, '__init__.py'), 'w') as f:
# just so that we can `import dlib` and not `from dlib import dlib`
f.write('from .dlib import *\n')
# add version here
f.write('__version__ = "{ver}"\n'.format(ver=read_version()))
with open(os.path.join(dist_dir_examples, '__init__.py'), 'w'):
pass
# this is where the extension and Python examples are located
out_dir = os.path.join(script_dir, "./python_examples")
# these are the created artifacts we want to package
dll_ext = ['.so']
if sys.platform == "win32":
dll_ext = ['.pyd', '.dll']
ext_found = False
# manually copy everything to distribution folder with package hierarchy in mind
names = os.listdir(out_dir)
for name in names:
srcname = os.path.join(out_dir, name)
dstname = os.path.join(dist_dir, name)
dstextname = os.path.join(dist_dir_examples, name)
name, extension = os.path.splitext(name.lower())
if extension in ['.py', '.txt']:
copy_file(srcname, dstextname)
elif extension in dll_ext:
if name.startswith('dlib'):
ext_found = True
copy_file(srcname, dstname)
if not ext_found:
raise DistutilsSetupError("Cannot find built dlib extension module.")
return _build.run(self)
@staticmethod
def build_dlib():
"""use cmake to build and install the extension
"""
if cmake_path is None:
cmake_install_url = "https://cmake.org/install/"
message = ("You can install cmake using the instructions at " +
cmake_install_url)
msg_pkgmanager = ("You can install cmake on {0} using "
"`sudo {1} install cmake`.")
if sys.platform == "darwin":
pkgmanagers = ('brew', 'port')
for manager in pkgmanagers:
if find_executable(manager) is not None:
message = msg_pkgmanager.format('OSX', manager)
break
elif sys.platform.startswith('linux'):
try:
import distro
except ImportError as err:
import pip
pip_exit = pip.main(['install', '-q', 'distro'])
if pip_exit > 0:
log.debug("Unable to install `distro` to identify "
"the recommended command. Falling back "
"to default error message.")
distro = err
else:
import distro
if not isinstance(distro, ImportError):
distname = distro.id()
if distname in ('debian', 'ubuntu'):
message = msg_pkgmanager.format(
distname.title(), 'apt-get')
elif distname in ('fedora', 'centos', 'redhat'):
pkgmanagers = ("dnf", "yum")
for manager in pkgmanagers:
if find_executable(manager) is not None:
message = msg_pkgmanager.format(
distname.title(), manager)
break
raise DistutilsSetupError(
"Cannot find cmake, ensure it is installed and in the path.\n"
+ message + "\n"
"You can also specify its path with --cmake parameter.")
platform_arch = platform.architecture()[0]
log.info("Detected Python architecture: %s" % platform_arch)
# make sure build artifacts are generated for the version of Python currently running
cmake_extra_arch = []
inc_dir = get_python_inc()
lib_dir = get_config_var('LIBDIR')
if (inc_dir != None):
cmake_extra_arch += ['-DPYTHON_INCLUDE_DIR=' + inc_dir]
if (lib_dir != None):
cmake_extra_arch += ['-DCMAKE_LIBRARY_PATH=' + lib_dir]
if sys.version_info >= (3, 0):
cmake_extra_arch += ['-DPYTHON3=yes']
log.info("Detected platform: %s" % sys.platform)
if sys.platform == "darwin":
# build on OS X
# by default, cmake will choose the system python lib in /usr/lib
# this checks the sysconfig and will correctly pick up a brewed python lib
# e.g. in /usr/local/Cellar
py_ver = get_python_version()
# check: in some virtual environments the libpython has the form "libpython_#m.dylib
py_lib = os.path.join(get_config_var('LIBDIR'), 'libpython'+py_ver+'.dylib')
if not os.path.isfile(py_lib):
py_lib = os.path.join(get_config_var('LIBDIR'), 'libpython'+py_ver+'m.dylib')
cmake_extra_arch += ['-DPYTHON_LIBRARY={lib}'.format(lib=py_lib)]
if sys.platform == "win32":
if platform_arch == '64bit':
cmake_extra_arch += ['-DCMAKE_GENERATOR_PLATFORM=x64']
# Setting the cmake generator only works in versions of cmake >= 3.1
if (LooseVersion(get_cmake_version(cmake_path)) < LooseVersion("3.1.0")):
raise DistutilsSetupError(
"You need to install a newer version of cmake. Version 3.1 or newer is required.");
# this imitates cmake in path resolution
py_ver = get_python_version()
for ext in [py_ver.replace(".", "") + '.lib', py_ver + 'mu.lib', py_ver + 'm.lib', py_ver + 'u.lib']:
py_lib = os.path.abspath(os.path.join(inc_dir, '../libs/', 'python' + ext))
if os.path.exists(py_lib):
cmake_extra_arch += ['-DPYTHON_LIBRARY={lib}'.format(lib=py_lib)]
break
build_dir = os.path.join(script_dir, "./tools/python/build")
if os.path.exists(build_dir):
log.info('Removing build directory %s' % build_dir)
rmtree(build_dir)
try: def run(self):
os.makedirs(build_dir) if platform.system() == "Windows":
except OSError: if LooseVersion(self.get_cmake_version()) < '3.1.0':
pass raise RuntimeError("CMake >= 3.1.0 is required on Windows")
# cd build for ext in self.extensions:
os.chdir(build_dir) self.build_extension(ext)
log.info('Configuring cmake ...')
cmake_cmd = [
cmake_path,
"..",
] + cmake_extra + cmake_extra_arch
if run_process(cmake_cmd):
raise DistutilsSetupError("cmake configuration failed!")
log.info('Build using cmake ...') def build_extension(self, ext):
extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
cmake_cmd = [ cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
cmake_path, '-DPYTHON_EXECUTABLE=' + sys.executable]
"--build", ".",
"--config", cmake_config,
"--target", "install",
]
if run_process(cmake_cmd): cmake_args += cmake_extra_options
raise DistutilsSetupError("cmake build failed!")
# cd back where setup awaits cfg = 'Debug' if self.debug else 'Release'
os.chdir(script_dir) build_args = ['--config', cfg]
if platform.system() == "Windows":
cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
if sys.maxsize > 2**32:
cmake_args += ['-A', 'x64']
build_args += ['--', '/m']
else:
cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
build_args += ['--', '-j2']
# noinspection PyPep8Naming build_folder = os.path.abspath(self.build_temp)
class develop(_develop):
def __init__(self, *args, **kwargs): if clean_build_folder:
_develop.__init__(self, *args, **kwargs) rmtree(build_folder)
if not os.path.exists(build_folder):
os.makedirs(build_folder)
def run(self): print("Invoking CMake: '{}'".format(['cmake', ext.sourcedir] + cmake_args))
self.run_command("build") subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=build_folder)
return _develop.run(self) subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=build_folder)
# noinspection PyPep8Naming from setuptools.command.test import test as TestCommand
class bdist_egg(_bdist_egg): class PyTest(TestCommand):
def __init__(self, *args, **kwargs): user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
_bdist_egg.__init__(self, *args, **kwargs)
def run(self): def initialize_options(self):
self.run_command("build") TestCommand.initialize_options(self)
return _bdist_egg.run(self) self.pytest_args = ''
def run_tests(self):
import shlex
#import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(shlex.split(self.pytest_args))
sys.exit(errno)
# noinspection PyPep8Naming def read_version_from_cmakelists(cmake_file):
class build_ext(_build_ext): """Read version information
def __init__(self, *args, **kwargs): """
_build_ext.__init__(self, *args, **kwargs) major = re.findall("set\(CPACK_PACKAGE_VERSION_MAJOR.*\"(.*)\"", open(cmake_file).read())[0]
minor = re.findall("set\(CPACK_PACKAGE_VERSION_MINOR.*\"(.*)\"", open(cmake_file).read())[0]
patch = re.findall("set\(CPACK_PACKAGE_VERSION_PATCH.*\"(.*)\"", open(cmake_file).read())[0]
return major + '.' + minor + '.' + patch
def run(self): def read_entire_file(fname):
# cmake will do the heavy lifting, just pick up the fruits of its labour """Read text out of a file relative to setup.py.
pass """
return open(os.path.join(fname)).read()
def is_installed(requirement):
try:
pkg_resources.require(requirement)
except pkg_resources.ResolutionError:
return False
else:
return True
if not is_installed('numpy>=1.5.1'):
print(textwrap.dedent("""
Warning: Functions that return numpy arrays need Numpy (>= v1.5.1) installed!
You can install numpy and then run this setup again:
$ pip install numpy
"""), file=sys.stderr)
setup( setup(
name='dlib', name='dlib',
version=read_version(), version=read_version_from_cmakelists('dlib/CMakeLists.txt'),
keywords=['dlib', 'Computer Vision', 'Machine Learning'],
description='A toolkit for making real world machine learning and data analysis applications', description='A toolkit for making real world machine learning and data analysis applications',
long_description=readme('README.md'), long_description=read_entire_file('README.md'),
author='Davis King', author='Davis King',
author_email='davis@dlib.net', author_email='davis@dlib.net',
url='https://github.com/davisking/dlib', url='https://github.com/davisking/dlib',
license='Boost Software License', license='Boost Software License',
packages=['dlib'], ext_modules=[CMakeExtension('dlib','tools/python')],
package_dir={'': 'dist'}, cmdclass=dict(build_ext=CMakeBuild, test=PyTest),
include_package_data=True,
cmdclass={
'build': build,
'build_ext': build_ext,
'bdist_egg': bdist_egg,
'develop': develop,
},
zip_safe=False, zip_safe=False,
ext_modules=[Extension('dlib', [])], tests_require=['pytest'],
ext_package='dlib', packages=['dlib'],
keywords=['dlib', 'Computer Vision', 'Machine Learning'],
classifiers=[ classifiers=[
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research', 'Intended Audience :: Science/Research',
......
setup_new.py deleted 100644 → 0
View file @ e975eeed
import os
import re
import sys
import shutil
import platform
import subprocess
from distutils import log
from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext
from distutils.version import LooseVersion
def get_extra_cmake_options():
"""read --clean, --yes, --no, and --compiler-flag options from the command line and add them as cmake switches.
"""
_cmake_extra_options = []
_clean_build_folder = False
opt_key = None
argv = [arg for arg in sys.argv] # take a copy
# parse command line options and consume those we care about
for opt_idx, arg in enumerate(argv):
if opt_key == 'compiler-flags':
_cmake_extra_options.append('-DCMAKE_CXX_FLAGS={arg}'.format(arg=arg.strip()))
elif opt_key == 'yes':
_cmake_extra_options.append('-D{arg}=yes'.format(arg=arg.strip()))
elif opt_key == 'no':
_cmake_extra_options.append('-D{arg}=no'.format(arg=arg.strip()))
if opt_key:
sys.argv.remove(arg)
opt_key = None
continue
if arg == '--clean':
_clean_build_folder = True
sys.argv.remove(arg)
continue
if arg in ['--yes', '--no', '--compiler-flags']:
opt_key = arg[2:].lower()
sys.argv.remove(arg)
continue
return _cmake_extra_options, _clean_build_folder
cmake_extra_options,clean_build_folder = get_extra_cmake_options()
class CMakeExtension(Extension):
def __init__(self, name, sourcedir=''):
Extension.__init__(self, name, sources=[])
self.sourcedir = os.path.abspath(sourcedir)
def rmtree(name):
"""remove a directory and its subdirectories.
"""
def remove_read_only(func, path, exc):
excvalue = exc[1]
if func in (os.rmdir, os.remove) and excvalue.errno == errno.EACCES:
os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
func(path)
else:
raise
if os.path.exists(name):
log.info('Removing old directory {}'.format(name))
shutil.rmtree(name, ignore_errors=False, onerror=remove_read_only)
class CMakeBuild(build_ext):
def get_cmake_version(self):
try:
out = subprocess.check_output(['cmake', '--version'])
except OSError:
raise RuntimeError("CMake must be installed to build the following extensions: " +
", ".join(e.name for e in self.extensions))
return re.search(r'version\s*([\d.]+)', out.decode()).group(1)
def run(self):
if platform.system() == "Windows":
if LooseVersion(self.get_cmake_version()) < '3.1.0':
raise RuntimeError("CMake >= 3.1.0 is required on Windows")
for ext in self.extensions:
self.build_extension(ext)
def build_extension(self, ext):
extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
'-DPYTHON_EXECUTABLE=' + sys.executable]
cmake_args += cmake_extra_options
cfg = 'Debug' if self.debug else 'Release'
build_args = ['--config', cfg]
if platform.system() == "Windows":
cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
if sys.maxsize > 2**32:
cmake_args += ['-A', 'x64']
build_args += ['--', '/m']
else:
cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
build_args += ['--', '-j2']
build_folder = os.path.abspath(self.build_temp)
if clean_build_folder:
rmtree(build_folder)
if not os.path.exists(build_folder):
os.makedirs(build_folder)
print("Invoking CMake: '{}'".format(['cmake', ext.sourcedir] + cmake_args))
subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=build_folder)
subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=build_folder)
from setuptools.command.test import test as TestCommand
class PyTest(TestCommand):
user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
def initialize_options(self):
TestCommand.initialize_options(self)
self.pytest_args = ''
def run_tests(self):
import shlex
#import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(shlex.split(self.pytest_args))
sys.exit(errno)
def read_version():
"""Read version information
"""
major = re.findall("set\(CPACK_PACKAGE_VERSION_MAJOR.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
minor = re.findall("set\(CPACK_PACKAGE_VERSION_MINOR.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
patch = re.findall("set\(CPACK_PACKAGE_VERSION_PATCH.*\"(.*)\"", open('dlib/CMakeLists.txt').read())[0]
return major + '.' + minor + '.' + patch
def readme(fname):
"""Read text out of a file relative to setup.py.
"""
return open(os.path.join(fname)).read()
setup(
name='dlib',
version=read_version(),
keywords=['dlib', 'Computer Vision', 'Machine Learning'],
description='A toolkit for making real world machine learning and data analysis applications',
long_description=readme('README.md'),
author='Davis King',
author_email='davis@dlib.net',
url='https://github.com/davisking/dlib',
license='Boost Software License',
packages=['dlib'],
ext_modules=[CMakeExtension('dlib','tools/python')],
cmdclass=dict(build_ext=CMakeBuild, test=PyTest),
zip_safe=False,
tests_require=['pytest'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
'Intended Audience :: Developers',
'Operating System :: MacOS :: MacOS X',
'Operating System :: POSIX',
'Operating System :: POSIX :: Linux',
'Operating System :: Microsoft',
'Operating System :: Microsoft :: Windows',
'Programming Language :: C++',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Scientific/Engineering :: Image Recognition',
'Topic :: Software Development',
],
)
tools/python/CMakeLists.txt
View file @ 635747e6
...@@ -5,7 +5,6 @@ set(USE_SSE4_INSTRUCTIONS ON CACHE BOOL "Use SSE4 instructions") ...@@ -5,7 +5,6 @@ set(USE_SSE4_INSTRUCTIONS ON CACHE BOOL "Use SSE4 instructions")
# Make DLIB_ASSERT statements not abort the python interpreter, but just return an error. # Make DLIB_ASSERT statements not abort the python interpreter, but just return an error.
add_definitions(-DDLIB_NO_ABORT_ON_2ND_FATAL_ERROR) add_definitions(-DDLIB_NO_ABORT_ON_2ND_FATAL_ERROR)
option(PYTHON3 "Build a Python3 compatible library rather than Python2." OFF)
# Avoid cmake warnings about changes in behavior of some Mac OS X path # Avoid cmake warnings about changes in behavior of some Mac OS X path
# variable we don't care about. # variable we don't care about.
...@@ -13,23 +12,6 @@ if (POLICY CMP0042) ...@@ -13,23 +12,6 @@ if (POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) cmake_policy(SET CMP0042 NEW)
endif() endif()
# Sometimes a computer will have multiple python verions installed. So in this
# block of code we find the one in the user's path and add its home folder into
# cmake's search path. That way it will use that version of python first.
if (PYTHON3)
find_program(PYTHON_EXECUTABLE python3)
endif()
if (NOT PYTHON_EXECUTABLE)
find_program(PYTHON_EXECUTABLE python)
endif()
# Resolve symbolic links, hopefully this will give us a path in the proper
# python home directory.
get_filename_component(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} REALPATH)
# Pick out the parent directories
get_filename_component(PYTHON_PATH ${PYTHON_EXECUTABLE} PATH)
get_filename_component(PYTHON_PATH ${PYTHON_PATH} PATH)
list(APPEND CMAKE_PREFIX_PATH "${PYTHON_PATH}")
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
# Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set # Just setting CMAKE_POSITION_INDEPENDENT_CODE should be enough to set
...@@ -50,16 +32,12 @@ if (MSVC) ...@@ -50,16 +32,12 @@ if (MSVC)
endif() endif()
add_subdirectory(../../dlib/external/pybind11 ./pybind11_build) add_subdirectory(../../dlib/external/pybind11 ./pybind11_build)
add_subdirectory(../../dlib ./dlib_build)
# include dlib so we can link against it
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../../dlib ./dlib_build)
if (USING_OLD_VISUAL_STUDIO_COMPILER) if (USING_OLD_VISUAL_STUDIO_COMPILER)
message(FATAL_ERROR "You have to use a version of Visual Studio that supports C++11. As of December 2017, the only versions that have good enough C++11 support to compile the dlib Pyhton API is a fully updated Visual Studio 2015 or a fully updated Visual Studio 2017. Older versions of either of these compilers have bad C++11 support and will fail to compile the Python extension. ***SO UPDATE YOUR VISUAL STUDIO TO MAKE THIS ERROR GO AWAY***") message(FATAL_ERROR "You have to use a version of Visual Studio that supports C++11. As of December 2017, the only versions that have good enough C++11 support to compile the dlib Pyhton API is a fully updated Visual Studio 2015 or a fully updated Visual Studio 2017. Older versions of either of these compilers have bad C++11 support and will fail to compile the Python extension. ***SO UPDATE YOUR VISUAL STUDIO TO MAKE THIS ERROR GO AWAY***")
endif() endif()
if (WIN32)
message(STATUS "USING PYTHON_LIBS: ${PYTHON_LIBRARIES}")
endif()
# Test for numpy # Test for numpy
find_package(PythonInterp) find_package(PythonInterp)
...@@ -115,12 +93,8 @@ if(NOT ${DLIB_NO_GUI_SUPPORT}) ...@@ -115,12 +93,8 @@ if(NOT ${DLIB_NO_GUI_SUPPORT})
list(APPEND python_srcs src/gui.cpp) list(APPEND python_srcs src/gui.cpp)
endif() endif()
pybind11_add_module(dlib_ ${python_srcs}) pybind11_add_module(dlib_python ${python_srcs})
set_target_properties(dlib_ target_link_libraries(dlib_python PRIVATE dlib::dlib)
PROPERTIES OUTPUT_NAME dlib) # Set the output library name to dlib because that's what setup.py and distutils expects.
target_link_libraries(dlib_ PRIVATE dlib) set_target_properties(dlib_python PROPERTIES OUTPUT_NAME dlib)
# When you run "make install" we will copy the compiled dlib.so (or dlib.pyd)
# library file to the python_examples and the test folder.
install(TARGETS dlib_ LIBRARY DESTINATION ${CMAKE_CURRENT_LIST_DIR}/../../python_examples)
install(TARGETS dlib_ LIBRARY DESTINATION ${CMAKE_CURRENT_LIST_DIR}/test)
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