8000 ENH: implement nep 0015: merge multiarray and umath by mattip · Pull Request #10915 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: implement nep 0015: merge multiarray and umath #10915

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

Merged
merged 12 commits into from
Aug 31, 2018
Merged

ENH: implement nep 0015: merge multiarray and umath #10915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
31df302
MAINT: merge umath, multiarray into _multiarray, add python wrappers
mattip Apr 24, 2018
e8aea2e
MAINT: define _MULTIARRAYMODULE to use functions directly (not via Py…
mattip Apr 25, 2018
f88d576
MAINT: move declararions into umathmodule.h
mattip Jul 2, 2018
ad1f5b5
MAINT: fix more name replacements, __all__ imports
mattip Apr 25, 2018
92f01dd
MAINT: move scalar math intialization to before setup_scalartypes
mattip Apr 27, 2018
bd4500f
MAINT: move private -> common
mattip Jun 25, 2018
1bca48b
MAINT: move unchanging, non-api files to common
mattip Jun 25, 2018
c49f779
MAINT: create common_{src,dep}, move header includes to appropriate p…
mattip Jun 27, 2018
c9914e4
DOC: write release note
mattip Jul 17, 2018
9592ee2
MAINT: export newly added c-extension function
mattip Jul 18, 2018
8725087
DOC: add docstring to new python files
mattip Aug 1, 2018
10000
03e0814
MAINT: remove code that codecov pointed out is superflous
mattip Aug 3, 2018
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
MAINT: move unchanging, non-api files to common
  • Loading branch information
@mattip
mattip committed Aug 21, 2018
commit 1bca48bb13dff1324078ca7dd968623c2a7f923f
4 changes: 2 additions & 2 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ recursive-include numpy/_build_utils *
recursive-include numpy/linalg/lapack_lite *.c *.h
include tox.ini
# Add sdist files whose use depends on local configuration.
include numpy/core/src/multiarray/cblasfuncs.c
include numpy/core/src/multiarray/python_xerbla.c
include numpy/core/src/common/cblasfuncs.c
include numpy/core/src/common/python_xerbla.c
# Adding scons build related files not found by distutils
recursive-include numpy/core/code_generators *.py *.txt
recursive-include numpy/core *.in *.h
Expand Down
14 changes: 7 additions & 7 deletions numpy/core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,10 +716,10 @@ def get_mathlib_info(*args):
multiarray_deps = [
join('src', 'multiarray', 'arrayobject.h'),
join('src', 'multiarray', 'arraytypes.h'),
join('src', 'multiarray', 'array_assign.h'),
join('src', 'common', 'array_assign.h'),
join('src', 'multiarray', 'buffer.h'),
join('src', 'multiarray', 'calculation.h'),
join('src', 'multiarray', 'cblasfuncs.h'),
join('src', 'common', 'cblasfuncs.h'),
join('src', 'multiarray', 'common.h'),
join('src', 'multiarray', 'convert_datatype.h'),
join('src', 'multiarray', 'convert.h'),
Expand All @@ -742,7 +742,7 @@ def get_mathlib_info(*args):
join('src', 'multiarray', 'shape.h'),
join('src', 'multiarray', 'strfuncs.h'),
join('src', 'multiarray', 'typeinfo.h'),
join('src', 'multiarray', 'ucsnarrow.h'),
join('src', 'common', 'ucsnarrow.h'),
join('src', 'multiarray', 'usertypes.h'),
join('src', 'multiarray', 'vdot.h'),
join('src', 'common', 'npy_config.h'),
Expand Down Expand Up @@ -778,7 +778,7 @@ def get_mathlib_info(*args):
join('src', 'multiarray', 'alloc.c'),
join('src', 'multiarray', 'arrayobject.c'),
join('src', 'multiarray', 'arraytypes.c.src'),
join('src', 'multiarray', 'array_assign.c'),
join('src', 'common', 'array_assign.c'),
join('src', 'multiarray', 'array_assign_scalar.c'),
join('src', 'multiarray', 'array_assign_array.c'),
join('src', 'multiarray', 'buffer.c'),
Expand Down Expand Up @@ -821,7 +821,7 @@ def get_mathlib_info(*args):
join('src', 'multiarray', 'temp_elide.c'),
join('src', 'multiarray', 'typeinfo.c'),
join('src', 'multiarray', 'usertypes.c'),
join('src', 'multiarray', 'ucsnarrow.c'),
join('src', 'common', 'ucsnarrow.c'),
join('src', 'multiarray', 'vdot.c'),
join('src', 'common', 'templ_common.h.src'),
join('src', 'common', 'mem_overlap.c'),
Expand All @@ -834,8 +834,8 @@ def get_mathlib_info(*args):
extra_info = blas_info
# These files are also in MANIFEST.in so that they are always in
# the source distribution independently of HAVE_CBLAS.
multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'),
join('src', 'multiarray', 'python_xerbla.c'),
multiarray_src.extend([join('src', 'common', 'cblasfuncs.c'),
join('src', 'common', 'python_xerbla.c'),
])
if uses_accelerate_framework(blas_info):
multiarray_src.extend(get_sgemv_fix())
Expand Down
0 numpy/core/src/multiarray/array_assign.c → numpy/core/src/common/array_assign.c
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/array_assign.h → numpy/core/src/common/array_assign.h
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/cblasfuncs.c → numpy/core/src/common/cblasfuncs.c
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/cblasfuncs.h → numpy/core/src/common/cblasfuncs.h
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/python_xerbla.c → numpy/core/src/common/python_xerbla.c
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/ucsnarrow.c → numpy/core/src/common/ucsnarrow.c
View file
Open in desktop
File renamed without changes.
0 numpy/core/src/multiarray/ucsnarrow.h → numpy/core/src/common/ucsnarrow.h
View file
Open in desktop
File renamed without changes.
0