Author: mattip <[email protected]> Branch: release-4.0.x Changeset: r80463:814b3fadaad7 Date: 2015-10-26 23:38 +1100 http://bitbucket.org/pypy/pypy/changeset/814b3fadaad7/
Log: merge default into release diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -16,3 +16,4 @@ e03971291f3a0729ecd3ee7fae7ddb0bb82d476c release-2.6.0 295ee98b69288471b0fcf2e0ede82ce5209eb90b release-2.6.0 f3ad1e1e1d6215e20d34bb65ab85ff9188c9f559 release-2.6.1 +850edf14b2c75573720f59e95767335fb1affe55 release-4.0.0 diff --git a/pypy/doc/release-4.0.0.rst b/pypy/doc/release-4.0.0.rst --- a/pypy/doc/release-4.0.0.rst +++ b/pypy/doc/release-4.0.0.rst @@ -198,6 +198,9 @@ * Handle getfield_gc_pure* and getfield_gc_* uniformly in heap.py + * Improve simple trace function performance by lazily calling fast2locals + and locals2fast only if truly necessary + .. _`vmprof`: https://vmprof.readthedocs.org .. _resolved: http://doc.pypy.org/en/latest/whatsnew-15.11.0.html diff --git a/pypy/doc/whatsnew-4.0.0.rst b/pypy/doc/whatsnew-4.0.0.rst --- a/pypy/doc/whatsnew-4.0.0.rst +++ b/pypy/doc/whatsnew-4.0.0.rst @@ -92,3 +92,6 @@ .. branch: osx-libffi +.. branch: lazy-fast2locals +improve the performance of simple trace functions by lazily calling +fast2locals and locals2fast only if f_locals is actually accessed. diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -3,8 +3,6 @@ ========================= .. this is a revision shortly after release-4.0.0 -.. startrev: 9397d7c6f5aa +.. startrev: 57c9a47c70f6 -.. branch: lazy-fast2locals -improve the performance of simple trace functions by lazily calling -fast2locals and locals2fast only if f_locals is actually accessed. + diff --git a/pypy/module/cpyext/test/test_ndarrayobject.py b/pypy/module/cpyext/test/test_ndarrayobject.py --- a/pypy/module/cpyext/test/test_ndarrayobject.py +++ b/pypy/module/cpyext/test/test_ndarrayobject.py @@ -430,5 +430,5 @@ assert (out == arr * 2).all() times2prime = mod.create_ufunc_signature() - out = times2prime(arr, sig='(d)->(d)', extobj=[0, 0, None]) + out = times2prime(arr, sig='d->d', extobj=[0, 0, None]) assert (out == arr * 2).all() diff --git a/pypy/module/micronumpy/test/test_subtype.py b/pypy/module/micronumpy/test/test_subtype.py --- a/pypy/module/micronumpy/test/test_subtype.py +++ b/pypy/module/micronumpy/test/test_subtype.py @@ -437,7 +437,7 @@ assert (b == a).all() d = np.empty([6,2], dtype=float) - d.view(int).fill(0xdeadbeef) + d.view('int64').fill(0xdeadbeef) e = d[0::3,:] e[...] = [[1, 2], [3, 4]] assert e.strides == (48, 8) @@ -447,7 +447,7 @@ assert (g == [[1, 2], [3, 4]]).all() k = np.empty([2, 8], dtype=float) - k.view(int).fill(0xdeadbeef) + k.view('int64').fill(0xdeadbeef) m = k[:, ::-4] m[...] = [[1, 2], [3, 4]] assert m.strides == (64, -32) _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
