Description
We cut a release branch for the 2.6.0 release.
Our plan from this point from this point is roughly:
- Phase 1 (until 1/13/25): work on finalizing the release branch
- Phase 2 (after 1/13/25): perform extended integration/stability/performance testing based on Release Candidate builds.
This issue is for tracking cherry-picks to the release branch.
Cherry-Pick Criteria
Phase 1 (until 1/13/25):
Only low-risk changes may be cherry-picked from main:
- Fixes to regressions against the most recent minor release (e.g. 2.5.x for this release; see module: regression issue list)
- Critical fixes for: silent correctness, backwards compatibility, crashes, deadlocks, (large) memory leaks
- Critical fixes to new features introduced in the most recent minor release (e.g. 2.5.x for this release)
- Test/CI fixes
- Documentation improvements
- Compilation fixes or ifdefs required for different versions of the compilers or third-party libraries
- Release branch specific changes (e.g. change version identifiers)
Any other change requires special dispensation from the release managers (currently @atalman, @malfet, @kit1980). If this applies to your change please write "Special Dispensation" in the "Criteria Category:" template below and explain.
Phase 2 (after 1/13/25):
Note that changes here require us to rebuild a Release Candidate and restart extended testing (likely delaying the release). Therefore, the only accepted changes are Release-blocking critical fixes for: silent correctness, backwards compatibility, crashes, deadlocks, (large) memory leaks
Changes will likely require a discussion with the larger release team over VC or Slack.
Cherry-Pick Process
-
Ensure your PR has landed in master. This does not apply for release-branch specific changes (see Phase 1 criteria).
-
Create (but do not land) a PR against the release branch.
# Find the hash of the commit you want to cherry pick # (for example, abcdef12345) git log git fetch origin release/2.6 git checkout release/2.6 git cherry-pick -x abcdef12345 # Submit a PR based against 'release/2.6' either: # via the GitHub UI git push my-fork # via the GitHub CLI gh pr create --base release/2.6
You can also use the
@pytorchbot cherry-pickcommand to cherry-pick your PR. To do this, just add a comment in your merged PR. For example:@pytorchbot cherry-pick --onto release/2.6 -c docs(
-c docs- is the category of your changes - adjust accordingly):For more information, see pytorchbot cherry-pick docs.
-
Make a request below with the following format:
Link to landed trunk PR (if applicable):
*
Link to release branch PR:
*
Criteria Category:
*
- Someone from the release team will reply with approved / denied or ask for more information.
- If approved, someone from the release team will merge your PR once the tests pass. Do not land the release branch PR yourself.
NOTE: Our normal tools (ghstack / ghimport, etc.) do not work on the release branch.
Please note HUD Link with branch CI status and link to the HUD to be provided here.
HUD
Versions
2.6.0
cc @seemethere @malfet @pytorch/pytorch-dev-infra