[pypy-commit] pypy default: add sanity check that iter state is only used with corresponding iterator

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70750:ceb3e5defbab Date: 2014-04-18 02:07 -0400 http://bitbucket.org/pypy/pypy/changeset/ceb3e5defbab/ Log:add sanity check that iter state is only used with corresponding iterator diff --git a/pypy/module/micronumpy/iterators.py b/pypy/modu

[pypy-commit] pypy default: add pow_int test_zjit

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70749:d13b267aa161 Date: 2014-04-18 00:58 -0400 http://bitbucket.org/pypy/pypy/changeset/d13b267aa161/ Log:add pow_int test_zjit diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/pypy/module/micro

[pypy-commit] pypy default: enable slice test_zjit

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70748:2b3387207a65 Date: 2014-04-18 00:46 -0400 http://bitbucket.org/pypy/pypy/changeset/2b3387207a65/ Log:enable slice test_zjit diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/pypy/module/micr

[pypy-commit] pypy default: merge numpy-speed

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70746:f48615b2d047 Date: 2014-04-17 22:39 -0400 http://bitbucket.org/pypy/pypy/changeset/f48615b2d047/ Log:merge numpy-speed diff --git a/pypy/module/micronumpy/concrete.py b/pypy/module/micronumpy/concrete.py --- a/pypy/module/micronumpy/concrete.p

[pypy-commit] pypy numpy-speed: merge default

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70744:892ea7009bdf Date: 2014-04-17 21:47 -0400 http://bitbucket.org/pypy/pypy/changeset/892ea7009bdf/ Log:merge default diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/w

[pypy-commit] pypy default: update whatsnew

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70747:001f22802214 Date: 2014-04-17 22:41 -0400 http://bitbucket.org/pypy/pypy/changeset/001f22802214/ Log:update whatsnew diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-h

[pypy-commit] pypy numpy-speed: add a test_zjit for where

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70743:6072af059033 Date: 2014-04-17 21:11 -0400 http://bitbucket.org/pypy/pypy/changeset/6072af059033/ Log:add a test_zjit for where diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/py

[pypy-commit] pypy numpy-speed: update nditer to use iter states

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70745:80dd8d52084e Date: 2014-04-17 22:38 -0400 http://bitbucket.org/pypy/pypy/changeset/80dd8d52084e/ Log:update nditer to use iter states diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py --- a/pypy/module/

[pypy-commit] pypy default: cleanup nditer

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70741:7ee3a18d1aca Date: 2014-04-17 21:35 -0400 http://bitbucket.org/pypy/pypy/changeset/7ee3a18d1aca/ Log:cleanup nditer diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micronumpy/iterators.p

[pypy-commit] pypy default: merge heads

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70742:cbf4dcd31689 Date: 2014-04-17 21:45 -0400 http://bitbucket.org/pypy/pypy/changeset/cbf4dcd31689/ Log:merge heads diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py --- a/pypy/objspace/std/celldict.py +++ b/pypy/objspace/

[pypy-commit] pypy py3k: merge default

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r70734:f10a4d4b1837 Date: 2014-04-17 16:53 -0700 http://bitbucket.org/pypy/pypy/changeset/f10a4d4b1837/ Log:merge default diff --git a/pypy/objspace/std/test/test_celldict.py b/pypy/objspace/std/test/test_celldict.py --- a/pypy/objspace/std/test

[pypy-commit] pypy py3k-fix-strategies: merge py3k

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70735:a0becb7c56be Date: 2014-04-17 16:53 -0700 http://bitbucket.org/pypy/pypy/changeset/a0becb7c56be/ Log:merge py3k diff --git a/pypy/objspace/std/test/test_celldict.py b/pypy/objspace/std/test/test_celldict.py --- a/pypy/objsp

[pypy-commit] pypy py3k-fix-strategies: adapt tests, progress

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70736:ec5e5a6abac5 Date: 2014-04-17 17:40 -0700 http://bitbucket.org/pypy/pypy/changeset/ec5e5a6abac5/ Log:adapt tests, progress diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py --- a/pypy/interpreter/argum

[pypy-commit] pypy py3k-fix-strategies: fix cell/mapdict

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70737:b9437d441ad2 Date: 2014-04-17 17:41 -0700 http://bitbucket.org/pypy/pypy/changeset/b9437d441ad2/ Log:fix cell/mapdict diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py --- a/pypy/objspace/std/celldic

