Skip to content

Commit 112d290

Browse files
authored
Cherry pick resource partitioner CI fix (#4058)
1 parent 7ed42b0 commit 112d290

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

tests/py/dynamo/partitioning/test_000_resource_partitioning.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import psutil
12
import torch
23
import torch.nn as nn
34
from torch.fx.passes.splitter_base import Subgraph
@@ -79,7 +80,8 @@ def forward(self, x):
7980
partitioner = ResourcePartitioner(
8081
submodule,
8182
submodule_name=name,
82-
cpu_memory_budget=2 * 1024 * 1024 * 1024,
83+
cpu_memory_budget=0.89 * 1024 * 1024 * 1024
84+
+ psutil.Process().memory_info().rss, # 0.89GB + current memory usage
8385
)
8486
subgraphs = partitioner.put_nodes_into_subgraphs()
8587
new_subgraphs = []

tests/py/dynamo/partitioning/test_001_resource_partitioning.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing import Any, List
22

3+
import psutil
34
import torch
45
import torch.nn as nn
56
import torch.nn.functional as F
@@ -84,7 +85,9 @@ def forward(self, x):
8485
)
8586

8687
partitioned_module = resource_partition(
87-
partitioned_module, cpu_memory_budget=2 * 1024 * 1024 * 1024 # 2GB,
88+
partitioned_module,
89+
cpu_memory_budget=0.89 * 1024 * 1024 * 1024
90+
+ psutil.Process().memory_info().rss, # 0.89GB + current memory usage,
8891
)
8992

9093
self.assertEqual(
@@ -166,7 +169,9 @@ def forward(self, x):
166169
)
167170

168171
partitioned_module = resource_partition(
169-
partitioned_module, cpu_memory_budget=1.4 * 1024 * 1024 * 1024 # 1.4GB,
172+
partitioned_module,
173+
cpu_memory_budget=0.39 * 1024 * 1024 * 1024
174+
+ psutil.Process().memory_info().rss, # 0.39GB + current memory usage,
170175
)
171176

172177
assert (
@@ -298,7 +303,9 @@ def forward(self, x):
298303
)
299304

300305
partitioned_module = resource_partition(
301-
partitioned_module, cpu_memory_budget=1.4 * 1024 * 1024 * 1024 # 1.4GB,
306+
partitioned_module,
307+
cpu_memory_budget=0.39 * 1024 * 1024 * 1024
308+
+ psutil.Process().memory_info().rss, # 0.89GB + current memory usage,
302309
)
303310

304311
assert (
@@ -396,7 +403,9 @@ def forward(self, x):
396403
)
397404

398405
partitioned_module = resource_partition(
399-
partitioned_module, cpu_memory_budget=1.4 * 1024 * 1024 * 1024 # 1.4GB,
406+
partitioned_module,
407+
cpu_memory_budget=0.39 * 1024 * 1024 * 1024
408+
+ psutil.Process().memory_info().rss, # 0.89GB + current memory usage,
400409
)
401410

402411
assert (

0 commit comments

Comments
 (0)