8000 MNT: use pythoncapi_compat.h in npy_compat.h by ngoldbaum · Pull Request #26189 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

MNT: use pythoncapi_compat.h in npy_compat.h #26189

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
merged 5 commits into from
Apr 3, 2024
Merged

MNT: use pythoncapi_compat.h in npy_compat.h #26189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77b5914
MNT: add pythoncapi-compat as a git submodule
ngoldbaum Apr 1, 2024
0ab2f25
MNT: include pythoncapi_compat.h in npy_pycompat.h
ngoldbaum Apr 1, 2024
917e4b0
MNT: remove unnecessary npy_pycompat.h includes
ngoldbaum Apr 1, 2024
c74a960
MNT: skip pythoncapi-comat in check_installed_files
ngoldbaum Apr 1, 2024
1bceaf8
MNT: respond to review comments
ngoldbaum Apr 3, 2024
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
Prev Previous commit
Next Next commit
MNT: remove unnecessary npy_pycompat.h includes
  • Loading branch information
@ngoldbaum
ngoldbaum committed Apr 1, 2024
commit 917e4b039c3f44c8e3e09b624e3f447022c41e02
2 changes: 1 addition & 1 deletion numpy/_core/src/common/array_assign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <numpy/ndarraytypes.h>
#include "npy_config.h"
#include "npy_pycompat.h"


#include "shape.h"

Expand Down
5 changes: 3 additions & 2 deletions numpy/_core/src/common/npy_argparse.c
View file
Open in desktop 8000
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
#include <Python.h>

#include "numpy/ndarraytypes.h"
#include "numpy/npy_2_compat.h"
#include "npy_argparse.h"
#include "npy_pycompat.h"

#include "npy_import.h"

