diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-01-18 11:47:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 11:47:00 -0700 |
| commit | 55744ae5fbdd99ddd8e1e8c95552180b76fe798b (patch) | |
| tree | 73e210ab8e811b2c5f01d3c6e61f30d3145442da /numpy/core/setup.py | |
| parent | 5559e271339e3e29529ab9540bdf7218cea48aab (diff) | |
| parent | 44fa7df01600b93ab842ac4f8076c3b4b8ee776f (diff) | |
| download | numpy-55744ae5fbdd99ddd8e1e8c95552180b76fe798b.tar.gz | |
Merge pull request #20829 from serge-sans-paille/feature/road-to-cxx-mergesort
MAINT: Translate mergesort.c.src to C++ using templates.
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 3519ed6cf..3bf6f6250 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -947,7 +947,7 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'vdot.c'), join('src', 'common', 'npy_sort.h.src'), join('src', 'npysort', 'quicksort.c.src'), - join('src', 'npysort', 'mergesort.c.src'), + join('src', 'npysort', 'mergesort.cpp'), join('src', 'npysort', 'timsort.cpp'), join('src', 'npysort', 'heapsort.cpp'), join('src', 'npysort', 'radixsort.cpp'), |