Skip to content

Change _compute_local_shape_and_global_offset API to be backward-compatible#172176

Closed
aorenste wants to merge 2 commits intogh/aorenste/171/basefrom
gh/aorenste/171/head
Closed

Change _compute_local_shape_and_global_offset API to be backward-compatible#172176
aorenste wants to merge 2 commits intogh/aorenste/171/basefrom
gh/aorenste/171/head

Conversation

@aorenste
Copy link
Copy Markdown
Contributor

@aorenste aorenste commented Jan 11, 2026 •
edited
Loading

Fix for #169549: An internal user was calling _compute_local_shape_and_global_offset() directly so I figured it was safer to make the API backward compatible.

Stack from ghstack (oldest at bottom):

@pytorch-bot
Copy link
Copy Markdown

pytorch-bot Bot commented Jan 11, 2026 •
edited
Loading

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/172176

Note: Links to docs will display an error until the docs builds have been completed.

⏳ No Failures, 124 Pending

As of commit 3de1265 with merge base 3a4dcf0 (image):
💚 Looks good so far! There are no failures yet. 💚

UNSTABLE - The following job is marked as unstable, possibly due to flakiness on trunk:

This comment was automatically generated by Dr. CI and updates every 15 minutes.

aorenste added a commit that referenced this pull request Jan 11, 2026
@aorenste
Change _compute_local_shape_and_global_offset API to be backward-comp…
73c56c9 
…atible

ghstack-source-id: 27b0a5f
Pull Request resolved: #172176
@aorenste aorenste added the topic: not user facing topic category label Jan 11, 2026
@aorenste
Update on "Change _compute_local_shape_and_global_offset API to be ba…
3de1265 
…ckward-compatible"

Fix for #169549: An internal user was calling `_compute_local_shape_and_global_offset()` directly so I figured it was safer to make the API backward compatible.




[ghstack-poisoned]
@aorenste aorenste marked this pull request as ready for review January 11, 2026 05:40
aorenste added a commit that referenced this pull request Jan 11, 2026
@aorenste
Change _compute_local_shape_and_global_offset API to be backward-comp…
2652c64 
…atible

ghstack-source-id: d51ecf7
Pull Request resolved: #172176
@aorenste
Copy link
Copy Markdown
Contributor Author

aorenste commented Jan 12, 2026

@pytorchbot merge

@pytorch-bot
Copy link
Copy Markdown

pytorch-bot Bot commented Jan 12, 2026

This PR needs to be approved by an authorized maintainer before merge.

@aorenste aorenste added the ciflow/trunk Trigger trunk jobs on your pull request label Jan 12, 2026
@aorenste
Copy link
Copy Markdown
Contributor Author

aorenste commented Jan 12, 2026

@pytorchbot merge

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@jeanschmidt
Copy link
Copy Markdown
Contributor

jeanschmidt commented Jan 12, 2026

@pytorchbot revert -m "sorry, need to revert in order to revert #169549, please feel free to re-merge this change once rebased" -c weird

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

@pytorchbot successfully started a revert job. Check the current status here.
Questions? Feedback? Please reach out to the PyTorch DevX Team

pytorchmergebot added a commit that referenced this pull request Jan 12, 2026
@pytorchmergebot
Revert "Change _compute_local_shape_and_global_offset API to be backw…
b9fefeb 
…ard-compatible (#172176)"

This reverts commit 084f69f.

Reverted #172176 on behalf of https://github.com/jeanschmidt due to sorry, need to revert in order to revert #169549, please feel free to re-merge this change once rebased ([comment](#172176 (comment)))
@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

@aorenste your PR has been successfully reverted.

@pytorchmergebot pytorchmergebot added Reverted ci-no-td Do not run TD on this PR labels Jan 12, 2026
@jeanschmidt
Copy link
Copy Markdown
Contributor

jeanschmidt commented Jan 12, 2026

@pytorchbot merge -f "should not have reverted"

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes). Please use -f as last resort and instead consider -i/--ignore-current to continue the merge ignoring current failures. This will allow currently pending tests to finish and report signal before the merge.

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 2652c649cbda5d32daac3e32931ae88201414757 returned non-zero exit code 1

