Repository navigation
Conversation
getMeterTerminal and makeSequence keep the 1024 and 4096 most recently used objects with lru_cache, and TimeSignature.load keeps the defaults for the 512 most recently used meters. The music21/meter tests make about 440 terminals, 2950 sequences, and 94 meters; 161 corpus scores make 116, 376, and 27. FrozenObject.__hash__ hashed every slot, recursively, on each call. A subclass with a _frozenHash slot (MeterTerminal, MeterSequence, FrozenDuration) now keeps its hash there. _getSlotsRecursive leaves _frozenHash out, so equality, pickling, and the hash ignore it.
|
Coverage is 93.301% — float3:help/meter-1972-cache-bounds into cuthbertLab:meter-speed-2026. No base build found for |
mscuthbert
left a comment
mscuthbert
left a comment
There was a problem hiding this comment.
Great! Requesting making _frozenHash part of all FrozenObjects + also why lru_cache placement/helpers? otherwise fine THANKS!
| @lru_cache(1024) | ||
| def _cachedMeterTerminal(numerator: int, denominator: int, weight: float) -> MeterTerminal: | ||
| return MeterTerminal(numerator=numerator, denominator=denominator, weight=weight) |
There was a problem hiding this comment.
Why can't the lru_cache go directly on getMeterTerminal?
| ''' | ||
| __slots__: tuple[str, ...] = () | ||
|
|
||
| _frozenHash: int |
There was a problem hiding this comment.
I like the _frozenHash idea. So much so, that I think it should be part of FrozenObject -- so every frozen object has a _frozenHash -- the __hash__ doesn't have to worry about AttributeErrors. But it does mean we need _frozenHash to be int|None
| @lru_cache(4096) | ||
| def _cachedSequence( |
There was a problem hiding this comment.
again -- why not on makeSequence itself?
For #1972.
getMeterTerminalandmakeSequenceuselru_cachewith 1024 and 4096 entries, and the TimeSignature default cache keeps the 512 most recently used meters. The music21/meter tests make about 440 terminals, 2950 sequences, and 94 meters; 161 corpus scores make 116, 376, and 27._frozenHashslot, which_getSlotsRecursiveleaves out, so equality and pickling ignore it.hash(TimeSignature('4/4').beatSequence)goes from 25 µs to 0.14 µs.AI-assisted (Claude)