[Numpy-svn] [numpy/numpy] 7e14f0: ENH: ufunc: Convert UFunc Reduce to use the new it...

Fri Jan 28 19:35:17 EST 2011

Branch: refs/heads/master
Home:   https://github.com/numpy/numpy

Commit: 7e14f031e9bd65640ccbeaa9ba8bd4ee788e28a2
    https://github.com/numpy/numpy/commit/7e14f031e9bd65640ccbeaa9ba8bd4ee788e28a2
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/einsum.c.src
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/umath/ufunc_object.c

Log Message:
-----------
ENH: ufunc: Convert UFunc Reduce to use the new iterator

Commit: b410514375ce1cfe4f1accd9c97d2c5001f6bae9
    https://github.com/numpy/numpy/commit/b410514375ce1cfe4f1accd9c97d2c5001f6bae9
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/einsum.c.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_numeric.py

Log Message:
-----------
ENH: ufunc: Release the GIL during ufunc computations

Commit: fadddc677dcbbaf0d5af971a512e4d305a024e4c
    https://github.com/numpy/numpy/commit/fadddc677dcbbaf0d5af971a512e4d305a024e4c
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/multiarray/new_iterator_pywrap.c
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_new_iterator.py

Log Message:
-----------
ENH: iter: Add NpyIter_RemoveAxis function to the iterator API

Commit: 14d5e200384ffc72782a364ae597746e1086bed6
    https://github.com/numpy/numpy/commit/14d5e200384ffc72782a364ae597746e1086bed6
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_regression.py

Log Message:
-----------
ENH: ufunc: Convert Accumulate to use the new iterator

Commit: 8a0bec00b8f92f055284769c3c0888aece0a69f0
    https://github.com/numpy/numpy/commit/8a0bec00b8f92f055284769c3c0888aece0a69f0
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/umath/ufunc_object.c

Log Message:
-----------
ENH: ufunc: Convert Reduceat to use the new iterator

Reduceat doesn't fit into the new iterator idea quite as well as the others,
so it doesn't get the matching memory layout.  Neither it nor accumulate
get buffering, though accumulate could use buffering if it was implemented
slightly differently.

Commit: 62300b6f5bc3987915c106c2f414c5699ad8484f
    https://github.com/numpy/numpy/commit/62300b6f5bc3987915c106c2f414c5699ad8484f
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_numeric.py

Log Message:
-----------
ENH: ufunc: Remove dead code from ufunc_object.c

Commit: 585a636f95c3bf884e53a6724738a26d4a5b00e4
    https://github.com/numpy/numpy/commit/585a636f95c3bf884e53a6724738a26d4a5b00e4
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/src/multiarray/arraytypes.c.src
  M numpy/core/src/multiarray/calculation.c
  M numpy/core/src/multiarray/common.c
  M numpy/core/src/multiarray/common.h
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/scalartypes.c.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/lib/tests/test_recfunctions.py

Log Message:
-----------
ENH: core: Shuffle type numbers so any new ones go on the end.

Commit: cf8d15203cd24bc7a836c98117a8e4edc9debd8b
    https://github.com/numpy/numpy/commit/cf8d15203cd24bc7a836c98117a8e4edc9debd8b
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-25 (Tue, 25 Jan 2011)

Changed paths:
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/src/multiarray/arraytypes.c.src
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/usertypes.c

Log Message:
-----------
ENH: core: Make PyArray_ArrFuncs have the same structure as in 1.5 and earlier

Commit: 91b7763cae7c25865df636f7d44d284ed4094bc4
    https://github.com/numpy/numpy/commit/91b7763cae7c25865df636f7d44d284ed4094bc4
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-26 (Wed, 26 Jan 2011)

Changed paths:
  M doc/neps/new-iterator-ufunc.rst

Log Message:
-----------
NEP: iter: Add some more functions

Commit: b58b3d167609a419a06d9d672f13501ce27d23fc
    https://github.com/numpy/numpy/commit/b58b3d167609a419a06d9d672f13501ce27d23fc
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-26 (Wed, 26 Jan 2011)

Changed paths:
  M doc/neps/new-iterator-ufunc.rst

Log Message:
-----------
NEP: iter: Add NpyIter_GetAxisStrideArray function