#include "arrayfunction_override.h"
Expand Down Expand Up @@ -195,7 +196,7 @@ initialize_keywords(const char *funcname,
}
if (i >= npositional_only) {
int i_kwarg = i - npositional_only;
cache->kw_strings[i_kwarg] = PyUString_InternFromString(name);
cache->kw_strings[i_kwarg] = PyUnicode_InternFromString(name);
if (cache->kw_strings[i_kwarg] == NULL) {
va_end(va);
goto error;
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/common/npy_longdouble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "numpy/ndarraytypes.h"
#include "numpy/npy_math.h"
#include "npy_pycompat.h"

#include "numpyos.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/common/numpyos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#if defined(HAVE_STRTOLD_L) && !defined(_GNU_SOURCE)
# define _GNU_SOURCE
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/common/ucsnarrow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"

#include "ctors.h"

/*
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/common/ufunc_override.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#define NPY_NO_DEPRECATED_API NPY_API_VERSION
#define _MULTIARRAYMODULE

#include "npy_pycompat.h"
#include "numpy/ndarraytypes.h"
#include "get_attr_string.h"
#include "npy_import.h"
#include "ufunc_override.h"
Expand Down
2 changes: 0 additions & 2 deletions numpy/_core/src/dummymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#define PY_SSIZE_T_CLEAN
#include <Python.h>

#include "npy_pycompat.h"

static struct PyMethodDef methods[] = {
{NULL, NULL, 0, NULL}
};
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/_multiarray_tests.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ IsPythonScalar(PyObject * dummy, PyObject *args)
}
}

#include "npy_pycompat.h"



/** Function to test calling via ctypes */
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/array_assign_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "numpy/npy_math.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "convert_datatype.h"
#include "methods.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/array_assign_scalar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "numpy/npy_math.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "convert_datatype.h"
#include "methods.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/array_converter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"

#include "array_assign.h"

#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/arrayfunction_override.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <Python.h>
#include "structmember.h"

#include "npy_pycompat.h"
#include "numpy/ndarraytypes.h"
#include "get_attr_string.h"
#include "npy_import.h"
#include "multiarraymodule.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/calculation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "common.h"
#include "number.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "numpy/arrayobject.h"

#include "npy_config.h"
#include "npy_pycompat.h"

#include "common.h"

#include "abstractdtypes.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/conversion_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "numpy/npy_math.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "common.h"
#include "arraytypes.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "numpy/arrayobject.h"
#include "numpy/arrayscalars.h"
#include "npy_pycompat.h"


#include "common.h"
#include "arrayobject.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/ctors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "npy_config.h"

#include "npy_ctypes.h"
#include "npy_pycompat.h"

#include "multiarraymodule.h"

#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/datetime.c
10000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "numpyos.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "common.h"
#include "numpy/arrayscalars.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/datetime_busday.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <numpy/arrayobject.h>

#include "npy_config.h"
#include "npy_pycompat.h"


#include "numpy/arrayscalars.h"
#include "lowlevel_strided_loops.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/datetime_busdaycal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "numpy/arrayscalars.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "common.h"
#include "lowlevel_strided_loops.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/datetime_strings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "numpy/arrayobject.h"

#include "npy_config.h"
#include "npy_pycompat.h"


#include "numpy/arrayscalars.h"
#include "convert_datatype.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "npy_config.h"
#include "npy_ctypes.h"
#include "npy_import.h"
#include "npy_pycompat.h"


#include "_datetime.h"
#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/dragon4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define _MULTIARRAYMODULE
#include "numpy/arrayobject.h"
#include "npy_config.h"
#include "npy_pycompat.h"

#include "numpy/arrayscalars.h"

/* Half binary format */
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/dtype_transfer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "numpy/npy_math.h"

#include "lowlevel_strided_loops.h"
#include "npy_pycompat.h"


#include "convert_datatype.h"
#include "ctors.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/dtypemeta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <numpy/ndarraytypes.h>
#include <numpy/arrayscalars.h>
#include <numpy/npy_math.h>
#include "npy_pycompat.h"

#include "npy_import.h"

#include "abstractdtypes.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/einsum.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define _MULTIARRAYMODULE
#include <numpy/npy_common.h>
#include <numpy/arrayobject.h>
#include <npy_pycompat.h>

#include <array_assign.h> //PyArray_AssignRawScalar

#include <ctype.h>
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/flagsobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"

#include "array_assign.h"

#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/getset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "numpy/arrayobject.h"

#include "npy_config.h"
#include "npy_pycompat.h"

#include "npy_import.h"

#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/hashdescr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "hashdescr.h"

Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/item_selection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "multiarraymodule.h"
#include "common.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/iterators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "arrayobject.h"
#include "iterators.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/nditer_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <structmember.h>

#include "numpy/arrayobject.h"
#include "npy_pycompat.h"

#include "convert_datatype.h"

#include "lowlevel_strided_loops.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/nditer_pywrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "numpy/arrayobject.h"
#include "npy_config.h"
#include "npy_pycompat.h"

#include "alloc.h"
#include "common.h"
#include "conversion_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/number.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "numpy/arrayobject.h"

#include "npy_config.h"
#include "npy_pycompat.h"

#include "npy_import.h"
#include "common.h"
#include "number.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/refcount.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


/*
* Helper function to clear a strided memory (normally or always contiguous)
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/scalarapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "array_coercion.h"
#include "ctors.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/sequence.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "common.h"
#include "mapping.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/shape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "npy_config.h"

#include "npy_pycompat.h"


#include "arraywrap.h"
#include "ctors.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/multiarray/usertypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ maintainer email: oliphant.travis@ieee.org

#include "common.h"

#include "npy_pycompat.h"


#include "usertypes.h"
#include "dtypemeta.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/umath/_umath_tests.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "numpy/ndarrayobject.h"
#include "numpy/npy_math.h"

#include "npy_pycompat.h"


#include "npy_config.h"
#include "npy_cpu_features.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/umath/extobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <Python.h>

#include "npy_config.h"
#include "npy_pycompat.h"

#include "npy_argparse.h"

#include "conversion_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/umath/funcs.inc.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

#define NPY_NO_DEPRECATED_API NPY_API_VERSION
#include "npy_pycompat.h"

#include "npy_import.h"


Expand Down
2 changes: 1 addition & 1 deletion numpy/_core/src/umath/matmul.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "numpy/halffloat.h"
#include "lowlevel_strided_loops.h"

#include "npy_pycompat.h"


#include "npy_cblas.h"
#include "arraytypes.h" /* For TYPE_dot functions */
Expand Down
Loading
0