Skip to content

Commit 7bcebcc

Browse files
committed
Revert "torchx/runner: log events to torch.monitor (#379)"
This reverts commit 4b989d5.
1 parent a551741 commit 7bcebcc

File tree

4 files changed

+2
-81
lines changed

4 files changed

+2
-81
lines changed

.pyre_configuration

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
],
99
"site_package_search_strategy": "all",
1010
"source_directories": [
11-
"typestubs",
1211
"."
1312
],
1413
"strict": true,

torchx/runner/events/__init__.py

-9
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ def _get_or_create_logger(destination: str = "null") -> logging.Logger:
5959
def record(event: TorchxEvent, destination: str = "null") -> None:
6060
_get_or_create_logger(destination).info(event.serialize())
6161

62-
if destination != "console":
63-
# if using torch>1.11 log the event to torch.monitor
64-
try:
65-
from torch import monitor
66-
67-
monitor.log_event(event.to_monitor_event())
68-
except ImportError:
69-
pass
70-
7162

7263
class log_event:
7364
"""

torchx/runner/events/api.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77

88
import json
99
from dataclasses import asdict, dataclass
10-
from datetime import datetime
1110
from enum import Enum
12-
from typing import Optional, TYPE_CHECKING, Union
13-
14-
if TYPE_CHECKING:
15-
from torch import monitor
11+
from typing import Optional, Union
1612

1713

1814
class SourceType(str, Enum):
@@ -64,12 +60,3 @@ def deserialize(data: Union[str, "TorchxEvent"]) -> "TorchxEvent":
6460

6561
def serialize(self) -> str:
6662
return json.dumps(asdict(self))
67-
68-
def to_monitor_event(self) -> "monitor.Event":
69-
from torch import monitor
70-
71-
return monitor.Event(
72-
name="torch.runner.Event",
73-
timestamp=datetime.now(),
74-
data={k: v for k, v in self.__dict__.items() if v is not None},
75-
)

torchx/runner/events/test/lib_test.py

+1-57
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,13 @@
88
import json
99
import logging
1010
import unittest
11-
from typing import List
12-
from unittest.mock import MagicMock, patch
11+
from unittest.mock import patch, MagicMock
1312

1413
from torchx.runner.events import (
1514
_get_or_create_logger,
1615
log_event,
17-
record,
18-
SourceType,
19-
TorchxEvent,
2016
)
2117

22-
try:
23-
from torch import monitor
24-
25-
SKIP_MONITOR: bool = False
26-
except ImportError:
27-
SKIP_MONITOR: bool = True
28-
2918

3019
class TorchxEventLibTest(unittest.TestCase):
3120
def assert_event(
@@ -66,51 +55,6 @@ def test_event_deser(self) -> None:
6655
deser_event = TorchxEvent.deserialize(json_event)
6756
self.assert_event(event, deser_event)
6857

69-
@unittest.skipIf(SKIP_MONITOR, "no torch.monitor available")
70-
def test_monitor(self) -> None:
71-
event = TorchxEvent(
72-
session="test_session",
73-
scheduler="test_scheduler",
74-
api="test_api",
75-
source=SourceType.EXTERNAL,
76-
)
77-
monitor_event = event.to_monitor_event()
78-
self.assertEqual(
79-
monitor_event.data,
80-
{
81-
"session": "test_session",
82-
"scheduler": "test_scheduler",
83-
"api": "test_api",
84-
"source": "EXTERNAL",
85-
},
86-
)
87-
self.assertEqual(monitor_event.name, "torch.runner.Event")
88-
89-
@unittest.skipIf(SKIP_MONITOR, "no torch.monitor available")
90-
@patch("torchx.runner.events._get_or_create_logger")
91-
def test_monitor_record(self, get_logging_handler: MagicMock) -> None:
92-
event = TorchxEvent(
93-
session="test_session",
94-
scheduler="test_scheduler",
95-
api="test_api",
96-
source=SourceType.EXTERNAL,
97-
)
98-
events: List[monitor.Event] = []
99-
100-
def handler(e: monitor.Event) -> None:
101-
events.append(e)
102-
103-
handle = monitor.register_event_handler(handler)
104-
105-
try:
106-
record(event)
107-
finally:
108-
monitor.unregister_event_handler(handle)
109-
110-
self.assertEqual(get_logging_handler.call_count, 1)
111-
self.assertEqual(len(events), 1)
112-
self.assertEqual(events[0].data["session"], "test_session")
113-
11458

11559
@patch("torchx.runner.events.record")
11660
class LogEventTest(unittest.TestCase):

0 commit comments

Comments
 (0)