8000 MAINT: Don't always make full copies in (arg)searchsorted. by ewmoore · Pull Request #16942 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

MAINT: Don't always make full copies in (arg)searchsorted. #16942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

MAINT: Don't always make full copies in (arg)searchsorted. #16942

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3817dc8
BENCH: Add benchmark for searchsorted
ewmoore Jul 24, 2020
235b731
MAINT: Move copycast_isaligned out where it can be used elsewhere.
ewmoore May 22, 2020
327327d
MAINT: adjust runtests.py so that bench compare works
ewmoore Jul 24, 2020
e773aea
BLD: Merge the npysort library into multiarray
ewmoore Jul 31, 2020
c7e991b
ENH: Don't always make full copies in (arg)searchsorted
ewmoore Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@ewmoore
ewmoore committed Jul 31, 2020
commit e773aea8252fa8ae6bf79f434c65db199474980e
34 changes: 12 additions & 22 deletions numpy/core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,26 +686,6 @@ def get_mathlib_info(*args):
config.add_npy_pkg_config("mlib.ini.in", "lib/npy-pkg-config",
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 #
#######################################################################
Expand Down Expand Up @@ -825,7 +805,7 @@ def get_mathlib_info(*args):
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'),
Expand Down Expand Up @@ -877,6 +857,16 @@ def get_mathlib_info(*args):
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'),
]

#######################################################################
Expand Down Expand Up @@ -938,7 +928,7 @@ def generate_umath_c(ext, build_dir):
],
depends=deps + multiarray_deps + umath_deps +
common_deps,
libraries=['npymath', 'npysort'],
libraries=['npymath'],
extra_info=extra_info)

#######################################################################
Expand Down
0