Skip to content

Update references to deprecated NPY_IN_ARRAY #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrofrog merged 1 commit into from
Aug 23, 2023
Merged

Update references to deprecated NPY_IN_ARRAY #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions hyperion/grid/_voronoi_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

#include <Python.h>
#include <limits.h>
#include <string.h>
Expand Down Expand Up @@ -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) {
Expand Down
26 changes: 14 additions & 12 deletions hyperion/importers/_discretize_sph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

#include <Python.h>
#include <numpy/arrayobject.h>
#include <numpy/npy_math.h>
Expand Down Expand Up @@ -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 ||
Expand Down Expand Up @@ -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) {
Expand Down
20 changes: 11 additions & 9 deletions hyperion/util/_integrate_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

#include <Python.h>
#include <numpy/arrayobject.h>
#include <numpy/npy_math.h>
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -340,4 +342,4 @@ static PyObject *_integrate_loglog(PyObject *self, PyObject *args)
}

return ret;
}
}
44 changes: 23 additions & 21 deletions hyperion/util/_interpolate_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

#include <Python.h>
#include <numpy/arrayobject.h>
#include <numpy/npy_math.h>
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -722,4 +724,4 @@ static PyObject *interp1d_loglin_array(PyObject *self, PyObject *args)

return yval_array;

}
}