Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make TorchElastic timer importable on Windows #88522

Closed
wants to merge 4 commits into from
Closed

Make TorchElastic timer importable on Windows #88522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f9d657
Make TorchElastic timer importable on Windows
malfet Nov 4, 2022
677a2d3
Update test_testing.py
malfet Nov 5, 2022
a7146d5
One more exclusion
malfet Nov 10, 2022
87a3b70
Two more exclusions
malfet Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions test/test_testing.py
View file
Open in desktop
Expand Up @@ -1794,8 +1794,14 @@ def test_circular_dependencies(self) -> None:
if not sys.version_info >= (3, 9):
ignored_modules.append("torch.utils.benchmark")
if IS_WINDOWS or IS_MACOS:
# Distributed does not work on Windows or by default on Mac
ignored_modules.append("torch.distributed.")
# Distributed should be importable on Windows(except nn.api.), but not on Mac
if IS_MACOS:
ignored_modules.append("torch.distributed.")
else:
ignored_modules.append("torch.distributed.nn.api.")
ignored_modules.append("torch.distributed.optim.")
ignored_modules.append("torch.distributed.pipeline.")
ignored_modules.append("torch.distributed.rpc.")
ignored_modules.append("torch.testing._internal.dist_utils")
# And these both end up with transitive dependencies on distributed
ignored_modules.append("torch.nn.parallel._replicated_tensor_ddp_interop")
Expand Down
4 changes: 3 additions & 1 deletion torch/distributed/elastic/timer/file_based_local_timer.py
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
import os
import select
import signal
import sys
import threading
import time
from typing import Callable, Dict, List, Optional, Set, Tuple
Expand Down Expand Up @@ -78,7 +79,8 @@ class FileTimerClient(TimerClient):
signal: signal, the signal to use to kill the process. Using a
negative or zero signal will not kill the process.
"""
def __init__(self, file_path: str, signal=signal.SIGKILL) -> None:
def __init__(self, file_path: str, signal=(signal.SIGKILL if sys.platform != "win32" else
signal.CTRL_C_EVENT)) -> None: # type: ignore[attr-defined]
super().__init__()
self._file_path = file_path
self.signal = signal
Expand Down