summaryrefslogtreecommitdiff
path: root/numpy/core/include
diff options
context:
space:
mode:
authorwtli <liwt31@163.com>2018-11-12 11:59:20 +0800
committerwtli <liwt31@163.com>2019-01-21 20:42:36 +0800
commit19952f4ad0345f8ea0398b4983384c3dc8a8f3bb (patch)
treef5d964e10b3ee64d954e5c3e6c725a5614283aae /numpy/core/include
parent3cbc11ac56054ad3ac7461e57433aefe37f2e3e4 (diff)
downloadnumpy-19952f4ad0345f8ea0398b4983384c3dc8a8f3bb.tar.gz
ENH: preliminary numeric timsort
Diffstat (limited to 'numpy/core/include')
-rw-r--r--numpy/core/include/numpy/ndarraytypes.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
index cfa1dba6a..62895049c 100644
--- a/numpy/core/include/numpy/ndarraytypes.h
+++ b/numpy/core/include/numpy/ndarraytypes.h
@@ -159,9 +159,10 @@ enum NPY_TYPECHAR {
typedef enum {
NPY_QUICKSORT=0,
NPY_HEAPSORT=1,
- NPY_MERGESORT=2
+ NPY_MERGESORT=2,
+ NPY_TIMSORT=3,
} NPY_SORTKIND;
-#define NPY_NSORTS (NPY_MERGESORT + 1)
+#define NPY_NSORTS (NPY_TIMSORT + 1)
typedef enum {