diff options
| author | Eric Moore <ewm@redtetrahedron.org> | 2020-07-30 21:47:17 -0400 |
|---|---|---|
| committer | Eric Moore <ewm@redtetrahedron.org> | 2020-09-03 17:32:13 -0400 |
| commit | 83520ca71df7e81a2df02f1e01bef554670975cd (patch) | |
| tree | 9467ef5e2f77a861df1c07ffce90cbeb0490aa45 /numpy/core/setup.py | |
| parent | 1462f7741da034d913540bb5eff08ee695cd5f9f (diff) | |
| download | numpy-83520ca71df7e81a2df02f1e01bef554670975cd.tar.gz | |
BLD: Merge the npysort library into multiarray
This will no longer build npysort as library that is linked into
multiarray. This library was not installed and was not linked to
anything else.
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 71b4a7c0a..1af953671 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) ####################################################################### |