boost/histogram
2
0
Fork 0
mirror of https://github.com/boostorg/histogram.git synced 2026-01-30 07:52:11 +00:00
Code Issues Projects Releases Wiki Activity

replaced CApi numpy with boost numpy

Browse Source
This commit is contained in:
Hans Dembinski
2017-11-03 00:13:43 +01:00
parent b1afcd036e
commit e12856b03d
4 changed files with 86 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/python/module.cpp
View File

@@ -8,19 +8,7 @@
#include <boost/python/scope.hpp>
#include <boost/python/object.hpp>
#ifdef HAVE_NUMPY
#define PY_ARRAY_UNIQUE_SYMBOL boost_histogram_ARRAY_API
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
extern "C" {
#include <numpy/arrayobject.h>
#if PY_MAJOR_VERSION >= 3
static void *init_numpy() {
import_array();
return NULL;
}
#else
static void init_numpy() { import_array(); }
#endif
}
#include <boost/python/numpy.hpp>
#endif
namespace boost {
@@ -31,10 +19,10 @@ void register_histogram();
}
BOOST_PYTHON_MODULE(histogram) {
#ifdef HAVE_NUMPY
init_numpy();
#endif
using namespace boost::python;
#ifdef HAVE_NUMPY
numpy::initialize();
#endif
scope current;
object axis_module = object(
borrowed(PyImport_AddModule("histogram.axis"))