diff options
| author | wtli <liwt31@163.com> | 2018-11-12 11:59:20 +0800 |
|---|---|---|
| committer | wtli <liwt31@163.com> | 2019-01-21 20:42:36 +0800 |
| commit | 19952f4ad0345f8ea0398b4983384c3dc8a8f3bb (patch) | |
| tree | f5d964e10b3ee64d954e5c3e6c725a5614283aae /numpy/core/src/common | |
| parent | 3cbc11ac56054ad3ac7461e57433aefe37f2e3e4 (diff) | |
| download | numpy-19952f4ad0345f8ea0398b4983384c3dc8a8f3bb.tar.gz | |
ENH: preliminary numeric timsort
Diffstat (limited to 'numpy/core/src/common')
| -rw-r--r-- | numpy/core/src/common/npy_sort.h.src | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/src/common/npy_sort.h.src b/numpy/core/src/common/npy_sort.h.src index c31a82764..521f0fee5 100644 --- a/numpy/core/src/common/npy_sort.h.src +++ b/numpy/core/src/common/npy_sort.h.src @@ -36,9 +36,11 @@ static NPY_INLINE int npy_get_msb(npy_uintp unum) int quicksort_@suff@(void *vec, npy_intp cnt, void *null); int heapsort_@suff@(void *vec, npy_intp cnt, void *null); int mergesort_@suff@(void *vec, npy_intp cnt, void *null); +int timsort_@suff@(void *vec, npy_intp cnt, void *null); int aquicksort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *null); int aheapsort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *null); int amergesort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *null); +int atimsort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *null); /**end repeat**/ @@ -59,9 +61,11 @@ int amergesort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *null); int quicksort_@suff@(void *vec, npy_intp cnt, void *arr); int heapsort_@suff@(void *vec, npy_intp cnt, void *arr); int mergesort_@suff@(void *vec, npy_intp cnt, void *arr); +int timsort_@suff@(void *vec, npy_intp cnt, void *arr); int aquicksort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *arr); int aheapsort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *arr); int amergesort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *arr); +int atimsort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *arr); /**end repeat**/ @@ -76,8 +80,10 @@ int amergesort_@suff@(void *vec, npy_intp *ind, npy_intp cnt, void *arr); int npy_quicksort(void *vec, npy_intp cnt, void *arr); int npy_heapsort(void *vec, npy_intp cnt, void *arr); int npy_mergesort(void *vec, npy_intp cnt, void *arr); +int npy_timsort(void *vec, npy_intp cnt, void *arr); int npy_aquicksort(void *vec, npy_intp *ind, npy_intp cnt, void *arr); int npy_aheapsort(void *vec, npy_intp *ind, npy_intp cnt, void *arr); int npy_amergesort(void *vec, npy_intp *ind, npy_intp cnt, void *arr); +int npy_atimsort(void *vec, npy_intp *ind, npy_intp cnt, void *arr); #endif |