[pypy-commit] pypy py3k-fix-strategies: progress

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70739:2caa57866049 Date: 2014-04-17 17:41 -0700 http://bitbucket.org/pypy/pypy/changeset/2caa57866049/ Log:progress diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py --- a/pypy/interpreter/pyopcode.py +++ b/

[pypy-commit] pypy py3k-fix-strategies: adapt disabled list strats

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70738:83e84e9c47fc Date: 2014-04-17 17:41 -0700 http://bitbucket.org/pypy/pypy/changeset/83e84e9c47fc/ Log:adapt disabled list strats diff --git a/pypy/objspace/std/bytesobject.py b/pypy/objspace/std/bytesobject.py --- a/pypy/objs

[pypy-commit] pypy default: use FakeString everywhere to be more consistent

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r70731:c797491b7fc4 Date: 2014-04-17 16:52 -0700 http://bitbucket.org/pypy/pypy/changeset/c797491b7fc4/ Log:use FakeString everywhere to be more consistent diff --git a/pypy/objspace/std/test/test_celldict.py b/pypy/objspace/std/test/test_celldict.p

[pypy-commit] pypy py3k-fix-strategies: more progress, have _str methods accept utf-8 encoded strs, for the sake of

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k-fix-strategies Changeset: r70740:806adbe54237 Date: 2014-04-17 17:41 -0700 http://bitbucket.org/pypy/pypy/changeset/806adbe54237/ Log:more progress, have _str methods accept utf-8 encoded strs, for the sake of compat. w/ default diff --git a/pypy/ob

[pypy-commit] pypy default: minor cleanup/refactoring for the sake of py3k

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r70730:281b05c23a4b Date: 2014-04-17 16:27 -0700 http://bitbucket.org/pypy/pypy/changeset/281b05c23a4b/ Log:minor cleanup/refactoring for the sake of py3k diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py --- a/pypy/objspace/

[pypy-commit] pypy py3k: 2to3 the relative import

2014-04-17 Thread pjenvey
Author: Philip Jenvey Branch: py3k Changeset: r70729:527abf1156de Date: 2014-04-17 12:16 -0700 http://bitbucket.org/pypy/pypy/changeset/527abf1156de/ Log:2to3 the relative import diff --git a/pypy/module/__pypy__/app_signal.py b/pypy/module/__pypy__/app_signal.py --- a/pypy/module/__pypy__/

[pypy-commit] pypy numpy-searchsorted: add tests

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpy-searchsorted Changeset: r70728:11986490eee7 Date: 2014-04-18 01:28 +0300 http://bitbucket.org/pypy/pypy/changeset/11986490eee7/ Log:add tests diff --git a/pypy/module/micronumpy/test/test_sorting.py b/pypy/module/micronumpy/test/test_sorting.py --- a/pypy/m

[pypy-commit] pypy numpy-speed: merge default

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70726:0f3c4c2936ca Date: 2014-04-17 17:41 -0400 http://bitbucket.org/pypy/pypy/changeset/0f3c4c2936ca/ Log:merge default diff --git a/pypy/module/micronumpy/ndarray.py b/pypy/module/micronumpy/ndarray.py --- a/pypy/module/micronumpy/ndarr

[pypy-commit] pypy numpy-speed: create iter state object to help jit in loops

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70723:04699e4b9dd0 Date: 2014-04-17 17:40 -0400 http://bitbucket.org/pypy/pypy/changeset/04699e4b9dd0/ Log:create iter state object to help jit in loops diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.p

[pypy-commit] pypy numpy-speed: mark iter state fields immutable

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70727:5edc38cf52ad Date: 2014-04-17 17:44 -0400 http://bitbucket.org/pypy/pypy/changeset/5edc38cf52ad/ Log:mark iter state fields immutable diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/

[pypy-commit] pypy numpy-speed: update test_zjit

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70725:1a421d4ff1cd Date: 2014-04-17 17:32 -0400 http://bitbucket.org/pypy/pypy/changeset/1a421d4ff1cd/ Log:update test_zjit diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/pypy/module

[pypy-commit] pypy numpy-speed: change usages of iters to use state

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70724:71b86d3efc92 Date: 2014-04-17 16:31 -0400 http://bitbucket.org/pypy/pypy/changeset/71b86d3efc92/ Log:change usages of iters to use state diff --git a/pypy/module/micronumpy/concrete.py b/pypy/module/micronumpy/concrete.py --- a/pypy

[pypy-commit] pypy numpy-speed: merge default

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70722:644c8a2d7eee Date: 2014-04-17 15:17 -0400 http://bitbucket.org/pypy/pypy/changeset/644c8a2d7eee/ Log:merge default diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micronumpy/i

