-
Notifications
You must be signed in to change notification settings - Fork 9
fix(megatron_training_lib): correct training-log parsing and drop sudo from libbnxt cp #177
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.
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
Open
atnair-amd
wants to merge
2
commits into
main
Choose a base branch
from
atnair/megatron-log-output-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,8 +42,7 @@ | |
| } | ||
|
|
||
| TRAINING_PROGRESS_PATTERNS = [ | ||
| r'throughput per GPU(?:\s*\([^)]*\))?\s*:|tokens\/GPU\/s\s+[0-9]+', | ||
| r'throughput per GPU:|tokens\/GPU\/s\s+[0-9]+', | ||
| r'iteration\s+(\d+)/\s+\1\s*\|', | ||
| ] | ||
|
|
||
| TRAINING_NAN_PATTERNS = [ | ||
|
|
@@ -384,7 +383,7 @@ def exec_nic_setup_scripts( | |
| # override the gid_index to 3 for broadcom | ||
| self.nccl_ib_gid_index = 3 | ||
| out_dict = self.phdl.exec( | ||
| f'docker exec {self.container_name} /bin/bash -c "sudo \ | ||
| f'docker exec {self.container_name} /bin/bash -c " \ | ||
| cp /usr/lib/x86_64-linux-gnu/libibverbs/libbnxt_re-rdmav34.so.host \ | ||
| /usr/lib/x86_64-linux-gnu/libibverbs/libbnxt_re-rdmav34.so; \ | ||
| sleep 2;ibv_devinfo;sleep 2;"' | ||
|
|
@@ -581,10 +580,17 @@ def get_training_results_dict( | |
| - re is imported in the module scope. | ||
| """ | ||
|
|
||
| # Read the training log output from the "last" node (assumed authoritative) | ||
| # Read the training log output from the "last" node (assumed authoritative). | ||
| # Filter to megatron iteration lines BEFORE tailing: post-training cleanup | ||
| # (aiter import spam, validation eval, NCCL teardown warnings) can otherwise | ||
| # push iteration lines out of a `tail -15` window, leaving the parser with | ||
| # nothing to match and silently emitting an empty results_dict. | ||
| last_node = self.host_list[len(self.host_list) - 1] | ||
| last_node_num = len(self.host_list) - 1 | ||
| out_dict = self.phdl.exec(f'cat {self.log_dir}/megatron-logs/out-node{last_node_num}/training.log | tail -15') | ||
| out_dict = self.phdl.exec( | ||
| f"grep -E 'iteration[[:space:]]+[0-9]+/[[:space:]]+[0-9]+[[:space:]]*\\|' " | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment as above
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same fix applied to the grep ERE in f91e6c8: |
||
| f"{self.log_dir}/megatron-logs/out-node{last_node_num}/training.log | tail -15" | ||
| ) | ||
|
|
||
| # Select the log content from the last node | ||
| output = out_dict[last_node] | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r'iteration\s+(\d+)/\s+\1\s*|' requires whitespace after /. If Megatron logs ever emit iteration 100/100 | or vary spacing by version, _is_training_complete() may stop matching entirely.
Would r'iteration\s+(\d+)\s*/\s*\1\s*|' be safer here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch — switched to
r'iteration\s+(\d+)\s*/\s*\1\s*\|'in f91e6c8 so spacing around/is tolerated.