Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions tests/rl/test_trace_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,52 @@
from xtuner.v1.rl.rollout import trace_store as trace_store_module
from xtuner.v1.rl.rollout.trace_store import (
RolloutTraceStore,
Trie,
_free_ray_refs,
get_existing_store,
release_and_discard_rollout_groups,
release_existing_sessions,
)


class TestDeepTrie(unittest.TestCase):
def test_long_conversation_keys_and_release(self) -> None:
trie = Trie()
count = 1600
for index in range(1, count + 1):
trie.insert("x" * index, index)
self.assertEqual(trie.keys(), ["x" * index for index in range(1, count + 1)])
with patch.object(trace_store_module, "_free_ray_refs") as free:
trie.release()
self.assertEqual(free.call_count, count)
self.assertEqual([call.args[0] for call in free.call_args_list], list(range(count, 0, -1)))
self.assertEqual(trie.keys(), [])
self.assertEqual(trie.root.children, {})
trie.release()

def test_partial_release_preserves_branch_values_and_key_order(self) -> None:
trie = Trie()
self.assertEqual(trie.keys(), [])
trie.release()
for key in ("z", "", "a", "ab", "abc", "ax"):
trie.insert(key, key)
self.assertEqual(trie.keys(), ["", "z", "a", "ab", "abc", "ax"])
with patch.object(trace_store_module, "_free_ray_refs") as free:
trie.release("ab")
free.assert_called_once_with("ab")
self.assertEqual(trie.keys(), ["", "z", "a", "abc", "ax"])
with patch.object(trace_store_module, "_free_ray_refs"):
trie.release("abc")
self.assertEqual(trie.keys(), ["", "z", "a", "ax"])
self.assertNotIn("b", trie.root.children["a"].children)
with patch.object(trace_store_module, "_free_ray_refs") as free:
trie.release()
self.assertEqual([call.args[0] for call in free.call_args_list], ["z", "ax", "a", ""])
self.assertEqual(trie.keys(), [])
trie.insert("new", "new")
self.assertEqual(trie.keys(), ["new"])


class TestRolloutTraceCleanup(unittest.TestCase):
def test_release_and_discard_detaches_only_trace_owned_refs(self):
trace_owned_ref = object()
Expand Down
31 changes: 16 additions & 15 deletions xtuner/v1/rl/rollout/trace_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,12 @@ def keys(self) -> List[str]:
"""Get all keys (i.e., strings) stored in the Trie."""
result = []

def _collect(node: TreeNode, path: List[str]):
stack: List[Tuple[TreeNode, str]] = [(self.root, "")]
while stack:
node, path = stack.pop()
if node.value is not None:
result.append("".join(path))
for token, child in node.children.items():
_collect(child, path + [token])

_collect(self.root, [])
result.append(path)
stack.extend((child, path + token) for token, child in reversed(list(node.children.items())))
return result

def insert(self, key: str, value: Any) -> None:
Expand Down Expand Up @@ -220,16 +219,18 @@ def release(self, key: str | None = None):
If None, releases the entire tree.
"""

def _free_subtree(node: TreeNode):
for child in node.children.values():
_free_subtree(child)
if node.value is not None:
_free_ray_refs(node.value)
node.value = None
node.children.clear()

if key is None:
_free_subtree(self.root)
stack = [(self.root, False)]
while stack:
node, visited = stack.pop()
if visited:
if node.value is not None:
_free_ray_refs(node.value)
node.value = None
node.children.clear()
else:
stack.append((node, True))
stack.extend((child, False) for child in reversed(list(node.children.values())))
return

node = self.root
Expand Down
Loading