Skip to content

Commit 7916bef

Browse files
samluryesamlurye
committed
Github CI run 360s timeout
Differential Revision: [D83881762](https://our.internmc.facebook.com/intern/diff/D83881762/) **NOTE FOR REVIEWERS**: This PR has internal Meta-specific changes or comments, please review them on [Phabricator](https://our.internmc.facebook.com/intern/diff/D83881762/)! ghstack-source-id: 314015132 Pull Request resolved: #1424
1 parent e5ca0a9 commit 7916bef

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎python/tests/test_proc_mesh.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ async def call_on_other_mesh(self, actor: "TestActor") -> ValueMesh[int]:
6060
return await actor.get_rank_plus_init_value.call()
6161

6262

63-
@pytest.mark.timeout(60)
63+
@pytest.mark.timeout(360)
6464
async def test_proc_mesh_initialization() -> None:
6565
host = create_local_host_mesh("test_host")
6666
proc_mesh = host.spawn_procs(name="test_proc")
6767
# Test that initialization completes successfully
6868
assert await proc_mesh.initialized
6969

7070

71-
@pytest.mark.timeout(60)
71+
@pytest.mark.timeout(360)
7272
def test_proc_mesh_spawn_single_actor() -> None:
7373
host = create_local_host_mesh("test_host")
7474
proc_mesh = host.spawn_procs(name="test_proc")
@@ -78,7 +78,7 @@ def test_proc_mesh_spawn_single_actor() -> None:
7878
assert actor.get_value.call_one().get() == 43
7979

8080

81-
@pytest.mark.timeout(60)
81+
@pytest.mark.timeout(360)
8282
def test_proc_mesh_multi_actor() -> None:
8383
host = create_local_host_mesh("multi_host", Extent(["replicas", "hosts"], [2, 2]))
8484
proc_mesh = host.spawn_procs(name="test_proc", per_host={"gpus": 3})
@@ -92,7 +92,7 @@ def test_proc_mesh_multi_actor() -> None:
9292
assert point.rank == i
9393

9494

95-
@pytest.mark.timeout(60)
95+
@pytest.mark.timeout(360)
9696
def test_proc_mesh_sliced() -> None:
9797
host = create_local_host_mesh("multi_host", Extent(["replicas", "hosts"], [2, 2]))
9898
proc_mesh = host.spawn_procs(name="test_proc", per_host={"gpus": 3})

‎python/tests/test_python_actors.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def get_this_proc(v1: bool):
140140

141141

142142
@pytest.mark.parametrize("v1", [True, False])
143-
@pytest.mark.timeout(60)
143+
@pytest.mark.timeout(360)
144144
async def test_choose(v1: bool):
145145
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
146146
v = proc.spawn("counter", Counter, 3)
@@ -160,7 +160,7 @@ async def test_choose(v1: bool):
160160

161161

162162
@pytest.mark.parametrize("v1", [True, False])
163-
@pytest.mark.timeout(60)
163+
@pytest.mark.timeout(360)
164164
async def test_stream(v1: bool):
165165
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
166166
v = proc.spawn("counter2", Counter, 3)
@@ -182,7 +182,7 @@ async def fetch(self, to: To):
182182

183183

184184
@pytest.mark.parametrize("v1", [True, False])
185-
@pytest.mark.timeout(60)
185+
@pytest.mark.timeout(360)
186186
async def test_mesh_passed_to_mesh(v1: bool):
187187
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
188188
f = proc.spawn("from", From)
@@ -193,7 +193,7 @@ async def test_mesh_passed_to_mesh(v1: bool):
193193

194194

195195
@pytest.mark.parametrize("v1", [True, False])
196-
@pytest.mark.timeout(60)
196+
@pytest.mark.timeout(360)
197197
async def test_mesh_passed_to_mesh_on_different_proc_mesh(v1: bool):
198198
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
199199
proc2 = spawn_procs_on_fake_host(v1, {"gpus": 2})
@@ -205,7 +205,7 @@ async def test_mesh_passed_to_mesh_on_different_proc_mesh(v1: bool):
205205

206206

207207
@pytest.mark.parametrize("v1", [True, False])
208-
@pytest.mark.timeout(60)
208+
@pytest.mark.timeout(360)
209209
def test_actor_slicing(v1: bool):
210210
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
211211
proc2 = spawn_procs_on_fake_host(v1, {"gpus": 2})
@@ -222,7 +222,7 @@ def test_actor_slicing(v1: bool):
222222

223223

224224
@pytest.mark.parametrize("v1", [True, False])
225-
@pytest.mark.timeout(60)
225+
@pytest.mark.timeout(360)
226226
async def test_aggregate(v1: bool):
227227
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
228228
counter = proc.spawn("counter", Counter, 1)
@@ -243,7 +243,7 @@ async def return_current_rank_str(self):
243243

244244

245245
@pytest.mark.parametrize("v1", [True, False])
246-
@pytest.mark.timeout(60)
246+
@pytest.mark.timeout(360)
247247
async def test_rank_size(v1: bool):
248248
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
249249
r = proc.spawn("runit", RunIt)
@@ -255,7 +255,7 @@ async def test_rank_size(v1: bool):
255255

256256

257257
@pytest.mark.parametrize("v1", [True, False])
258-
@pytest.mark.timeout(60)
258+
@pytest.mark.timeout(360)
259259
async def test_rank_string(v1: bool):
260260
if v1:
261261
per_host = {"gpus": 2}
@@ -277,7 +277,7 @@ def sync_endpoint(self, a_counter: Counter):
277277

278278

279279
@pytest.mark.parametrize("v1", [True, False])
280-
@pytest.mark.timeout(60)
280+
@pytest.mark.timeout(360)
281281
async def test_sync_actor(v1: bool):
282282
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
283283
a = proc.spawn("actor", SyncActor)
@@ -287,7 +287,7 @@ async def test_sync_actor(v1: bool):
287287

288288

289289
@pytest.mark.parametrize("v1", [True, False])
290-
@pytest.mark.timeout(60)
290+
@pytest.mark.timeout(360)
291291
def test_sync_actor_sync_client(v1: bool) -> None:
292292
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
293293
a = proc.spawn("actor", SyncActor)
@@ -297,14 +297,14 @@ def test_sync_actor_sync_client(v1: bool) -> None:
297297

298298

299299
@pytest.mark.parametrize("v1", [True, False])
300-
@pytest.mark.timeout(60)
300+
@pytest.mark.timeout(360)
301301
def test_proc_mesh_size(v1: bool) -> None:
302302
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
303303
assert 2 == proc.size("gpus")
304304

305305

306306
@pytest.mark.parametrize("v1", [True, False])
307-
@pytest.mark.timeout(60)
307+
@pytest.mark.timeout(360)
308308
def test_rank_size_sync(v1: bool) -> None:
309309
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
310310
r = proc.spawn("runit", RunIt)
@@ -315,7 +315,7 @@ def test_rank_size_sync(v1: bool) -> None:
315315

316316

317317
@pytest.mark.parametrize("v1", [True, False])
318-
@pytest.mark.timeout(60)
318+
@pytest.mark.timeout(360)
319319
def test_accumulate_sync(v1: bool) -> None:
320320
proc = spawn_procs_on_fake_host(v1, {"gpus": 2})
321321
counter = proc.spawn("counter", Counter, 1)
@@ -332,7 +332,7 @@ def doit(self, c: Counter):
332332

333333

334334
@pytest.mark.parametrize("v1", [True, False])
335-
@pytest.mark.timeout(60)
335+
@pytest.mark.timeout(360)
336336
def test_value_mesh(v1: bool) -> None:
337337
if v1:
338338
per_host = {"gpus": 2}
@@ -349,7 +349,7 @@ def test_value_mesh(v1: bool) -> None:
349349
assert list(x) == n.slice(gpus=0).doit.call_one(counter).get()
350350

351351

352-
@pytest.mark.timeout(60)
352+
@pytest.mark.timeout(360)
353353
def test_rust_binding_modules_correct() -> None:
354354
"""
355355
This tests that rust bindings will survive pickling correctly.
@@ -378,7 +378,7 @@ def check(module, path):
378378

379379

380380
@pytest.mark.parametrize("v1", [True, False])
381-
@pytest.mark.timeout(60)
381+
@pytest.mark.timeout(360)
382382
def test_proc_mesh_liveness(v1: bool) -> None:
383383
mesh = spawn_procs_on_this_host(v1, {"gpus": 2})
384384
counter = mesh.spawn("counter", Counter, 1)
@@ -414,7 +414,7 @@ async def get_async(self):
414414

415415

416416
@pytest.mark.parametrize("v1", [True, False])
417-
@pytest.mark.timeout(60)
417+
@pytest.mark.timeout(360)
418418
async def test_actor_tls(v1: bool) -> None:
419419
"""Test that thread-local state is respected."""
420420
pm = spawn_procs_on_this_host(v1, {"gpus": 1})
@@ -445,7 +445,7 @@ def get_value(self):
445445

446446

447447
@pytest.mark.parametrize("v1", [True, False])
448-
@pytest.mark.timeout(60)
448+
@pytest.mark.timeout(360)
449449
async def test_actor_tls_full_sync(v1: bool) -> None:
450450
"""Test that thread-local state is respected."""
451451
pm = spawn_procs_on_this_host(v1, {"gpus": 1})
@@ -473,7 +473,7 @@ async def no_more(self) -> None:
473473

474474

475475
@pytest.mark.parametrize("v1", [True, False])
476-
@pytest.mark.timeout(60)
476+
@pytest.mark.timeout(360)
477477
async def test_async_concurrency(v1: bool):
478478
"""Test that async endpoints will be processed concurrently."""
479479
pm = spawn_procs_on_this_host(v1, {})
@@ -611,7 +611,7 @@ def _handle_undeliverable_message(
611611

612612

613613
@pytest.mark.parametrize("v1", [True, False])
614-
@pytest.mark.timeout(60)
614+
@pytest.mark.timeout(360)
615615
async def test_actor_log_streaming(v1: bool) -> None:
616616
# Save original file descriptors
617617
original_stdout_fd = os.dup(1) # stdout
@@ -876,7 +876,7 @@ def _stream_logs(self) -> bool:
876876

877877

878878
@pytest.mark.parametrize("v1", [True, False])
879-
@pytest.mark.timeout(60)
879+
@pytest.mark.timeout(360)
880880
async def test_logging_option_defaults(v1: bool) -> None:
881881
# Save original file descriptors
882882
original_stdout_fd = os.dup(1) # stdout
@@ -1155,7 +1155,7 @@ async def test_flush_logs_fast_exit() -> None:
11551155

11561156

11571157
@pytest.mark.parametrize("v1", [True, False])
1158-
@pytest.mark.timeout(60)
1158+
@pytest.mark.timeout(360)
11591159
async def test_flush_on_disable_aggregation(v1: bool) -> None:
11601160
"""Test that logs are flushed when disabling aggregation.
11611161
@@ -1280,7 +1280,7 @@ async def test_multiple_ongoing_flushes_no_deadlock(v1: bool) -> None:
12801280

12811281

12821282
@pytest.mark.parametrize("v1", [True, False])
1283-
@pytest.mark.timeout(60)
1283+
@pytest.mark.timeout(360)
12841284
async def test_adjust_aggregation_window(v1: bool) -> None:
12851285
"""Test that the flush deadline is updated when the aggregation window is adjusted.
12861286
@@ -1371,7 +1371,7 @@ async def send(self, port: Port[int]):
13711371

13721372

13731373
@pytest.mark.parametrize("v1", [True, False])
1374-
@pytest.mark.timeout(60)
1374+
@pytest.mark.timeout(360)
13751375
def test_port_as_argument(v1: bool) -> None:
13761376
proc_mesh = spawn_procs_on_fake_host(v1, {"gpus": 1})
13771377
s = proc_mesh.spawn("send_alot", SendAlot)
@@ -1483,7 +1483,7 @@ def add(self, port: "Port[int]", b: int) -> None:
14831483

14841484

14851485
@pytest.mark.parametrize("v1", [True, False])
1486-
@pytest.mark.timeout(60)
1486+
@pytest.mark.timeout(360)
14871487
def test_ported_actor(v1: bool):
14881488
proc_mesh = spawn_procs_on_fake_host(v1, {"gpus": 1})
14891489
a = proc_mesh.spawn("port_actor", PortedActor)
@@ -1499,7 +1499,7 @@ async def consume():
14991499
assert r == (7, 2, 3)
15001500

15011501

1502-
@pytest.mark.timeout(60)
1502+
@pytest.mark.timeout(360)
15031503
def test_python_task_tuple() -> None:
15041504
PythonTask.from_coroutine(consume()).block_on()
15051505

@@ -1568,7 +1568,7 @@ def _handle_undeliverable_message(
15681568

15691569

15701570
@pytest.mark.parametrize("v1", [True, False])
1571-
@pytest.mark.timeout(60)
1571+
@pytest.mark.timeout(360)
15721572
async def test_undeliverable_message_with_override(v1: bool) -> None:
15731573
pm = spawn_procs_on_this_host(v1, {"gpus": 1})
15741574
receiver = pm.spawn("undeliverable_receiver", UndeliverableMessageReceiver)
@@ -1584,7 +1584,7 @@ async def test_undeliverable_message_with_override(v1: bool) -> None:
15841584

15851585

15861586
@pytest.mark.parametrize("v1", [True, False])
1587-
@pytest.mark.timeout(60)
1587+
@pytest.mark.timeout(360)
15881588
async def test_undeliverable_message_without_override(v1: bool) -> None:
15891589
pm = spawn_procs_on_this_host(v1, {"gpus": 1})
15901590
sender = pm.spawn("undeliverable_sender", UndeliverableMessageSender)
@@ -1659,7 +1659,7 @@ async def spawning_from_endpoint(self, name, root) -> None:
16591659
await get_or_spawn_controller(name, SpawningActorFromEndpointActor, root=root)
16601660

16611661

1662-
@pytest.mark.timeout(60)
1662+
@pytest.mark.timeout(360)
16631663
def test_get_or_spawn_controller_inside_actor_endpoint():
16641664
actor_1 = get_or_spawn_controller("actor_1", SpawningActorFromEndpointActor).get()
16651665
actor_1.spawning_from_endpoint.call_one("actor_2", root="actor_1").get()

0 commit comments

Comments
 (0)