8000 Merge branch 'master' into clean-up-diagonal · githubmlai/numpy@85b6828 · GitHub
[go: up one dir, main page]
Skip to content

Commit 85b6828

Browse files
njsmithnjsmith
committed
Merge branch 'master' into clean-up-diagonal
2 parents 51616c9 + de8c536 commit 85b6828

24 files changed

+631
-290
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ doc/cdoc/build
5656
*.egg-info
5757
# The shelf plugin uses this dir
5858
./.shelf
59+
MANIFEST
5960

6061
# Logs and databases #
6162
######################
@@ -88,3 +89,4 @@ numpy/core/include/numpy/__ufunc_api.h
8889
numpy/core/include/numpy/_numpyconfig.h
8990
numpy/version.py
9091
site.cfg
92+
.tox

‎bento.info

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,24 @@ DataFiles: tests
5656
TargetDir: $sitedir/numpy
5757
SourceDir: numpy
5858
Files:
59-
core/tests/*.py,
60-
distutils/tests/*.py,
61-
f2py/tests/*.py,
62-
fft/tests/*.py,
63-
lib/tests/*.py,
64-
linalg/tests/*.py,
65-
ma/tests/*.py,
66-
matrixlib/tests/*.py,
67-
oldnumeric/tests/*.py,
68-
polynomial/tests/*.py,
69-
random/tests/*.py,
70-
testing/tests/*.py
59+
**/tests/*.py,
60+
core/tests/data/*.fits,
61+
core/tests/data/*.pkl,
62+
f2py/tests/src/array_from_pyobj/*.c,
63+
f2py/src/test/*.c,
64+
f2py/src/test/*.f,
65+
f2py/src/test/*.f90
66+
67+
DataFiles: f2py-data
68+
TargetDir: $sitedir
69+
Files:
70+
numpy/f2py/src/fortranobject.*
71+
72+
DataFiles: numpy-includes
73+
TargetDir: $sitedir
74+
Files:
75+
numpy/core/include/numpy/*.h,
76+
numpy/core/include/numpy/fenv/*.h
7177

7278
HookFile: bscript
7379
Recurse: numpy

‎bscript

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,42 @@ def check_blas_lapack(conf):
4545
conf.check_cc(lib=mkl_libs, msg="Checking for MKL (CBLAS)",
4646
uselib_store="CBLAS")
4747
conf.env.HAS_CBLAS = True
48+
except waflib.Errors.ConfigurationError:
49+
conf.env.HAS_LAPACK = False
4850

51+
try:
4952
conf.check_cc(lib=mkl_libs, msg="Checking for MKL (LAPACK)",
5053
uselib_store="LAPACK")
5154
conf.env.HAS_LAPACK = True
5255
except waflib.Errors.ConfigurationError:
53-
pass
56+
conf.env.HAS_LAPACK = False
57+
5458

5559
elif sys.platform == "darwin":
5660
try:
57-
conf.check(framework="Accelerate", msg="Checking for framework Accelerate", uselib_store="CBLAS")
61+
conf.check(framework="Accelerate", msg="Checking for framework Accelerate (CBLAS)", uselib_store="CBLAS")
5862
conf.env.HAS_CBLAS = True
63+
except waflib.Errors.ConfigurationError:
64+
conf.env.HAS_CBLAS = False
5965

60-
conf.check(framework="Accelerate", msg="Checking for framework Accelerate", uselib_store="LAPACK")
66+
try:
67+
conf.check(framework="Accelerate", msg="Checking for framework Accelerate (LAPACK)", uselib_store="LAPACK")
6168
conf.env.HAS_LAPACK = True
6269
except waflib.Errors.ConfigurationError:
63-
pass
70+
conf.env.HAS_LAPACK = False
6471
else:
6572
try:
6673 D3FE
conf.check_cc(lib=["cblas", "atlas"], uselib_store="CBLAS")
6774
conf.env.HAS_CBLAS = True
75+
except waflib.Errors.ConfigurationError:
76+
conf.env.HAS_CBLAS = False
6877

78+
try:
6979
conf.check_cc(lib=["lapack", "f77blas", "cblas", "atlas"],
7080
uselib_store="LAPACK")
7181
conf.env.HAS_LAPACK = True
7282
except waflib.Errors.ConfigurationError:
73-
pass
83+
conf.env.HAS_LAPACK = False
7484

7585
# You can manually set up blas/lapack as follows:
7686
#conf.env.HAS_CBLAS = True
@@ -105,29 +115,20 @@ def make_git_commit_info(ctx):
105115
commit_template = ctx.make_source_node(op.join("numpy", "version.py.in"))
106116
return set_revision(commit_template, ctx.pkg.version)
107117

108-
@hooks.pre_configure
109-
def pre_configure(context):
118+
@hooks.post_configure
119+
def post_configure(context):
110120
conf = context.waf_context
111-
112-
conf.load("compiler_c")
113-
conf.load("custom_python", tooldir=[waf_backend.WAF_TOOLDIR])
114-
115-
conf.check_python_version((2, 4, 0))
116-
conf.check_python_headers()
117-
118121
if conf.env["CC_NAME"] == "gcc":
119122
conf.env.CFLAGS_PYEXT.append("-Wfatal-errors")
120123
check_blas_lapack(conf)
121124

122125
@hooks.pre_build
123126
def pre_build(context):
124-
context.register_category("git_info")
125127
commit_output = make_git_commit_info(context)
126-
context.register_outputs("git_info", "git_commit_info", [commit_output])
128+
context.register_outputs_simple([commit_output])
127129

128130
# FIXME: we write a dummy show for now - the original show function is not
129131
# super useful anyway.
130-
context.register_category("gen_config")
131132
config_node = context.make_build_node("numpy/__config__.py")
132133
config_node.safe_write("def show(): pass")
133-
context.register_outputs("gen_config", "top_config", [config_node])
134+
context.register_outputs_simple([config_node])

‎doc/HOWTO_DOCUMENT.rst.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A Guide to NumPy/SciPy Documentation
99
For an accompanying example, see `example.py
1010
<http://github.com/numpy/numpy/blob/master/doc/example.py>`_.
1111

12-
When using `Sphinx <http://sphinx.pocoo.org/>`_ in combination with the
12+
When using `Sphinx <http://sphinx.pocoo.org/>`__ in combination with the
1313
numpy conventions, you should use the ``numpydoc`` extension so that your
1414
docstrings will be handled correctly. For example, Sphinx will extract the
1515
``Parameters`` section from your docstring and convert it into a field
@@ -25,9 +25,9 @@ A Guide to NumPy/SciPy Documentation
2525
<https://github.com/numpy/numpy/blob/master/doc/sphinxext/numpydoc.py>`_
2626

2727
Details of how to use it can be found `here
28-
<https://github.com/numpy/numpy/blob/master/doc/sphinxext/README.txt>`_ and
28+
<https://github.com/numpy/numpy/blob/master/doc/sphinxext/README.txt>`__ and
2929
`here
30-
<https://github.com/numpy/numpy/blob/master/doc/HOWTO_BUILD_DOCS.rst.txt>`_
30+
<https://github.com/numpy/numpy/blob/master/doc/HOWTO_BUILD_DOCS.rst.txt>`__
3131

3232
Overview
3333
--------

‎doc/release/1.6.1-notes.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
=========================
2+
NumPy 1.6.1 Release Notes
3+
=========================
4+
5+
This is a bugfix only release in the 1.6.x series.
6+
7+
8+
Issues fixed
9+
------------
10+
11+
#1834 einsum fails for specific shapes
12+
#1837 einsum throws nan or freezes python for specific array shapes
13+
#1838 object <-> structured type arrays regression
14+
#1851 regression for SWIG based code in 1.6.0
15+
#1863 Buggy results when operating on array copied with astype()
16+
#1870 Fix corner case of object array assignment
17+
#1843 Py3k: fix error with recarray
18+
#1885 nditer: Error in detecting double reduction loop
19+
#1874 f2py: fix --include_paths bug
20+
#1749 Fix ctypes.load_library()
21+
#1895/1896 iter: writeonly operands weren't always being buffered correctly
22+

‎doc/release/1.6.2-notes.rst

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
=========================
2+
NumPy 1.6.2 Release Notes
3+
=========================
4+
5+
This is a bugfix release in the 1.6.x series. Due to the delay of the NumPy
6+
1.7.0 release, this release contains far more fixes than a regular NumPy bugfix
7+
release. It also includes a number of documentation and build improvements.
8+
9+
10+
``numpy.core`` issues fixed
11+
---------------------------
12+
13+
#2063 make unique() return consistent index
14+
#1138 allow creating arrays from empty buffers or empty slices
15+
#1446 correct note about correspondence vstack and concatenate
16+
#1149 make argmin() work for datetime
17+
#1672 fix allclose() to work for scalar inf
18+
#1747 make np.median() work for 0-D arrays
19+
#1776 make complex division by zero to yield inf properly
20+
#1675 add scalar support for the format() function
21+
#1905 explicitly check for NaNs in allclose()
22+
#1952 allow floating ddof in std() and var()
23+
#1948 fix regression for indexing chararrays with empty list
24+
#2017 fix type hashing
25+
#2046 deleting array attributes causes segfault
26+
#2033 a**2.0 has incorrect type
27+
#2045 make attribute/iterator_element deletions not segfault
28+
#2021 fix segfault in searchsorted()
29+
#2073 fix float16 __array_interface__ bug
30+
31+
32+
``numpy.lib`` issues fixed
33+
--------------------------
34+
35+
#2048 break reference cycle in NpzFile
36+
#1573 savetxt() now handles complex arrays
37+
#1387 allow bincount() to accept empty arrays
38+
#1899 fixed histogramdd() bug with empty inputs
39+
#1793 fix failing npyio test under py3k
40+
#1936 fix extra nesting for subarray dtypes
41+
#1848 make tril/triu return the same dtype as the original array
42+
#1918 use Py_TYPE to access ob_type, so it works also on Py3
43+
44+
45+
``numpy.f2py`` changes
46+
----------------------
47+
48+
ENH: Introduce new options extra_f77_compiler_args and extra_f90_compiler_args
49+
BLD: Improve reporting of fcompiler value
50+
BUG: Fix f2py test_kind.py test
51+
52+
53+
``numpy.poly`` changes
54+
----------------------
55+
56+
ENH: Add some tests for polynomial printing
57+
ENH: Add companion matrix functions
58+
DOC: Rearrange the polynomial documents
59+
BUG: Fix up links to classes
60+
DOC: Add version added to some of the polynomial package modules
61+
DOC: Document xxxfit functions in the polynomial package modules
62+
BUG: The polynomial convenience classes let different types interact
63+
DOC: Document the use of the polynomial convenience classes
64+
DOC: Improve numpy reference documentation of polynomial classes
65+
ENH: Improve the computation of polynomials from roots
66+
STY: Code cleanup in polynomial [*]fromroots functions
67+
DOC: Remove references to cast and NA, which were added in 1.7
68+
69+
70+
``numpy.distutils`` issues fixed
71+
-------------------------------
72+
73+
#1261 change compile flag on AIX from -O5 to -O3
74+
#1377 update HP compiler flags
75+
#1383 provide better support for C++ code on HPUX
76+
#1857 fix build for py3k + pip
77+
BLD: raise a clearer warning in case of building without cleaning up first
78+
BLD: follow build_ext coding convention in build_clib
79+
BLD: fix up detection of Intel CPU on OS X in system_info.py
80+
BLD: add support for the new X11 directory structure on Ubuntu & co.
81+
BLD: add ufsparse to the libraries search path.
82+
BLD: add 'pgfortran' as a valid compiler in the Portland Group
83+
BLD: update version match regexp for IBM AIX Fortran compilers.
84+
85+
86+
``numpy.random`` issues fixed
87+
-----------------------------
88+
89+
BUG: Use npy_intp instead of long in mtrand
90+

‎doc/source/release.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ Release Notes
33
*************
44

55
.. include:: ../release/1.3.0-notes.rst
6+
.. include:: ../release/1.4.0-notes.rst
7+
.. include:: ../release/1.5.0-notes.rst
8+
.. include:: ../release/1.6.0-notes.rst
9+
.. include:: ../release/1.6.1-notes.rst
10+
.. include:: ../release/1.6.2-notes.rst

‎numpy/core/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,23 @@
77
import _internal # for freeze programs
88
import numerictypes as nt
99
multiarray.set_typeDict(nt.sctypeDict)
10+
import numeric
1011
from numeric import *
12+
import fromnumeric
1113
from fromnumeric import *
1214
import defchararray as char
1315
import records as rec
1416
from records import *
1517
from memmap import *
1618
from defchararray import chararray
1719
import scalarmath
20+
import function_base
1821
from function_base import *
22+
import machar
1923
from machar import *
24+
import getlimits
2025
from getlimits import *
26+
import shape_base
2127
from shape_base import *
2228
del nt
2329

‎numpy/core/bento.info

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Library:
2020
Extension: umath
2121
Sources:
2222
src/umath/umathmodule_onefile.c
23+
Extension: umath_tests
24+
Sources:
25+
src/umath/umath_tests.c.src
2326
Extension: scalarmath
2427
Sources:
2528
src/scalarmathmodule.c.src

0 commit comments

Comments
 (0)
0