diff --git a/hyperion/grid/_voronoi_core.c b/hyperion/grid/_voronoi_core.c index 36089640..f5dbd188 100644 --- a/hyperion/grid/_voronoi_core.c +++ b/hyperion/grid/_voronoi_core.c @@ -1,3 +1,5 @@ +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #include #include #include @@ -83,8 +85,8 @@ static PyObject *_voropp_wrapper(PyObject *self, PyObject *args) } /* Interpret the input objects as `numpy` arrays. */ - PyObject *s_array = PyArray_FROM_OTF(sites_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *d_array = PyArray_FROM_OTF(domain_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *s_array = PyArray_FROM_OTF(sites_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *d_array = PyArray_FROM_OTF(domain_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* Handle invalid input. */ if (s_array == NULL || d_array == NULL) { diff --git a/hyperion/importers/_discretize_sph.c b/hyperion/importers/_discretize_sph.c index 08c379b5..e7b8992e 100644 --- a/hyperion/importers/_discretize_sph.c +++ b/hyperion/importers/_discretize_sph.c @@ -1,3 +1,5 @@ +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #include #include #include @@ -77,17 +79,17 @@ static PyObject *_discretize_sph_func(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *xmin_array = PyArray_FROM_OTF(xmin_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *xmax_array = PyArray_FROM_OTF(xmax_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *ymin_array = PyArray_FROM_OTF(ymin_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *ymax_array = PyArray_FROM_OTF(ymax_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *zmin_array = PyArray_FROM_OTF(zmin_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *zmax_array = PyArray_FROM_OTF(zmax_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *mu_x_array = PyArray_FROM_OTF(mu_x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *mu_y_array = PyArray_FROM_OTF(mu_y_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *mu_z_array = PyArray_FROM_OTF(mu_z_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *sigma_array = PyArray_FROM_OTF(sigma_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *mass_array = PyArray_FROM_OTF(mass_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *xmin_array = PyArray_FROM_OTF(xmin_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *xmax_array = PyArray_FROM_OTF(xmax_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *ymin_array = PyArray_FROM_OTF(ymin_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *ymax_array = PyArray_FROM_OTF(ymax_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *zmin_array = PyArray_FROM_OTF(zmin_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *zmax_array = PyArray_FROM_OTF(zmax_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *mu_x_array = PyArray_FROM_OTF(mu_x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *mu_y_array = PyArray_FROM_OTF(mu_y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *mu_z_array = PyArray_FROM_OTF(mu_z_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *sigma_array = PyArray_FROM_OTF(sigma_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *mass_array = PyArray_FROM_OTF(mass_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (xmin_array == NULL || xmax_array == NULL || @@ -236,7 +238,7 @@ static PyObject *_get_positions_widths(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *refined_array = PyArray_FROM_OTF(refined_obj, NPY_LONGLONG, NPY_IN_ARRAY); + PyObject *refined_array = PyArray_FROM_OTF(refined_obj, NPY_LONGLONG, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (refined_array == NULL) { diff --git a/hyperion/util/_integrate_core.c b/hyperion/util/_integrate_core.c index a9a24fd4..2fcc1577 100644 --- a/hyperion/util/_integrate_core.c +++ b/hyperion/util/_integrate_core.c @@ -1,3 +1,5 @@ +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #include #include #include @@ -66,8 +68,8 @@ static PyObject *_integrate(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -134,8 +136,8 @@ static PyObject *_integrate_loglin(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -205,8 +207,8 @@ static PyObject *_integrate_linlog(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -277,8 +279,8 @@ static PyObject *_integrate_loglog(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -340,4 +342,4 @@ static PyObject *_integrate_loglog(PyObject *self, PyObject *args) } return ret; -} \ No newline at end of file +} diff --git a/hyperion/util/_interpolate_core.c b/hyperion/util/_interpolate_core.c index 0438ea31..1501fc37 100644 --- a/hyperion/util/_interpolate_core.c +++ b/hyperion/util/_interpolate_core.c @@ -1,3 +1,5 @@ +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION + #include #include #include @@ -97,8 +99,8 @@ static PyObject *interp1d_linear_scalar(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -164,9 +166,9 @@ static PyObject *interp1d_linear_array(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL || xval_array == NULL) { @@ -248,8 +250,8 @@ static PyObject *interp1d_loglog_scalar(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -322,9 +324,9 @@ static PyObject *interp1d_loglog_array(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL || xval_array == NULL) { @@ -413,8 +415,8 @@ static PyObject *interp1d_linlog_scalar(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -487,9 +489,9 @@ static PyObject *interp1d_linlog_array(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL || xval_array == NULL) { @@ -578,8 +580,8 @@ static PyObject *interp1d_loglin_scalar(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL) { @@ -648,9 +650,9 @@ static PyObject *interp1d_loglin_array(PyObject *self, PyObject *args) return NULL; /* Interpret the input objects as `numpy` arrays. */ - PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_IN_ARRAY); - PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_IN_ARRAY); + PyObject *x_array = PyArray_FROM_OTF(x_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *y_array = PyArray_FROM_OTF(y_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); + PyObject *xval_array = PyArray_FROM_OTF(xval_obj, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY); /* If that didn't work, throw an `Exception`. */ if (x_array == NULL || y_array == NULL || xval_array == NULL) { @@ -722,4 +724,4 @@ static PyObject *interp1d_loglin_array(PyObject *self, PyObject *args) return yval_array; -} \ No newline at end of file +}