Skip to content

Conversation

@zou3519
Copy link
Contributor

@zou3519 zou3519 commented Jun 23, 2023

Stack from ghstack:

The remaining ops after this PR are:

  • cond
  • map
  • anything that is out of tree.

These are a bit more difficult to remove.

Test Plan:

  • existing tests

The remaining ops after this PR are:
- cond
- map
- anything that is out of tree.

These are a bit more difficult to remove.

Test Plan:
- existing tests

[ghstack-poisoned]
@pytorch-bot
Copy link

pytorch-bot bot commented Jun 23, 2023

🔗 Helpful Links

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

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

✅ No Failures

As of commit 797281d:
💚 Looks good so far! There are no failures yet. 💚

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

zou3519 added a commit that referenced this pull request Jun 23, 2023
The remaining ops after this PR are:
- cond
- map
- anything that is out of tree.

These are a bit more difficult to remove.

Test Plan:
- existing tests

ghstack-source-id: a4d4a77
Pull Request resolved: #104105
@zou3519 zou3519 requested a review from ydwu4 June 23, 2023 15:06
@zou3519
Copy link
Contributor Author

zou3519 commented Jun 26, 2023

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jun 26, 2023
@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: This PR needs a release notes: label
If your changes are user facing and intended to be a part of release notes, please use a label starting with release notes:.

If not, please add the topic: not user facing label.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "topic: not user facing"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Details for Dev Infra team Raised by workflow job

@zou3519
Copy link
Contributor Author

zou3519 commented Jun 27, 2023

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

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

@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: This PR is too stale; the last push date was more than 3 days ago. Please rebase and try again. You can rebase and merge by leaving the following comment on this PR:
@pytorchbot merge -r
Or just rebase by leaving @pytorchbot rebase comment

Details for Dev Infra team Raised by workflow job

@zou3519
Copy link
Contributor Author

zou3519 commented Jun 27, 2023

@pytorchbot merge -r

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to Command git -C /home/runner/work/pytorch/pytorch rebase refs/remotes/origin/viable/strict gh/zou3519/683/orig returned non-zero exit code 1

Rebasing (1/1)
Auto-merging torch/_higher_order_ops/wrap.py
CONFLICT (content): Merge conflict in torch/_higher_order_ops/wrap.py
error: could not apply 245e18dfcd5... [HigherOrderOp] Remove `_deprecated_global_ns` from some ops
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 245e18dfcd5... [HigherOrderOp] Remove `_deprecated_global_ns` from some ops

Raised by https://github.com/pytorch/pytorch/actions/runs/5393956534

The remaining ops after this PR are:
- cond
- map
- anything that is out of tree.

These are a bit more difficult to remove.

Test Plan:
- existing tests

[ghstack-poisoned]
@zou3519
Copy link
Contributor Author

zou3519 commented Jun 28, 2023

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

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

@facebook-github-bot facebook-github-bot deleted the gh/zou3519/683/head branch July 1, 2023 14:17
ydwu4 added a commit to ydwu4/pytorch that referenced this pull request Jul 6, 2023
Summary:
Remove _deprecated_global_ns from cond following pytorch#104105.

To do that, we need to change how graph_module generates python_code for "cond" target. Otherwise, it will generate target as "torch.ops.cond", which is invalid after the change.

Will import this PR to fix internal tests.

cc voznesenskym penguinwu anijain2305 EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng Xia-Weiwen wenzhe-nrv jiayisunx ipiszy chenyang78

Pull Request resolved: pytorch#104380

Reviewed By: zou3519

Differential Revision: D47110919

Pulled By: ydwu4

fbshipit-source-id: e0b8090982cee2c1415abb663bb6308eeb4a52b4
facebook-github-bot pushed a commit to pytorch/executorch that referenced this pull request Jul 7, 2023
Summary:
Remove _deprecated_global_ns from cond following pytorch/pytorch#104105.

To do that, we need to change how graph_module generates python_code for "cond" target. Otherwise, it will generate target as "torch.ops.cond", which is invalid after the change.

Will import this PR to fix internal tests.

cc voznesenskym penguinwu anijain2305 EikanWang jgong5 Guobing-Chen XiaobingSuper zhuhaozhe blzheng Xia-Weiwen wenzhe-nrv jiayisunx ipiszy chenyang78

X-link: pytorch/pytorch#104380

Reviewed By: zou3519

Differential Revision: D47110919

Pulled By: ydwu4

fbshipit-source-id: eed2f7e0aa6bfc0d0a46f0064630abed872e3d75
pytorchmergebot pushed a commit that referenced this pull request Jul 7, 2023
 Remove _deprecated_global_ns from cond following #104105.

We change the module attribute of HigherOrderOperator instances in the constructor from torch.ops to torch.ops.higher_order when self.namespace is "higher_order". For subclasses (e.g. customized higher order operator), we leave their \_\_module\_\_ unchanged.

Will import this PR to fix internal tests.

Pull Request resolved: #104380
Approved by: https://github.com/zhxchen17, https://github.com/zou3519
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ciflow/trunk Trigger trunk jobs on your pull request Merged topic: not user facing topic category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants