summaryrefslogtreecommitdiff
path: root/numpy/core/include
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2020-05-04 19:59:13 -0500
committerSebastian Berg <sebastian@sipsolutions.net>2020-07-08 18:13:06 -0500
commitb2043794f6d40ff32d45008ad2ffc69ba1fc920a (patch)
tree0af867f5efe5510fdf0c80da3e14cccf83697e12 /numpy/core/include
parent28c8b390174907750827d105440a52c6fe2fac6d (diff)
downloadnumpy-b2043794f6d40ff32d45008ad2ffc69ba1fc920a.tar.gz
WIP: Make things work by using AdaptFlexibleDType (without obj) for now
This will have to use the new casting logic at some point, but right now adaptflexible dtype is de-facto the casting logic (or casting with "S0" which hopefully gives the same thing normally, but...
Diffstat (limited to 'numpy/core/include')
-rw-r--r--numpy/core/include/numpy/ndarraytypes.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
index 06f3a303d..856d233ab 100644
--- a/numpy/core/include/numpy/ndarraytypes.h
+++ b/numpy/core/include/numpy/ndarraytypes.h
@@ -1825,6 +1825,9 @@ typedef void (PyDataMem_EventHookFunc)(void *inp, void *outp, size_t size,
typedef PyArray_Descr *(discover_descr_from_pyobject_function)(
PyArray_DTypeMeta *cls, PyObject *obj);
+ typedef int (is_known_scalar_function)(
+ PyArray_DTypeMeta *cls, PyObject *obj);
+
/*
* While NumPy DTypes would not need to be heap types the plan is to
* make DTypes available in Python at which point they will be heap types.
@@ -1877,6 +1880,7 @@ typedef void (PyDataMem_EventHookFunc)(void *inp, void *outp, size_t size,
/* DType methods, these could be moved into its own struct */
discover_descr_from_pyobject_function *discover_descr_from_pyobject;
+ is_known_scalar_function *is_known_scalar;
};
#define NPY_DTYPE(descr) ((PyArray_DTypeMeta *)Py_TYPE(descr))