Skip to content

Fix sort of zero checkpoint files #5342

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

Merged
tohtana merged 2 commits into from
Apr 2, 2024
+19 −2
Merged

Fix sort of zero checkpoint files #5342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51c3031
fix sort of zero checkpoint files
Apr 1, 2024
b0a7bcc
Merge branch 'master' into tohtana/checkpoint_sort
tjruwase Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions deepspeed/checkpoint/reshape_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
# DeepSpeed Team

import os
import re
import torch
from collections import OrderedDict
from .constants import (ZERO_FILE_PREFIX, FP16_ZERO_FILE_PREFIX, BF16_ZERO_FILE_PREFIX)
from .constants import (ZERO_FILE_PREFIX, FP16_ZERO_FILE_PREFIX, BF16_ZERO_FILE_PREFIX, MODEL_FILE_PREFIX)


def basic_folder_validation(dir):
Expand Down Expand Up @@ -38,12 +39,28 @@ def get_files(dir):
return file_list


def sort_zero_files(files, prefix):
pattern = f"{prefix}([0-9]+)_{MODEL_FILE_PREFIX}([0-9]+)"
rank_pairs = []
for f in files:
m = re.search(pattern, f)
if m:
dp_rank = int(m.group(1))
mp_rank = int(m.group(2))
rank_pairs.append((dp_rank, mp_rank, f))
else:
raise ValueError(f"Cannot parse dp_rank and mp_rank from {f}")

sorted_files = sorted(rank_pairs, key=lambda x: (x[0], x[1]))
return [f for _, _, f in sorted_files]


def get_zero_files(dir):
file_list = get_files(dir)
for prefix in [ZERO_FILE_PREFIX, FP16_ZERO_FILE_PREFIX, BF16_ZERO_FILE_PREFIX]:
zero_files = get_files_with_prefix(file_list, prefix)
if len(zero_files) > 0:
return zero_files
return sort_zero_files(zero_files, prefix)

return []

Expand Down