[pypy-commit] pypy numpy-speed: reset to try new approach

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70721:ae7367976397 Date: 2014-04-17 15:16 -0400 http://bitbucket.org/pypy/pypy/changeset/ae7367976397/ Log:reset to try new approach diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/

[pypy-commit] pypy default: make sure argmax/argmin don't swallow exceptions

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70719:ac337a3c7780 Date: 2014-04-17 16:38 -0400 http://bitbucket.org/pypy/pypy/changeset/ac337a3c7780/ Log:make sure argmax/argmin don't swallow exceptions diff --git a/pypy/module/micronumpy/ndarray.py b/pypy/module/micronumpy/ndarray.py --- a/pypy

[pypy-commit] pypy default: avoid new array in iter reset

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70718:5276d89f1cca Date: 2014-04-17 15:08 -0400 http://bitbucket.org/pypy/pypy/changeset/5276d89f1cca/ Log:avoid new array in iter reset diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micronu

[pypy-commit] pypy default: merge heads

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70720:9d5e3ed6389f Date: 2014-04-17 18:07 -0400 http://bitbucket.org/pypy/pypy/changeset/9d5e3ed6389f/ Log:merge heads 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.

[pypy-commit] pypy numpypy-nditer: close merged branch

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70717:6247a9f002ec Date: 2014-04-18 00:52 +0300 http://bitbucket.org/pypy/pypy/changeset/6247a9f002ec/ Log:close merged branch ___ pypy-commit mailing list pypy-commit@python.org https://mail.p

[pypy-commit] pypy numpypy-nditer: document branch before merge

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70715:bcb1b1c4e9d4 Date: 2014-04-18 00:49 +0300 http://bitbucket.org/pypy/pypy/changeset/bcb1b1c4e9d4/ Log:document branch before merge diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst

[pypy-commit] pypy numpypy-nditer: merge default into branch

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70714:7db30f61132b Date: 2014-04-18 00:47 +0300 http://bitbucket.org/pypy/pypy/changeset/7db30f61132b/ Log:merge default into branch diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/

[pypy-commit] pypy default: merge numpypy-nditer which implements most of the core of nditer

2014-04-17 Thread mattip
Author: Matti Picus Branch: Changeset: r70716:8faf1baf09f3 Date: 2014-04-18 00:50 +0300 http://bitbucket.org/pypy/pypy/changeset/8faf1baf09f3/ Log:merge numpypy-nditer which implements most of the core of nditer diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy

[pypy-commit] pypy numpypy-nditer: test, implement itersize

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70713:66513118faad Date: 2014-04-18 00:13 +0300 http://bitbucket.org/pypy/pypy/changeset/66513118faad/ Log:test, implement itersize diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py --- a/pypy/module/micron

[pypy-commit] pypy default: fix includes

2014-04-17 Thread mattip
Author: Matti Picus Branch: Changeset: r70712:5097ad65585c Date: 2014-04-17 23:43 +0200 http://bitbucket.org/pypy/pypy/changeset/5097ad65585c/ Log:fix includes diff --git a/rpython/translator/c/src/instrument.c b/rpython/translator/c/src/instrument.c --- a/rpython/translator/c/src/instrume

[pypy-commit] pypy numpypy-nditer: fix merge, redo changes to shape_agreement_multiple

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70710:502dcbfd997e Date: 2014-04-17 20:02 +0300 http://bitbucket.org/pypy/pypy/changeset/502dcbfd997e/ Log:fix merge, redo changes to shape_agreement_multiple diff --git a/pypy/module/micronumpy/strides.py b/pypy/module/micronumpy/strid

[pypy-commit] pypy numpypy-nditer: pep8

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70711:2ff1d988d4a2 Date: 2014-04-17 20:03 +0300 http://bitbucket.org/pypy/pypy/changeset/2ff1d988d4a2/ Log:pep8 diff --git a/pypy/module/micronumpy/strides.py b/pypy/module/micronumpy/strides.py --- a/pypy/module/micronumpy/strides.py +

[pypy-commit] pypy numpy-speed: virtualize the array iter in call2

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70708:958f25449c81 Date: 2014-04-17 02:48 -0400 http://bitbucket.org/pypy/pypy/changeset/958f25449c81/ Log:virtualize the array iter in call2 diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pyp

[pypy-commit] pypy numpy-speed: virtualize the array iter in dot

