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) #90045

Merged
merged 1 commit into from Dec 6, 2022
+13 −5
Merged

Make TorchElastic timer importable on Windows (#88522) #90045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions test/test_testing.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

from torch.testing import make_tensor
from torch.testing._internal.common_utils import \
(IS_FBCODE, IS_SANDCASTLE, IS_WINDOWS, TestCase, run_tests, skipIfRocm, slowTest,
(IS_FBCODE, IS_MACOS, IS_SANDCASTLE, IS_WINDOWS, TestCase, run_tests, skipIfRocm, slowTest,
parametrize, subtest, instantiate_parametrized_tests, dtype_name, TEST_WITH_ROCM)
from torch.testing._internal.common_device_type import \
(PYTORCH_TESTING_DEVICE_EXCEPT_FOR_KEY, PYTORCH_TESTING_DEVICE_ONLY_FOR_KEY, dtypes,
Expand Down Expand Up @@ -1782,9 +1782,15 @@ def test_circular_dependencies(self) -> None:
# See https://github.com/pytorch/pytorch/issues/77801
if not sys.version_info >= (3, 9):
ignored_modules.append("torch.utils.benchmark")
if IS_WINDOWS:
# Distributed does not work on Windows
ignored_modules.append("torch.distributed.")
if IS_WINDOWS or IS_MACOS:
# 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")

torch_dir = os.path.dirname(torch.__file__)
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: singal, 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