Adjust NumPy code to work with new directory / namespace structure.

Author: stefanseefeld

.travis.yml

@@ -26,9 +26,11 @@ matrix:
     - compiler: gcc
       env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
     - compiler: clang
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
+      # clang generates an 'illegal instruction' error in the NumPy check.
+      # Perhaps we need to upgrade clang to a newer version ?
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98 OPTIONS=--no-numpy
     - compiler: clang
-      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11 OPTIONS=--no-numpy
     - env: PYTHON=python DOC=1
 
 
@@ -41,8 +43,10 @@ addons:
     - gcc-4.8
     - g++-4.8
     - clang
-    - python-dev python-pip
+    - python-numpy
+    - python-sphinx
     - python3-dev
+    - python3-numpy
     - libboost-all-dev
     - xsltproc
     - docbook-xsl
@@ -58,7 +62,6 @@ before_install:
   # conflicting UCS2 and UCS4 unicode. Modify the PATH to skip the TravisCI python.
   # See https://github.com/travis-ci/travis-ci/issues/4948 for details.
   - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
-  - sudo pip install future
 
 install:
   # Install our own version of Boost (the subset we need) as the system version is
@@ -82,7 +85,7 @@ before_script:
 - scons --version
 
 script:
-- scons config --python=$PYTHON --boost-include=$HOME/Boost
+- scons config --python=$PYTHON --boost-include=$HOME/Boost $OPTIONS
 - if [ "$DOC" ]; then scons doc; else scons && scons test; fi
 
 after_success:

SConstruct

@@ -40,7 +40,7 @@ env_vars = {}
 if 'CXX' in os.environ: env_vars['CXX'] = os.environ['CXX']
 if 'CXXFLAGS' in os.environ: env_vars['CXXFLAGS'] = os.environ['CXXFLAGS'].split()
 env = Environment(toolpath=['config/tools'],
-                  tools=['default', 'libs', 'tests', 'doc'],
+                  tools=['default', 'libs', 'tests', 'doc', 'sphinx4scons'],
                   variables=vars,
                   TARGET_ARCH=arch,
                   **env_vars)
@@ -68,7 +68,7 @@ config_log = '{}/config.log'.format(build_dir)
 SConsignFile('{}/.sconsign'.format(build_dir))
 #env.Decider('MD5-timestamp')
 env.Decider('timestamp-newer')
-checks = config.get_checks()
+checks = config.get_checks(env)
 if 'config' in COMMAND_LINE_TARGETS:
     conf=env.Configure(custom_tests=checks, log_file=config_log, conf_dir=build_dir)
     if False in (getattr(conf, c)() for c in checks):

config/__init__.py

@@ -13,11 +13,14 @@
 from . import ui
 from . import cxx
 from . import python
+from . import numpy
 from . import boost
 
 def add_options(vars):
     ui.add_option('-V', '--verbose', dest='verbose', action='store_true', help='verbose mode: print full commands.')
+    ui.add_option('--no-numpy', dest='numpy', action='store_false', help='do not attempt to build NumPy bindings.')
     python.add_options(vars)
+    numpy.add_options(vars)
     boost.add_options(vars)
 
     vars.Add('CXX')
@@ -29,8 +32,10 @@ def add_options(vars):
     vars.Add('PYTHON')
     vars.Add('PYTHONLIBS')
     vars.Add('prefix')
-    vars.Add('boostbook_prefix',
-    vars.Add('CXX11'))
+    vars.Add('boostbook_prefix')
+    vars.Add('CXX11')
+    vars.Add('NUMPY')
+    vars.Add('NUMPY_CPPPATH', converter=lambda v:v.split())
 
     ui.add_variable(vars, ("arch", "target architeture", platform.machine()))
     ui.add_variable(vars, ("toolchain", "toolchain to use", 'gcc'))
@@ -42,10 +47,14 @@ def add_options(vars):
     ui.add_variable(vars, PathVariable("prefix", "Install prefix", "/usr/local", PathVariable.PathAccept))
 
 
-def get_checks():
+def get_checks(env):
   checks = OrderedDict()
   checks['cxx'] = cxx.check
   checks['python'] = python.check
+  if env.GetOption('numpy') is not False:
+      checks['numpy'] = numpy.check
+  else:
+      env['NUMPY'] = False
   checks['boost'] = boost.check
   return checks
 

config/numpy.py

@@ -0,0 +1,86 @@
+#
+# Copyright (c) 2016 Stefan Seefeld
+# All rights reserved.
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+from . import ui
+from contextlib import contextmanager
+
+@contextmanager
+def saved(context):
+    save_cpppath = context.env.get('CPPPATH', [])
+    save_libs = context.env.get('LIBS', [])
+    yield context
+    context.env.Replace(LIBS=save_libs)
+    context.env.Replace(CPPPATH=save_cpppath)
+
+
+def add_options(vars):
+
+    pass
+
+
+def check(context):
+
+    numpy_source_file = r"""
+// If defined, enforces linking againg PythonXXd.lib, which
+// is usually not included in Python environments.
+#undef _DEBUG
+#include "Python.h"
+#include "numpy/arrayobject.h"
+
+#if PY_VERSION_HEX >= 0x03000000
+void *initialize() { import_array();}
+#else
+void initialize() { import_array();}
+#endif
+
+int main()
+{
+  int result = 0;
+  Py_Initialize();
+  initialize();
+  if (PyErr_Occurred())
+  {
+    result = 1;
+  }
+  else
+  {
+    npy_intp dims = 2;
+    PyObject * a = PyArray_SimpleNew(1, &dims, NPY_INT);
+    if (!a) result = 1;
+    Py_DECREF(a);
+  }
+  Py_Finalize();
+  return result;
+}
+"""
+
+    import platform
+    import subprocess
+    import re, os
+
+    def check_python(cmd):
+        try:
+            return True, subprocess.check_output([python, '-c', cmd]).strip()
+        except subprocess.CalledProcessError as e:
+            return False, e
+
+    context.Message('Checking for NumPy...')
+    with saved(context):
+        python = context.env['PYTHON']
+        result, numpy_incpath = check_python('import numpy; print(numpy.get_include())')
+        if result:
+            context.env.AppendUnique(CPPPATH=numpy_incpath)
+            context.env.AppendUnique(LIBS=context.env['PYTHONLIBS'])
+            result, output = context.TryRun(numpy_source_file,'.cpp')
+        if not result:
+            context.Result(0)
+            return False
+        context.env['NUMPY'] = True
+        context.env['NUMPY_CPPPATH'] = numpy_incpath
+        context.Result(1)
+        return True

config/tools/doc.py

@@ -58,6 +58,10 @@ def BoostRST(env, target, source, resources=[]):
                 'rst2html --link-stylesheet --traceback --trim-footnote-reference-space --footnote-references=superscript --stylesheet=rst.css $SOURCE $TARGET')
 
 
+def BoostSphinx(env, target, source):
+    env.Sphinx(target, source)
+
+
 def exists(env):
     return True
 
@@ -68,3 +72,4 @@ def generate(env):
     env.AddMethod(BoostBook)
     env.AddMethod(BoostHTML)
     env.AddMethod(BoostRST)
+    env.AddMethod(BoostSphinx)