pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-03 21:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use numpy not numeric for boost 1.65+ - fixes #1581 (#1664)

Browse Source 
boost python numeric no longer exists in boost 1.65, so check boost version and conditionally use boost python numpy.
This commit is contained in:
Matt Swain
2017-11-18 05:30:32 +00:00
committed by Greg Landrum
parent b6d583aa26
commit e57b7a9bc8
13 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Demos/boost/numpy/linalg.cpp
View File

@@ -3,13 +3,13 @@
//
#include <boost/python.hpp>
#include <boost/python/numeric.hpp>
#include <RDBoost/boost_numpy.h>
#define PY_ARRAY_UNIQUE_SYMBOL RD_array_API
#include <numpy/arrayobject.h>
namespace python = boost::python;
double GetFirstElement(python::numeric::array &x) {
double GetFirstElement(NumpyArrayType &x) {
PyArrayObject *ptr = (PyArrayObject *)x.ptr();
void *data = PyArray_DATA(ptr);
double res = 0.0;