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

require numpy 1.7, not 1.8

Browse Source
This commit is contained in:
Greg Landrum
2015-12-01 04:39:28 +01:00
parent f600b0310c
commit ed62f46a4d
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/ML/InfoTheory/Wrap/BitCorrMatGenerator.cpp
View File

@@ -10,7 +10,7 @@
#define NO_IMPORT_ARRAY
#include <RDBoost/python.h>
#define PY_ARRAY_UNIQUE_SYMBOL rdinfotheory_array_API
#define NPY_NO_DEPRECATED_API NPY_1_8_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>
#include <RDBoost/Wrap.h>

2
Code/ML/InfoTheory/Wrap/InfoBitRanker.cpp
View File

@@ -12,7 +12,7 @@
#include <RDBoost/python.h>
#define PY_ARRAY_UNIQUE_SYMBOL rdinfotheory_array_API
#define NPY_NO_DEPRECATED_API NPY_1_8_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>
#include <RDBoost/Wrap.h>

2
Code/RDBoost/import_array.h
View File

@@ -1,7 +1,7 @@
#ifndef RDKIT_IMPORT_ARRAY_INCLUDED
#define RDKIT_IMPORT_ARRAY_INCLUDED
#define NPY_NO_DEPRECATED_API NPY_1_8_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>
#if PY_MAJOR_VERSION >= 3

2
Code/SimDivPickers/Wrap/HierarchicalClusterPicker.cpp
View File

@@ -13,7 +13,7 @@
#include <RDBoost/python.h>
#include <boost/python/numeric.hpp>
#define NPY_NO_DEPRECATED_API NPY_1_8_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>
#include <RDBoost/Wrap.h>

2
Code/SimDivPickers/Wrap/MaxMinPicker.cpp
View File

@@ -13,7 +13,7 @@
#include <RDBoost/python.h>
#include <RDBoost/Wrap.h>
#include <boost/python/numeric.hpp>
#define NPY_NO_DEPRECATED_API NPY_1_8_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include <numpy/arrayobject.h>
#include <map>

2
Docs/Book/Install.md
View File

@@ -39,7 +39,7 @@ For more details on building from source with Conda, see the [conda-rdkit reposi
Due to the conda python distribution being a different version to the system python, it is easiest to install PostgreSQL and the PostgreSQL python client via conda.
With your envirinment activated, this is done simply by:
With your environment activated, this is done simply by:
conda install -c https://conda.binstar.org/rdkit rdkit-postgresql