2014-04-17 Thread bdkearns
Author: Brian Kearns Branch: numpy-speed Changeset: r70709:cc857b7e9422 Date: 2014-04-17 03:30 -0400 http://bitbucket.org/pypy/pypy/changeset/cc857b7e9422/ Log:virtualize the array iter in dot diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py --- a/pypy/module/micr

[pypy-commit] pypy numpypy-nditer: fix merge, re-export name into module namespace

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70707:963c427d19ab Date: 2014-04-17 19:27 +0300 http://bitbucket.org/pypy/pypy/changeset/963c427d19ab/ Log:fix merge, re-export name into module namespace diff --git a/pypy/module/micronumpy/__init__.py b/pypy/module/micronumpy/__init__

[pypy-commit] pypy stmgc-c7: delay stm_read until it needs to be done in stmrewrite. limited because we

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70705:10a78b65a5a9 Date: 2014-04-17 17:28 +0200 http://bitbucket.org/pypy/pypy/changeset/10a78b65a5a9/ Log:delay stm_read until it needs to be done in stmrewrite. limited because we have to do it before every guard diff --git a/rpython/

[pypy-commit] pypy stmgc-c7: fix unused breakfinder

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70702:06328c7fb4d5 Date: 2014-04-17 17:24 +0200 http://bitbucket.org/pypy/pypy/changeset/06328c7fb4d5/ Log:fix unused breakfinder diff --git a/rpython/translator/stm/breakfinder.py b/rpython/translator/stm/breakfinder.py --- a/rpython/translat

[pypy-commit] pypy stmgc-c7: more optimal read-barrier placement for non-jit. doesn't improve performance

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70703:5e60afcef785 Date: 2014-04-17 17:25 +0200 http://bitbucket.org/pypy/pypy/changeset/5e60afcef785/ Log:more optimal read-barrier placement for non-jit. doesn't improve performance measurably diff --git a/rpython/translator/stm/readb

[pypy-commit] pypy stmgc-c7: Backed out changeset: 10a78b65a5a9 (no measurable performance improvements)

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70706:11a2f6c88ca6 Date: 2014-04-17 17:28 +0200 http://bitbucket.org/pypy/pypy/changeset/11a2f6c88ca6/ Log:Backed out changeset: 10a78b65a5a9 (no measurable performance improvements) diff --git a/rpython/jit/backend/llsupport/rewrite.py