Commit: 98721b3f06626314e47afa6d1ad9a1a0d3746412
    https://github.com/numpy/numpy/commit/98721b3f06626314e47afa6d1ad9a1a0d3746412
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_regression.py

Log Message:
-----------
BUG: ufunc: Fix buffered reduce

Commit: c4a556e1fcdede5fe366e4373a7f2dc802a0e898
    https://github.com/numpy/numpy/commit/c4a556e1fcdede5fe366e4373a7f2dc802a0e898
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/item_selection.c
  M numpy/core/src/multiarray/lowlevel_strided_loops.c.src
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_numeric.py
  M numpy/core/tests/test_regression.py
  M numpy/testing/utils.py

Log Message:
-----------
BUG: core: Fix things so scipy trunk passes all tests (but one)

With this patch, the latest scipy trunk (7087), built against NumPy
1.5.1, passes all tests when run against the numpy trunk.  The single
failing test, test_imresize, fails because it tests all float types,
and the new 'half' type lacks the precision to pass that test.

Commit: 29e868951da7348ffa021889bfd5719bab403308
    https://github.com/numpy/numpy/commit/29e868951da7348ffa021889bfd5719bab403308
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/multiarraymodule_onefile.c

Log Message:
-----------
BLD: Add einsum to the one file build

Commit: 0a011429b13d7267a87e1cbc8c5b8fe42c22df5d
    https://github.com/numpy/numpy/commit/0a011429b13d7267a87e1cbc8c5b8fe42c22df5d
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/umath/ufunc_object.c

Log Message:
-----------
ENH: ufunc: Move reduceat to its own function, have it use the iterator

Commit: 3e58b8db5d2ff4b850f63373e1b1d1c812454264
    https://github.com/numpy/numpy/commit/3e58b8db5d2ff4b850f63373e1b1d1c812454264
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/add_newdocs.py
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/setup_common.py
  M numpy/core/src/multiarray/arraytypes.c.src
  M numpy/core/src/multiarray/lowlevel_strided_loops.c.src
  M numpy/core/src/multiarray/multiarraymodule.c

Log Message:
-----------
ENH: core: Make NumPy trunk ABI-compatible with 1.5

Commit: 01c78669494a05a539cdbb83614b6c3312e5401e
    https://github.com/numpy/numpy/commit/01c78669494a05a539cdbb83614b6c3312e5401e
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/add_newdocs.py
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/include/numpy/ufuncobject.h
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/umath/ufunc_object.c

Log Message:
-----------
ENH: ufunc: Add new iterator version of generalized ufuncs

Commit: 536ee131d2fe89ff9a5552d01bca01c3d89cac90
    https://github.com/numpy/numpy/commit/536ee131d2fe89ff9a5552d01bca01c3d89cac90
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src

Log Message:
-----------
ENH: iter: Change permutation to a fixed-size char array

Commit: 628e7b77f49b8d4afa633bbef103d6c5156b3a58
    https://github.com/numpy/numpy/commit/628e7b77f49b8d4afa633bbef103d6c5156b3a58
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src

Log Message:
-----------
ENH: iter: Remove internal NPY_OP_ITFLAG_COPY flag

Commit: 2a1706fd84b2970f7ab64d9d46f1c0951eac8cfa
    https://github.com/numpy/numpy/commit/2a1706fd84b2970f7ab64d9d46f1c0951eac8cfa
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src

Log Message:
-----------
ENH: iter: Add a per-operand REDUCE flag

Commit: 779b01b039e05150ec21047fc04061fab55e5f42
    https://github.com/numpy/numpy/commit/779b01b039e05150ec21047fc04061fab55e5f42
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/add_newdocs.py
  M numpy/core/src/multiarray/item_selection.c
  M numpy/core/src/npymath/halffloat.c
  M numpy/core/tests/test_regression.py
  M numpy/ma/testutils.py

Log Message:
-----------
WRN: iter: Fix half-float warnings, other small tweaks

Commit: b8c1f4bca90bca44bee87eb22495e6605a43ff30
    https://github.com/numpy/numpy/commit/b8c1f4bca90bca44bee87eb22495e6605a43ff30
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/tests/test_numeric.py

