Fix headers and include paths for NumPy 2 (currently breaks NumPy 1 build support)

Author: lgarrison

common.mk

@@ -506,14 +506,14 @@ ifeq ($(DO_CHECKS), 1)
         # NUMPY is available -> next step should not fail
         # That's why we are not checking if the NUMPY_INCL_FLAG is defined.
         ifeq ($(NUMPY_CHECKED), 0)
-          export NUMPY_INCL_FLAG := $(shell $(PYTHON) -c "from __future__ import print_function; import numpy; print('-isystem ' + numpy.__path__[0] + '/core/include/numpy/')")
+          export NUMPY_INCL_FLAG := $(shell $(PYTHON) -c "from __future__ import print_function; import numpy; print('-isystem ' + numpy.__path__[0] + '/_core/include/')")
           # Take the second word -> the path (the first word is "isystem")
           NUMPY_INCL_PATH := $(word 2, ${NUMPY_INCL_FLAG})
           # Now check that the 'arrayobject.h' file is present in the
           # supposed numpy directory. Otherwise, compilation will fail.
           # The absence of the file likely indicates a missing numpy-devel
           # package (see issue #134 on github)
-          NUMPY_NEEDED_HEADER_FILE := ${NUMPY_INCL_PATH}arrayobject.h
+          NUMPY_NEEDED_HEADER_FILE := ${NUMPY_INCL_PATH}numpy/arrayobject.h
           ifeq (,$(wildcard ${NUMPY_NEEDED_HEADER_FILE}))
             $(error Required $(ccred)numpy headers$(ccreset) are missing...stopping the compilation. You might be able to fix this by installing $(ccblue)numpy-devel$(ccreset))
           endif

mocks/python_bindings/_countpairs_mocks.c

@@ -10,7 +10,7 @@
 #include <Python.h>
 
 /* Now, include the numpy header*/
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
 
 //for correlation functions
 #include "countpairs_rp_pi_mocks.h"

theory/python_bindings/_countpairs.c

@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 /* Now, include the numpy header*/
-#include <arrayobject.h>
+#include <numpy/arrayobject.h>
 
 //for correlation functions
 #include "countpairs.h"