Skip to content

Commit f9fdb7b

Browse files
committed
fix(fsdp): import os for safe_get_rank fallback
1 parent 4bd8bb3 commit f9fdb7b

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

‎megatron/core/distributed/fsdp/src/megatron_fsdp/utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import inspect
1717
import logging
1818
import operator
19+
import os
1920
from contextlib import nullcontext
2021
from functools import reduce
2122
from importlib.metadata import version

‎tests/unit_tests/distributed/megatron_fsdp/test_mcore_tensor_parallelism_detect.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from megatron.core.distributed.fsdp.mcore_fsdp_adapter import FullyShardedDataParallel
77
from megatron.core.distributed.fsdp.src.megatron_fsdp.utils import (
88
get_mcore_tensor_parallel_partition_dim,
9+
safe_get_rank,
910
is_mcore_tensor_parallel_duplicated,
1011
using_tensor_parallel,
1112
)
@@ -79,6 +80,13 @@ def test_using_tensor_parallel_false_when_mesh_size_one():
7980
assert using_tensor_parallel(dist_index) is False
8081

8182

83+
def test_safe_get_rank_should_fall_back_to_rank_env_if_distributed_is_not_initialized(monkeypatch):
84+
monkeypatch.setattr(torch.distributed, "is_initialized", lambda: False)
85+
monkeypatch.setenv("RANK", "7")
86+
87+
assert safe_get_rank() == 7
88+
89+
8290
class DummyConfig:
8391
# Just enough attributes for __init__ to run if needed in future tests.
8492
gradient_accumulation_fusion = False

0 commit comments

Comments
 (0)