Log Message:
-----------
ENH: iter: Improve performance of buffering reduce operations

Commit: 95937582ce1feade737daba0f0c10233eede64ad
    https://github.com/numpy/numpy/commit/95937582ce1feade737daba0f0c10233eede64ad
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/scalartypes.h

Log Message:
-----------
BUG: Single file build had wrong promotion table type

Commit: 211191d4985b15a1d3fa773b99fec17be57de7b4
    https://github.com/numpy/numpy/commit/211191d4985b15a1d3fa773b99fec17be57de7b4
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/arrayobject.c
  M numpy/core/src/multiarray/buffer.c
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/datetime.c
  M numpy/core/src/multiarray/flagsobject.c
  M numpy/core/src/multiarray/multiarraymodule.c

Log Message:
-----------
WRN: Fix some warnings and suspicious looking code

Commit: 82bd8f94caef920dc47b37826dec6716839afd51
    https://github.com/numpy/numpy/commit/82bd8f94caef920dc47b37826dec6716839afd51
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-27 (Thu, 27 Jan 2011)

Changed paths:
  M setup.py

Log Message:
-----------
VER: Change version to 1.6.0

Commit: aca4c6447e669d3e56e17d5842f968979eec2bcd
    https://github.com/numpy/numpy/commit/aca4c6447e669d3e56e17d5842f968979eec2bcd
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M numpy/core/src/multiarray/methods.c

Log Message:
-----------
STY: core: Improve formating of ParseTuple argument lists

Now in methods.c each argument gets its own line, so its easier to validate.

Commit: 6510cce13410a9fff4d92f6390c16a7788b1a892
    https://github.com/numpy/numpy/commit/6510cce13410a9fff4d92f6390c16a7788b1a892
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M doc/source/reference/c-api.array.rst
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/src/multiarray/convert.c
  M numpy/core/src/multiarray/ctors.c

Log Message:
-----------
ENH: core: Add PyArray_NewLikeArray function

This function implements the numpy.empty_like semantics, but supports
the new NPY_KEEPORDER enumeration value as well as switching to a
different data type.

Commit: c9d1849332ae5bf73299ea1268f6a55f78624688
    https://github.com/numpy/numpy/commit/c9d1849332ae5bf73299ea1268f6a55f78624688
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M numpy/add_newdocs.py
  M numpy/core/numeric.py
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/methods.c
  M numpy/core/src/multiarray/multiarraymodule.c
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/multiarray/shape.c
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_numeric.py
  M numpy/core/tests/test_regression.py

Log Message:
-----------
ENH: core: Add dtype= and order= parameters to zeros_like, ones_like, and empty_like

Commit: 0046a594071117d8bd379f6e9bd2d2d7a6f9852e
    https://github.com/numpy/numpy/commit/0046a594071117d8bd379f6e9bd2d2d7a6f9852e
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M doc/neps/new-iterator-ufunc.rst

Log Message:
-----------
NEP: iter: Add NPY_ITER_DONT_REVERSE_AXES flag

Commit: aedce0eb9fa63e7dec3c865374a64e11374c284c
    https://github.com/numpy/numpy/commit/aedce0eb9fa63e7dec3c865374a64e11374c284c
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M numpy/core/fromnumeric.py
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/src/multiarray/convert.c
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/new_iterator.c.src
  M numpy/core/src/multiarray/shape.c
  M numpy/core/src/multiarray/shape.h
  M numpy/core/tests/test_multiarray.py

Log Message:
-----------
ENH: core: Add support for numpy.ravel(a, order='K')

