research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCons] Use Cython from the targeted copy of Python

Browse source 
Use the Cython module from the Python installation specified by
'python_cmd', rather than the Python installation that is running
SCons. This allows complilation of Cantera for Python versions that
aren't supported by SCons (e.g. Python 3.4).
This commit is contained in:
Ray Speth 2018-09-09 22:44:46 -04:00
parent d6da006e3e
commit 33591282f5
2 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
SConstruct
View file

@ -1141,42 +1141,25 @@ env['install_python_action'] = ''
env['python_module_loc'] = ''
if env['python_package'] in ('full', 'default'):
# Check for Cython:
try:
import Cython
cython_version = LooseVersion(Cython.__version__)
assert cython_version >= cython_min_version
except ImportError:
message = "Cython could not be imported by the Python interpreter running SCons."
have_cython = False
except AssertionError:
message = ("Cython is an incompatible version: "
"Found {0} but {1} or newer is required.".format(cython_version,
cython_min_version))
have_cython = False
else:
have_cython = True
finally:
if not have_cython:
if env['python_package'] == 'full':
print('ERROR: ' + message)
sys.exit(1)
elif env['python_package'] == 'default':
print('WARNING: ' + message)
env['python_package'] = 'minimal'
else:
print('INFO: Using Cython version {0}.'.format(cython_version))
# Test to see if we can import numpy
# Test to see if we can import numpy and Cython
warn_no_python = False
script = textwrap.dedent("""\
import sys
print('{v.major}.{v.minor}'.format(v=sys.version_info))
err = ''
try:
import numpy
print(numpy.__version__)
except ImportError as err:
except ImportError as np_err:
print('0.0.0')
err += str(np_err) + '\\n'
try:
import Cython
print(Cython.__version__)
except ImportError as cython_err:
print('0.0.0')
err += str(cython_err) + '\\n'
if err:
print(err)
""")
@ -1195,9 +1178,10 @@ if env['python_package'] in ('full', 'default'):
else:
env['python_version'] = info[0]
numpy_version = LooseVersion(info[1])
if len(info) > 2:
print("WARNING: Unexpected output while checking Python & Numpy versions:")
print('| ' + '\n|'.join(info[2:]))
cython_version = LooseVersion(info[2])
if len(info) > 3:
print("WARNING: Unexpected output while checking Python / Numpy / Cython versions:")
print('| ' + '\n| '.join(info[3:]))
if numpy_version == LooseVersion('0.0.0'):
print("NumPy not found.")
@ -1209,6 +1193,17 @@ if env['python_package'] in ('full', 'default'):
else:
print('INFO: Using NumPy version {0}.'.format(numpy_version))
if cython_version == LooseVersion('0.0.0'):
print("Cython not found.")
warn_no_python = True
elif cython_version < cython_min_version:
print("WARNING: Cython is an incompatible version: "
"Found {0} but {1} or newer is required.".format(
cython_version, cython_min_version))
warn_no_python = True
else:
print('INFO: Using Cython version {0}.'.format(cython_version))
if warn_no_python:
if env['python_package'] == 'default':
print('WARNING: Not building the full Python package because the Python '

9
interfaces/cython/SConscript
View file

@ -1,16 +1,15 @@
"""Cython-based Python Module"""
from buildutils import *
import Cython.Build
Import('env', 'build', 'install')
localenv = env.Clone()
def cythonize(target, source, env):
Cython.Build.cythonize([f.abspath for f in source])
cythonized = localenv.Command(
'cantera/_cantera.cpp',
'cantera/_cantera.pyx',
'''${python_cmd} -c "import Cython.Build; Cython.Build.cythonize('${SOURCE}')"''')
cythonized = localenv.Command('cantera/_cantera.cpp', ['cantera/_cantera.pyx'],
cythonize)
for f in mglob(localenv, 'cantera', 'pyx', 'pxd'):
localenv.Depends(cythonized, f)