add macro for numpy < 1.7
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Thu, 23 Jan 2014 17:10:44 +0000 (09:10 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 14 Feb 2014 23:33:00 +0000 (15:33 -0800)
as suggested by @longjon
https://github.com/BVLC/caffe/issues/44#issuecomment-32832810

python/caffe/pycaffe.cpp

index 2bfae9e..1beec16 100644 (file)
 #include <numpy/arrayobject.h>
 #include "caffe/caffe.hpp"
 
-// Temporary solution for numpy < 1.7 versions: old macro.
+// Temporary solution for numpy < 1.7 versions: old macro, no promises.
+// You're strongly advised to upgrade to >= 1.7.
 #ifndef NPY_ARRAY_C_CONTIGUOUS
 #define NPY_ARRAY_C_CONTIGUOUS NPY_C_CONTIGUOUS
+#define PyArray_SetBaseObject(arr, x) (PyArray_BASE(arr) = (x))
 #endif