diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-09-07 15:00:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 15:00:09 -0600 |
| commit | dc56a3f61f62c571d3331e77076662043aacf0ed (patch) | |
| tree | 5cf8cda367e4e76fa092c822e50ac349a303a872 /numpy/core/setup.py | |
| parent | 803386487f14484cfa24af915c24ad75211469e8 (diff) | |
| parent | 32ceb0b32fb087b24453b4b6e88dc9800ff28994 (diff) | |
| download | numpy-dc56a3f61f62c571d3331e77076662043aacf0ed.tar.gz | |
Merge pull request #17167 from ewmoore/merge_npysort
BLD: Merge the npysort library into multiarray
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index a4e49a321..92dcacede 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -687,26 +687,6 @@ def configuration(parent_package='',top_path=None): subst_dict) ####################################################################### - # npysort library # - ####################################################################### - - # This library is created for the build but it is not installed - npysort_sources = [join('src', 'common', 'npy_sort.h.src'), - join('src', 'npysort', 'quicksort.c.src'), - join('src', 'npysort', 'mergesort.c.src'), - join('src', 'npysort', 'timsort.c.src'), - join('src', 'npysort', 'heapsort.c.src'), - join('src', 'npysort', 'radixsort.c.src'), - join('src', 'common', 'npy_partition.h.src'), - join('src', 'npysort', 'selection.c.src'), - join('src', 'common', 'npy_binsearch.h.src'), - join('src', 'npysort', 'binsearch.c.src'), - ] - config.add_library('npysort', - sources=npysort_sources, - include_dirs=[]) - - ####################################################################### # multiarray_tests module # ####################################################################### @@ -827,7 +807,7 @@ def configuration(parent_package='',top_path=None): join('include', 'numpy', 'npy_1_7_deprecated_api.h'), # add library sources as distuils does not consider libraries # dependencies - ] + npysort_sources + npymath_sources + ] + npymath_sources multiarray_src = [ join('src', 'multiarray', 'abstractdtypes.c'), @@ -880,6 +860,16 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'typeinfo.c'), join('src', 'multiarray', 'usertypes.c'), 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', 'timsort.c.src'), + join('src', 'npysort', 'heapsort.c.src'), + join('src', 'npysort', 'radixsort.c.src'), + join('src', 'common', 'npy_partition.h.src'), + join('src', 'npysort', 'selection.c.src'), + join('src', 'common', 'npy_binsearch.h.src'), + join('src', 'npysort', 'binsearch.c.src'), ] ####################################################################### @@ -941,7 +931,7 @@ def configuration(parent_package='',top_path=None): ], depends=deps + multiarray_deps + umath_deps + common_deps, - libraries=['npymath', 'npysort'], + libraries=['npymath'], extra_info=extra_info) ####################################################################### |