Skip to content

Commit 5c0563d

Browse files
authored
Update deprecated ARRAY numpy macros in transformations.c (#5068)
* Change NPY_ARRAY macros in transformations.c * Change ENSURECOPY and ALIGNED macros * update CHANGELOG
1 parent 0dc5a1b commit 5c0563d

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

package/CHANGELOG

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ The rules for this file:
1515

1616
-------------------------------------------------------------------------------
1717
??/??/?? IAlibay, orbeckst, BHM-Bob, TRY-ER, Abdulrahman-PROG, pbuslaev,
18-
yuxuanzhuang, yuyuan871111, tanishy7777, tulga-rdn, Gareth-elliott
18+
yuxuanzhuang, yuyuan871111, tanishy7777, tulga-rdn, Gareth-elliott,
19+
hmacdope
1920

2021

2122
* 2.10.0
2223

2324
Fixes
25+
*
2426
* Fix incorrect `self.atom` assignment in SingleFrameReaderBase (Issue #5052, PR #5055)
2527
* Fixes bug in `analysis/hydrogenbonds.py`: `_donors` and `_hydrogens`
2628
were not updated when the `acceptors_sel` and `hydrogens_sel` were provided

package/MDAnalysis/lib/src/transformations/transformations.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ PyConverter_DoubleArray(
775775
PyObject *object,
776776
PyObject **address)
777777
{
778-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
778+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
779779
if (*address == NULL) return NPY_FAIL;
780780
return NPY_SUCCEED;
781781
}
@@ -791,7 +791,7 @@ PyConverter_AnyDoubleArray(
791791
Py_INCREF(object);
792792
return NPY_SUCCEED;
793793
} else {
794-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ALIGNED);
794+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_ALIGNED);
795795
if (*address == NULL) {
796796
PyErr_Format(PyExc_ValueError, "can not convert to array");
797797
return NPY_FAIL;
@@ -808,7 +808,7 @@ PyConverter_DoubleArrayOrNone(
808808
if ((object == NULL) || (object == Py_None)) {
809809
*address = NULL;
810810
} else {
811-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
811+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
812812
if (*address == NULL) {
813813
PyErr_Format(PyExc_ValueError, "can not convert to array");
814814
return NPY_FAIL;
@@ -823,7 +823,7 @@ PyConverter_DoubleMatrix44(
823823
PyObject **address)
824824
{
825825
PyArrayObject *obj;
826-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
826+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
827827
if (*address == NULL) {
828828
PyErr_Format(PyExc_ValueError, "can not convert to array");
829829
return NPY_FAIL;
@@ -846,7 +846,7 @@ PyConverter_DoubleMatrix44Copy(
846846
{
847847
PyArrayObject *obj;
848848
*address = PyArray_FROM_OTF(object, NPY_DOUBLE,
849-
NPY_ENSURECOPY|NPY_IN_ARRAY);
849+
NPY_ARRAY_ENSURECOPY|NPY_ARRAY_IN_ARRAY);
850850
if (*address == NULL) {
851851
PyErr_Format(PyExc_ValueError, "can not convert to array");
852852
return NPY_FAIL;
@@ -868,7 +868,7 @@ PyConverter_DoubleVector3(
868868
PyObject **address)
869869
{
870870
PyArrayObject *obj;
871-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
871+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
872872
if (*address == NULL) {
873873
PyErr_Format(PyExc_ValueError, "can not convert to array");
874874
return NPY_FAIL;
@@ -890,7 +890,7 @@ PyConverter_DoubleVector4(
890890
PyObject **address)
891891
{
892892
PyArrayObject *obj;
893-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
893+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
894894
if (*address == NULL) {
895895
PyErr_Format(PyExc_ValueError, "can not convert to array");
896896
return NPY_FAIL;
@@ -913,7 +913,7 @@ PyConverter_DoubleVector4Copy(
913913
{
914914
PyArrayObject *obj;
915915
*address = PyArray_FROM_OTF(object, NPY_DOUBLE,
916-
NPY_ENSURECOPY|NPY_IN_ARRAY);
916+
NPY_ARRAY_ENSURECOPY|NPY_ARRAY_IN_ARRAY);
917917
if (*address == NULL) {
918918
PyErr_Format(PyExc_ValueError, "can not convert to array");
919919
return NPY_FAIL;
@@ -938,7 +938,7 @@ PyConverter_DoubleVector3OrNone(
938938
*address = NULL;
939939
} else {
940940
PyArrayObject *obj;
941-
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_IN_ARRAY);
941+
*address = PyArray_FROM_OTF(object, NPY_DOUBLE, NPY_ARRAY_IN_ARRAY);
942942
if (*address == NULL) {
943943
PyErr_Format(PyExc_ValueError, "can not convert to array");
944944
return NPY_FAIL;
@@ -3137,7 +3137,7 @@ py_inverse_matrix(
31373137
goto _fail;
31383138

31393139
matrix = (PyArrayObject *)PyArray_FROM_OTF(object, NPY_DOUBLE,
3140-
NPY_IN_ARRAY);
3140+
NPY_ARRAY_IN_ARRAY);
31413141
if (matrix == NULL) {
31423142
PyErr_Format(PyExc_ValueError, "not an array");
31433143
goto _fail;

0 commit comments

Comments
 (0)