Skip to content

Commit f93ddb1

Browse files
Revert "[PROTON] Improve hook manager tests and fix a session_id=0 problem (#7745)"
This reverts commit af2f922.
1 parent 99e98b0 commit f93ddb1

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

third_party/proton/proton/hooks/hook.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ def register(hook: Hook, session: int) -> None:
102102

103103
@staticmethod
104104
def unregister(session: Optional[int] = None) -> None:
105-
if session is not None and session not in HookManager.session_hooks:
105+
if session and session not in HookManager.session_hooks:
106106
return
107107

108-
if session is None:
108+
if not session:
109109
for hook in HookManager.active_hooks:
110110
hook.deactivate()
111111
HookManager.active_hooks.clear()

third_party/proton/test/test_api.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import json
22
import triton.profiler as proton
33
import pathlib
4-
<<<<<<< HEAD
5-
=======
6-
from triton.profiler.hooks.hook import HookManager
7-
from triton.profiler.hooks.launch import LaunchHook
8-
from triton.profiler.hooks.instrumentation import InstrumentationHook
9-
>>>>>>> 450dabd3ba374103167c3bbb68e590b21b3c2c90
104

115

126
def test_profile_single_session(tmp_path: pathlib.Path):
@@ -110,34 +104,6 @@ def test_hook(tmp_path: pathlib.Path):
110104
assert temp_file.exists()
111105

112106

113-
def test_hook_manager(tmp_path: pathlib.Path):
114-
# Launch hook is a singleton
115-
HookManager.register(LaunchHook(), 0)
116-
HookManager.register(LaunchHook(), 0)
117-
assert len(HookManager.active_hooks) == 1
118-
assert isinstance(HookManager.active_hooks[0], LaunchHook)
119-
assert HookManager.session_hooks[0][HookManager.active_hooks[0]] is True
120-
121-
# Only unregister one session
122-
HookManager.register(LaunchHook(), 1)
123-
HookManager.unregister(0)
124-
assert len(HookManager.active_hooks) == 1
125-
HookManager.unregister(1)
126-
assert len(HookManager.active_hooks) == 0
127-
128-
# Heterogenous hooks
129-
HookManager.register(InstrumentationHook(""), 2)
130-
HookManager.register(LaunchHook(), 2)
131-
assert len(HookManager.active_hooks) == 2
132-
# Launch hook has a higher priority
133-
assert isinstance(HookManager.active_hooks[0], LaunchHook)
134-
assert isinstance(HookManager.active_hooks[1], InstrumentationHook)
135-
assert HookManager.session_hooks[2][HookManager.active_hooks[0]] is True
136-
assert HookManager.session_hooks[2][HookManager.active_hooks[1]] is True
137-
HookManager.unregister()
138-
assert len(HookManager.active_hooks) == 0
139-
140-
141107
def test_scope_metrics(tmp_path: pathlib.Path):
142108
temp_file = tmp_path / "test_scope_metrics.hatchet"
143109
session_id = proton.start(str(temp_file.with_suffix("")))

0 commit comments

Comments
 (0)