Auto-merging torch/distributed/tensor/_utils.py
CONFLICT (content): Merge conflict in torch/distributed/tensor/_utils.py
error: could not apply 2652c649cbd... Change _compute_local_shape_and_global_offset API to be backward-compatible
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

@jeanschmidt
Copy link
Copy Markdown
Contributor

jeanschmidt commented Jan 12, 2026

@pytorchbot merge -f "should not have reverted"

@pytorchmergebot
Copy link
Copy Markdown
Collaborator

pytorchmergebot commented Jan 12, 2026

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes). Please use -f as last resort and instead consider -i/--ignore-current to continue the merge ignoring current failures. This will allow currently pending tests to finish and report signal before the merge.

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

hinriksnaer pushed a commit to hinriksnaer/pytorch that referenced this pull request Jan 12, 2026
@aorenste @hinriksnaer
Change _compute_local_shape_and_global_offset API to be backward-comp…
698be27 
…atible (pytorch#172176)

Fix for pytorch#169549: An internal user was calling `_compute_local_shape_and_global_offset()` directly so I figured it was safer to make the API backward compatible.

Pull Request resolved: pytorch#172176
Approved by: https://github.com/bobrenjc93
hinriksnaer pushed a commit to hinriksnaer/pytorch that referenced this pull request Jan 12, 2026
@pytorchmergebot @hinriksnaer
Revert "Change _compute_local_shape_and_global_offset API to be backw…
eb945fd 
…ard-compatible (pytorch#172176)"

This reverts commit 084f69f.

Reverted pytorch#172176 on behalf of https://github.com/jeanschmidt due to sorry, need to revert in order to revert pytorch#169549, please feel free to re-merge this change once rebased ([comment](pytorch#172176 (comment)))
hinriksnaer pushed a commit to hinriksnaer/pytorch that referenced this pull request Jan 12, 2026
@aorenste @hinriksnaer
Change _compute_local_shape_and_global_offset API to be backward-comp…
3d53520 
…atible (pytorch#172176)

Fix for pytorch#169549: An internal user was calling `_compute_local_shape_and_global_offset()` directly so I figured it was safer to make the API backward compatible.

Pull Request resolved: pytorch#172176
Approved by: https://github.com/bobrenjc93
skpark-rh pushed a commit to skpark-rh/pytorch that referenced this pull request Jan 12, 2026
@aorenste @skpark-rh
Change _compute_local_shape_and_global_offset API to be backward-comp…
003c046 
…atible (pytorch#172176)

Fix for pytorch#169549: An internal user was calling `_compute_local_shape_and_global_offset()` directly so I figured it was safer to make the API backward compatible.

Pull Request resolved: pytorch#172176
Approved by: https://github.com/bobrenjc93
skpark-rh pushed a commit to skpark-rh/pytorch that referenced this pull request Jan 12, 2026
@pytorchmergebot @skpark-rh
Revert "Change _compute_local_shape_and_global_offset API to be backw…
6390539 
…ard-compatible (pytorch#172176)"

This reverts commit 084f69f.

Reverted pytorch#172176 on behalf of https://github.com/jeanschmidt due to sorry, need to revert in order to revert pytorch#169549, please feel free to re-merge this change once rebased ([comment](pytorch#172176 (comment)))
skpark-rh pushed a commit to skpark-rh/pytorch that referenced this pull request Jan 12, 2026
@aorenste @skpark-rh
Change _compute_local_shape_and_global_offset API to be backward-comp…
d02e26c 
…atible (pytorch#172176)

Fix for pytorch#169549: An internal user was calling `_compute_local_shape_and_global_offset()` directly so I figured it was safer to make the API backward compatible.

Pull Request resolved: pytorch#172176
Approved by: https://github.com/bobrenjc93
@github-actions github-actions Bot deleted the gh/aorenste/171/head branch February 12, 2026 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bobrenjc93 bobrenjc93 bobrenjc93 approved these changes

Assignees

No one assigned

Labels

ci-no-td Do not run TD on this PR ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request Merged Reverted topic: not user facing topic category

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@aorenste @pytorchmergebot @jeanschmidt @bobrenjc93