Fix numpy initialization. Closes inducergh-214

cf-natali · Aug 9, 2019 · ea7d1fa · ea7d1fa
1 parent 9c024f3
commit ea7d1fa
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 36 deletions.
diff --git a/src/cpp/cuda.cpp b/src/cpp/cuda.cpp
@@ -1,3 +1,6 @@
+#define NO_IMPORT_ARRAY
+#define PY_ARRAY_UNIQUE_SYMBOL pycuda_ARRAY_API
+
 #include "cuda.hpp"
 
 boost::thread_specific_ptr<pycuda::context_stack> pycuda::context_stack_ptr;
diff --git a/src/wrapper/_pvt_struct_v2.cpp b/src/wrapper/_pvt_struct_v2.cpp
@@ -7,13 +7,15 @@
  * for packing complex values and only supports native packing.
  * (the minimum that's needed for PyOpenCL/PyCUDA.) */
 
+#define PY_ARRAY_UNIQUE_SYMBOL pycuda_pvt_struct_v2_ARRAY_API
+
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include <numpy/arrayobject.h>
 #include "structseq.h"
 #include "structmember.h"
 #include <ctype.h>
-#include "numpy_init.hpp"
 
 // static PyTypeObject PyStructType;
 
@@ -1570,6 +1572,8 @@ The variable struct.error is an exception raised on errors.\n");
 PyMODINIT_FUNC
 init_pvt_struct(void)
 {
+	import_array();
+
 	PyObject *ver, *m;
 
 	ver = PyString_FromString("0.2");

diff --git a/src/wrapper/_pvt_struct_v3.cpp b/src/wrapper/_pvt_struct_v3.cpp
@@ -3,12 +3,14 @@
 /* New version supporting byte order, alignment and size options,
    character strings, and unsigned numbers */
 
+#define PY_ARRAY_UNIQUE_SYMBOL pycuda_pvt_struct_v2_ARRAY_API
+
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include <numpy/arrayobject.h>
 #include "structmember.h"
 #include <ctype.h>
-#include "numpy_init.hpp"
 
 namespace {
 extern PyTypeObject PyStructType;
@@ -1720,6 +1722,8 @@ extern "C"
 PyMODINIT_FUNC
 PyInit__pvt_struct(void)
 {
+    import_array();
+
     PyObject *m;
 
     m = PyModule_Create(&_structmodule);

diff --git a/src/wrapper/mempool.cpp b/src/wrapper/mempool.cpp
@@ -1,3 +1,6 @@
+#define NO_IMPORT_ARRAY
+#define PY_ARRAY_UNIQUE_SYMBOL pycuda_ARRAY_API
+
 #include <vector>
 #include "tools.hpp"
 #include "wrap_helpers.hpp"

diff --git a/src/wrapper/numpy_init.hpp b/src/wrapper/numpy_init.hpp
diff --git a/src/wrapper/tools.hpp b/src/wrapper/tools.hpp
@@ -7,7 +7,7 @@
 #include <cuda.hpp>
 #include <boost/python.hpp>
 #include <numeric>
-#include "numpy_init.hpp"
+#include <numpy/arrayobject.h>
 
 
 

diff --git a/src/wrapper/wrap_cudadrv.cpp b/src/wrapper/wrap_cudadrv.cpp
@@ -1,3 +1,5 @@
+#define PY_ARRAY_UNIQUE_SYMBOL pycuda_ARRAY_API
+
 #include <cuda.hpp>
 
 #include <utility>
@@ -656,8 +658,18 @@ void pycuda_expose_curand();
 
 
 
+static bool import_numpy_helper()
+{
+  import_array1(false);
+  return true;
+}
+
+
 BOOST_PYTHON_MODULE(_driver)
 {
+  if (!import_numpy_helper())
+    throw py::error_already_set();
+
   py::def("get_version", cuda_version);
 #if CUDAPP_CUDA_VERSION >= 2020
   py::def("get_driver_version", pycuda::get_driver_version);