Re: Merging from the trunk to thyrsus.

2008-04-09 Thread Edward K. Ream
On Apr 9, 5:26 pm, thyrsus <[EMAIL PROTECTED]> wrote: > Explicitly doing "self.d = {}" right before raising StopIteration had > no significant effect for me. I saw that done somewhere else in the > code to provoke more rapid memory reclamation, but it doesn't seem to > make a difference in this

Re: Merging from the trunk to thyrsus.

2008-04-09 Thread thyrsus
On Apr 9, 5:45 pm, thyrsus <[EMAIL PROTECTED]> wrote: > How much memory do you have? I rely on the python internals to > rapidly reclaim the dictionaries I create, but perhaps there should be > a line of code explicitly discarding the dictionary just before > raising the iteration ended excepti

Re: Merging from the trunk to thyrsus.

2008-04-09 Thread Edward K. Ream
On Wed, Apr 9, 2008 at 4:45 PM, thyrsus <[EMAIL PROTECTED]> wrote: > > The regex stuff is only in the non-SAX code if I remember correctly; > feel free to discard it along with the rest of the non-SAX code. It > gave me perhaps an 8 second speedup on my 12+ pair .leo > file over the old non-

Re: Merging from the trunk to thyrsus.

2008-04-09 Thread thyrsus
The regex stuff is only in the non-SAX code if I remember correctly; feel free to discard it along with the rest of the non-SAX code. It gave me perhaps an 8 second speedup on my 12+ pair .leo file over the old non-SAX code, and was just a couple seconds faster than SAX code. How much memor

Re: Merging from the trunk to thyrsus.

2008-04-09 Thread Edward K. Ream
On Apr 9, 4:24 pm, "Edward K. Ream" <[EMAIL PROTECTED]> wrote: > Hmm. I wonder whether setting use_sax = True is skewing the results...I'll > have to check. No. It appears to have no effect. On my machine, unit tests run in 130 sec in the trunk, and 136 sec in ekr-devel (merged with thyrsus).

Re: Merging from the trunk to thyrsus.

2008-04-09 Thread Edward K. Ream
On Wed, Apr 9, 2008 at 1:00 PM, thyrsus <[EMAIL PROTECTED]> wrote: > > I merged the trunk into my branch, and it appeared there shouldn't be > any interaction, so I foolishly pushed without doing the unit tests. > I just got 9 failed unit tests. I don't understand them, so it is > conceivable tha

Merging from the trunk to thyrsus.

2008-04-09 Thread thyrsus
I merged the trunk into my branch, and it appeared there shouldn't be any interaction, so I foolishly pushed without doing the unit tests. I just got 9 failed unit tests. I don't understand them, so it is conceivable that my code is causing them, but it seems unlikely. Should I be regularly merg