Commit: 67e5476a4178de55451501cfb01794c22d340b7a
    https://github.com/numpy/numpy/commit/67e5476a4178de55451501cfb01794c22d340b7a
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  M THANKS.txt
  M doc/source/reference/arrays.ndarray.rst
  M doc/source/reference/c-api.array.rst
  M doc/source/reference/c-api.ufunc.rst
  M doc/source/reference/routines.dtype.rst
  M doc/source/reference/routines.linalg.rst
  M doc/source/reference/routines.sort.rst
  M numpy/add_newdocs.py
  M numpy/core/code_generators/genapi.py
  M numpy/core/code_generators/numpy_api.py
  M numpy/core/fromnumeric.py
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/include/numpy/ufuncobject.h
  M numpy/core/numeric.py
  M numpy/core/setup.py
  M numpy/core/setup_common.py
  M numpy/core/src/multiarray/arrayobject.c
  M numpy/core/src/multiarray/arraytypes.c.src
  M numpy/core/src/multiarray/buffer.c
  M numpy/core/src/multiarray/calculation.c
  M numpy/core/src/multiarray/common.c
  M numpy/core/src/multiarray/common.h
  M numpy/core/src/multiarray/conversion_utils.c
  M numpy/core/src/multiarray/convert.c
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/convert_datatype.h
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/ctors.h
  M numpy/core/src/multiarray/datetime.c
  A numpy/core/src/multiarray/dtype_transfer.c
  A numpy/core/src/multiarray/einsum.c.src
  M numpy/core/src/multiarray/flagsobject.c
  M numpy/core/src/multiarray/getset.c
  M numpy/core/src/multiarray/item_selection.c
  M numpy/core/src/multiarray/iterators.c
  A numpy/core/src/multiarray/lowlevel_strided_loops.c.src
  A numpy/core/src/multiarray/lowlevel_strided_loops.h
  M numpy/core/src/multiarray/methods.c
  M numpy/core/src/multiarray/multiarraymodule.c
  M numpy/core/src/multiarray/multiarraymodule_onefile.c
  A numpy/core/src/multiarray/new_iterator.c.src
  A numpy/core/src/multiarray/new_iterator_pywrap.c
  A numpy/core/src/multiarray/new_iterator_pywrap.h
  M numpy/core/src/multiarray/scalartypes.c.src
  M numpy/core/src/multiarray/scalartypes.h
  M numpy/core/src/multiarray/shape.c
  M numpy/core/src/multiarray/shape.h
  M numpy/core/src/multiarray/usertypes.c
  M numpy/core/src/npymath/halffloat.c
  M numpy/core/src/scalarmathmodule.c.src
  M numpy/core/src/umath/loops.c.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/tests/test_multiarray.py
  A numpy/core/tests/test_new_iterator.py
  M numpy/core/tests/test_numeric.py
  M numpy/core/tests/test_regression.py
  M numpy/core/tests/test_scalarmath.py
  M numpy/core/tests/test_ufunc.py
  M numpy/lib/npyio.py
  M numpy/lib/tests/test_io.py
  M numpy/lib/tests/test_recfunctions.py
  M numpy/linalg/linalg.py
  M numpy/ma/core.py
  M numpy/ma/tests/test_core.py
  M numpy/ma/testutils.py
  M numpy/matrixlib/tests/test_defmatrix.py
  M numpy/testing/print_coercion_tables.py
  M numpy/testing/tests/test_utils.py
  M numpy/testing/utils.py
  M setup.py

Log Message:
-----------
Merge branch 'new_iterator' - new iterator, ufunc update, restore 1.5 ABI

New Iterator - Read doc/neps/new-iterator-ufunc.rst.
UFunc Update - Change all ufunc functions to use the new iterator.  This
               replaces the inline buffering with iterator buffering, except
               for the reductions and generalized ufunc which use updateifcopy
               at the moment.  Also adds out= and order= parameters to
               all ufuncs.
Restore 1.5 ABI - This was done by moving the new type numbers to the end
               of the type enumeration, and replacing all type promotion
               code with a table-based approach.  The ArrFuncs was
               restored by putting the new type cast functions into the
               cast dictionary, originally designed just for custom
               types.

Conflicts:
	numpy/core/src/multiarray/ctors.c
	numpy/core/tests/test_regression.py

Commit: ab3dcf817066e7be08e0c4c6264db36674978284
    https://github.com/numpy/numpy/commit/ab3dcf817066e7be08e0c4c6264db36674978284
Author: Mark Wiebe <mwwiebe at gmail.com>
Date:   2011-01-28 (Fri, 28 Jan 2011)

Changed paths:
  A doc/neps/deferred-ufunc-evaluation.rst
  A doc/neps/new-iterator-ufunc.rst

Log Message:
-----------
Merge branch 'mw_neps'