[pypy-commit] pypy stmgc-c7: Backed out changeset: 5e60afcef785 (doesn't improve performance)

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70704:899027a93ced Date: 2014-04-17 17:26 +0200 http://bitbucket.org/pypy/pypy/changeset/899027a93ced/ Log:Backed out changeset: 5e60afcef785 (doesn't improve performance) diff --git a/rpython/translator/stm/readbarrier.py b/rpython/translator

[pypy-commit] pypy default: A no-test change that looks like a good idea, to revert what

2014-04-17 Thread arigo
Author: Armin Rigo Branch: Changeset: r70701:b6cae81858b5 Date: 2014-04-17 17:03 +0200 http://bitbucket.org/pypy/pypy/changeset/b6cae81858b5/ Log:A no-test change that looks like a good idea, to revert what looks like a mistake in a7023a962605 diff --git a/pypy/interpreter/baseobjsp

[pypy-commit] lang-smalltalk storage-stm-c4: added branch to work on stm again

2014-04-17 Thread Conrad Calmez
Author: Conrad Calmez Branch: storage-stm-c4 Changeset: r793:cef87bf823a0 Date: 2014-04-17 15:51 +0200 http://bitbucket.org/pypy/lang-smalltalk/changeset/cef87bf823a0/ Log:added branch to work on stm again ___ pypy-commit mailing list pypy-commit@p

[pypy-commit] pypy numpypy-nditer: add comments for long confusing code

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70697:2f4b0bd4e54b Date: 2014-04-17 10:29 +0300 http://bitbucket.org/pypy/pypy/changeset/2f4b0bd4e54b/ Log:add comments for long confusing code diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py --- a/pypy/m

[pypy-commit] pypy numpypy-nditer: minimize difference in merge

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70699:0e29fcfa8d8c Date: 2014-04-17 11:18 +0300 http://bitbucket.org/pypy/pypy/changeset/0e29fcfa8d8c/ Log:minimize difference in merge diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/mo

[pypy-commit] pypy numpypy-nditer: revert merge cruft

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70700:71c0ca886656 Date: 2014-04-17 14:04 +0300 http://bitbucket.org/pypy/pypy/changeset/71c0ca886656/ Log:revert merge cruft diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micro

[pypy-commit] pypy numpypy-nditer: test, fix op_dtypes and scalar operands

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70696:2b882cea5282 Date: 2014-04-17 10:20 +0300 http://bitbucket.org/pypy/pypy/changeset/2b882cea5282/ Log:test, fix op_dtypes and scalar operands diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --

[pypy-commit] pypy numpypy-nditer: handle scalars with existing ArrayIter

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70695:ec34892bca6f Date: 2014-04-17 09:32 +0300 http://bitbucket.org/pypy/pypy/changeset/ec34892bca6f/ Log:handle scalars with existing ArrayIter diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py ---

[pypy-commit] pypy numpypy-nditer: wip

2014-04-17 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70694:7a493d5e93f3 Date: 2014-04-17 02:25 +0300 http://bitbucket.org/pypy/pypy/changeset/7a493d5e93f3/ Log:wip diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micronumpy/iterators

[pypy-commit] pypy default: make sure winsock2.h precedes windows.h, since windows.h imports old winsock.h

2014-04-17 Thread mattip
Author: Matti Picus Branch: Changeset: r70693:81238d6d4adf Date: 2014-04-17 15:01 +0200 http://bitbucket.org/pypy/pypy/changeset/81238d6d4adf/ Log:make sure winsock2.h precedes windows.h, since windows.h imports old winsock.h diff --git a/rpython/translator/c/src/thread_nt.h b/rpyt

[pypy-commit] pypy stmgc-c7: fix

2014-04-17 Thread arigo
Author: Armin Rigo Branch: stmgc-c7 Changeset: r70692:50398d1a134d Date: 2014-04-17 13:15 +0200 http://bitbucket.org/pypy/pypy/changeset/50398d1a134d/ Log:fix diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py --- a/rpython/jit/backend/x86/assembler.py

[pypy-commit] pypy stmgc-c7: try emitting less transaction breaks by adding some logic from

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70687:bd3323514386 Date: 2014-04-17 11:14 +0200 http://bitbucket.org/pypy/pypy/changeset/bd3323514386/ Log:try emitting less transaction breaks by adding some logic from optimizeopt/stm.py to heapcache. diff --git a/rpython/jit/metainte

[pypy-commit] pypy stmgc-c7: test one more case

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70688:76eada48fdd8 Date: 2014-04-17 11:18 +0200 http://bitbucket.org/pypy/pypy/changeset/76eada48fdd8/ Log:test one more case diff --git a/rpython/jit/metainterp/test/test_stm.py b/rpython/jit/metainterp/test/test_stm.py --- a/rpython/jit/meta

[pypy-commit] pypy stmgc-c7: Merge

2014-04-17 Thread Raemi
Author: Remi Meier Branch: stmgc-c7 Changeset: r70689:68bd542ca517 Date: 2014-04-17 11:29 +0200 http://bitbucket.org/pypy/pypy/changeset/68bd542ca517/ Log:Merge diff --git a/pypy/interpreter/executioncontext.py b/pypy/interpreter/executioncontext.py --- a/pypy/interpreter/executioncontext.p

[pypy-commit] pypy default: A skipped test

2014-04-17 Thread arigo
Author: Armin Rigo Branch: Changeset: r70686:1f54c89f98a0 Date: 2014-04-17 10:51 +0200 http://bitbucket.org/pypy/pypy/changeset/1f54c89f98a0/ Log:A skipped test diff --git a/rpython/jit/codewriter/effectinfo.py b/rpython/jit/codewriter/effectinfo.py --- a/rpython/jit/codewriter/effectinfo.

[pypy-commit] pypy default: Fix?

2014-04-17 Thread arigo
Author: Armin Rigo Branch: Changeset: r70685:67f0c5eb1bd1 Date: 2014-04-17 10:33 +0200 http://bitbucket.org/pypy/pypy/changeset/67f0c5eb1bd1/ Log:Fix? diff --git a/rpython/jit/backend/arm/opassembler.py b/rpython/jit/backend/arm/opassembler.py --- a/rpython/jit/backend/arm/opassembler.py +

[pypy-commit] pypy stmgc-c7: kill more

2014-04-17 Thread arigo
Author: Armin Rigo Branch: stmgc-c7 Changeset: r70684:7780bb8b2a13 Date: 2014-04-16 17:43 +0200 http://bitbucket.org/pypy/pypy/changeset/7780bb8b2a13/ Log:kill more diff --git a/rpython/memory/gctransform/stmframework.py b/rpython/memory/gctransform/stmframework.py --- a/rpython/memory/gctr