Skip to content
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

Update SYNC_UPSTREAM.md #2544

Merged
merged 3 commits into from
Jun 2, 2024
Merged

Update SYNC_UPSTREAM.md #2544

merged 3 commits into from
Jun 2, 2024

Conversation

mmakevic-amd
Copy link

Added instructions for the event when weekly sync takes too long to merge, as well as debugging tips.

@@ -4,6 +4,8 @@ How to synchonize TensorFlow ROCm port with upstream TensorFlow
This article shows the step to synchronize TensorFlow with upstream. The
process is currently carried out manually but it could and should be automated.

**Important:** Synchronization should be performed on a weekly basis. Even if it takes more than a week to merge the PR, the next weekly sync must not be postponed. This way, long breaks (e.g. one month) between syncs will be avoided.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we discussed, I think we should have something like this:

Synchronization should be performed on a weekly basis. Even if it has taken more than 2 weeks (>2) to merge the PR, the next weekly sync should first sync in the middle week between the last one and current one, and then sync the current week.

For example, if the last weekly-sync PR is 3 weeks ago (2024-04-29), and this weekly-sync (supposed to be 2024-05-13) should start from 2024-05-06, and it needs another weekly-sync at 2024-05-13.

This way, long breaks (e.g. one month) between syncs will be avoided.

* Merge to that commit point (i.e. perform a "mini sync")
* Resolve merge conflicts based on what was done in that weekly sync
* Test
* Repeat until the required commit is found

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also provide reference to https://confluence.amd.com/display/~cchen104/XLA+hotfix+track to cherry-pick XLA hot fixes if the build breaks in xla

@i-chaochen
Copy link

retest Ubuntu-GPU-single please
retest Ubuntu-GPU-multi please

@i-chaochen i-chaochen merged commit 8d06bdb into develop-upstream Jun 2, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants