[Numpy-svn] [numpy/numpy] ca258f: Merge branch 'replace-noprefix'

GitHub noreply@github....
Thu Feb 9 18:33:39 CST 2012


  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: ca258fc430fbcba6a3824dd3834f8e14259a62c8
      https://github.com/numpy/numpy/commit/ca258fc430fbcba6a3824dd3834f8e14259a62c8
  Author: Charles Harris <charlesr.harris@gmail.com>
  Date:   2012-02-09 (Thu, 09 Feb 2012)

  Changed paths:
    M numpy/core/SConscript
  M numpy/core/blasdot/_dotblas.c
  M numpy/core/bscript
  M numpy/core/include/numpy/arrayobject.h
  M numpy/core/include/numpy/ndarraytypes.h
  M numpy/core/include/numpy/noprefix.h
  M numpy/core/include/numpy/npy_common.h
  M numpy/core/include/numpy/npy_interrupt.h
  M numpy/core/setup.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/conversion_utils.c
  M numpy/core/src/multiarray/conversion_utils.h
  M numpy/core/src/multiarray/convert.c
  M numpy/core/src/multiarray/convert_datatype.c
  M numpy/core/src/multiarray/ctors.c
  M numpy/core/src/multiarray/ctors.h
  M numpy/core/src/multiarray/descriptor.c
  M numpy/core/src/multiarray/dtype_transfer.c
  M 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/hashdescr.c
  M numpy/core/src/multiarray/item_selection.c
  M numpy/core/src/multiarray/iterators.c
  M numpy/core/src/multiarray/iterators.h
  M numpy/core/src/multiarray/lowlevel_strided_loops.c.src
  M numpy/core/src/multiarray/mapping.c
  M numpy/core/src/multiarray/mapping.h
  M numpy/core/src/multiarray/methods.c
  M numpy/core/src/multiarray/multiarray_tests.c.src
  M numpy/core/src/multiarray/multiarraymodule.c
  M numpy/core/src/multiarray/nditer_impl.h
  M numpy/core/src/multiarray/nditer_pywrap.c
  M numpy/core/src/multiarray/number.c
  M numpy/core/src/multiarray/numpymemoryview.c
  M numpy/core/src/multiarray/numpyos.c
  M numpy/core/src/multiarray/refcount.c
  M numpy/core/src/multiarray/scalarapi.c
  M numpy/core/src/multiarray/scalartypes.c.src
  M numpy/core/src/multiarray/scalartypes.h
  M numpy/core/src/multiarray/sequence.c
  M numpy/core/src/multiarray/shape.c
  M numpy/core/src/multiarray/ucsnarrow.c
  M numpy/core/src/multiarray/usertypes.c
  M numpy/core/src/npymath/ieee754.c.src
  M numpy/core/src/npymath/npy_math.c.src
  M numpy/core/src/npymath/npy_math_complex.c.src
  M numpy/core/src/scalarmathmodule.c.src
  M numpy/core/src/umath/funcs.inc.src
  M numpy/core/src/umath/loops.c.src
  M numpy/core/src/umath/loops.h
  M numpy/core/src/umath/loops.h.src
  M numpy/core/src/umath/ufunc_object.c
  M numpy/core/src/umath/umath_tests.c.src
  A numpy/core/src/umath/umathmodule.c
  R numpy/core/src/umath/umathmodule.c.src
  M numpy/f2py/doc/multiarray/array_from_pyobj.c
  M numpy/lib/src/_compiled_base.c
  M numpy/linalg/lapack_litemodule.c

  Log Message:
  -----------
  Merge branch 'replace-noprefix'

* replace-noprefix: (30 commits)
  BUG: Fix typo npydouble.
  UPD: Remove now redundant typedef.
  UPD: Fix a few more spots missing prefixes.
  BUG: Fix scons build script so it works with umathmodule.c.
  STY: Cleanup some prefixing that crept into comments.
  UPD: Various fixes, Remove #define NPY_NO_PREFIX from files in core.
  ENH: Add some needed macros to include files.
  UPD: Use prefixed types in scalartypes.c.src.
  UPD: Make multiarray *.c files use prefixed macros.
  UPD: Use prefixed types in arraytypes.c.src.
  ENH: Add a few needed macros to npy_common.h.
  UPD: Include ndarrayobject.h instead of arrayobject.h in boolean_ops.c.src.
  UPD: Use prefixed types in lowlevel_strided_loops.c.src template headers.
  UPD: Use explicit prefixed types in einsum.c.src template headers.
  UPD: Use prefixed versions of double and int in multiarray_tests.c.src.
  UPD: Remove includes of noprefix.h in ufunc_object.c and _compiled_base.c.
  BUG: Fix unprefixed reference to cdouble in ndarrayobject.h.
  UPD: Use prefixed macros in numpy/core/src/scalarmathmodule.c.src.
  UPD: Use prefixed macros in numpy/core/src/umath/funcs.inc.src.
  MOV: Rename umathmodule.c.src umathmodule.c since it has no templates.
  ...





More information about the Numpy-svn mailing list