python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-26 23:24:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build support for openmp/gcc

Browse Source
This commit is contained in:
wiredfool 2014-11-15 21:50:16 -08:00 committed by Eric Soroos
parent a3b15c4a5f
commit e4903e2abe
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -63,6 +63,10 @@ install-coverage:
CFLAGS="-coverage" python setup.py build_ext install CFLAGS="-coverage" python setup.py build_ext install
python selftest.py --installed python selftest.py --installed
install-openmp:
python setup.py build_ext --enable-openmp install
python selftest.py --installed
debug: debug:
# make a debug version if we don't have a -dbg python. Leaves in symbols # make a debug version if we don't have a -dbg python. Leaves in symbols
# for our stuff, kills optimization, and redirects to dev null so we # for our stuff, kills optimization, and redirects to dev null so we

17
setup.py
View File

@ -141,7 +141,7 @@ def _pkg_config(name):
class pil_build_ext(build_ext): class pil_build_ext(build_ext):
class feature: class feature:
features = ['zlib', 'jpeg', 'tiff', 'freetype', 'raqm', 'lcms', 'webp', features = ['zlib', 'jpeg', 'tiff', 'freetype', 'raqm', 'lcms', 'webp',
'webpmux', 'jpeg2000', 'imagequant'] 'webpmux', 'jpeg2000', 'imagequant', 'openmp']
required = {'jpeg', 'zlib'} required = {'jpeg', 'zlib'}
@ -179,9 +179,6 @@ class pil_build_ext(build_ext):
def finalize_options(self): def finalize_options(self):
build_ext.finalize_options(self) build_ext.finalize_options(self)
if self.debug:
global DEBUG
DEBUG = True
for x in self.feature: for x in self.feature:
if getattr(self, 'disable_%s' % x): if getattr(self, 'disable_%s' % x):
setattr(self.feature, x, False) setattr(self.feature, x, False)
@ -199,7 +196,8 @@ class pil_build_ext(build_ext):
library_dirs = [] library_dirs = []
include_dirs = [] include_dirs = []
extra_compile_args = []
_add_directory(include_dirs, "libImaging") _add_directory(include_dirs, "libImaging")
pkg_config = None pkg_config = None
@ -571,6 +569,10 @@ class pil_build_ext(build_ext):
_find_library_file(self, "libwebpdemux")): _find_library_file(self, "libwebpdemux")):
feature.webpmux = "libwebpmux" feature.webpmux = "libwebpmux"
if feature.require('openmp'):
extra_compile_args.append('-fopenmp')
feature.openmp = 'gomp'
for f in feature: for f in feature:
if not getattr(feature, f) and feature.require(f): if not getattr(feature, f) and feature.require(f):
if f in ('jpeg', 'zlib'): if f in ('jpeg', 'zlib'):
@ -609,6 +611,8 @@ class pil_build_ext(build_ext):
libs.extend(["kernel32", "user32", "gdi32"]) libs.extend(["kernel32", "user32", "gdi32"])
if struct.unpack("h", "\0\1".encode('ascii'))[0] == 1: if struct.unpack("h", "\0\1".encode('ascii'))[0] == 1:
defs.append(("WORDS_BIGENDIAN", None)) defs.append(("WORDS_BIGENDIAN", None))
if feature.openmp:
libs.append(feature.openmp)
if sys.platform == "win32" and not (PLATFORM_PYPY or PLATFORM_MINGW): if sys.platform == "win32" and not (PLATFORM_PYPY or PLATFORM_MINGW):
defs.append(("PILLOW_VERSION", '"\\"%s\\""'%PILLOW_VERSION)) defs.append(("PILLOW_VERSION", '"\\"%s\\""'%PILLOW_VERSION))
@ -697,7 +701,8 @@ class pil_build_ext(build_ext):
(feature.lcms, "LITTLECMS2"), (feature.lcms, "LITTLECMS2"),
(feature.webp, "WEBP"), (feature.webp, "WEBP"),
(feature.webpmux, "WEBPMUX"), (feature.webpmux, "WEBPMUX"),
] (feature.openmp, "OpenMP"),
]
all = 1 all = 1
for option in options: for option in options: