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.

Sign up for GitHub

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

Jump to bottom

[profiler] use PyCFunction_Check to check both PyCMethod_Type and PyC… #110002

Closed
wants to merge 1 commit into from
Closed

[profiler] use PyCFunction_Check to check both PyCMethod_Type and PyC… #110002

wants to merge 1 commit into from

Conversation

fwenguang
Copy link
Contributor

At https://github.com/pytorch/pytorch/blob/main/torch/csrc/autograd/profiler_python.cpp#L1096, when what is PyTrace_C_CALL, Py_TYPE(arg) only can be PyCFunction_Type before python3.9. But in python3.9 or later, Py_TYPE(arg) also can be PyCMethod_Type.
PyCMethod_Type is subtype of PyCFunction_Type, ref to
https://github.com/python/cpython/blob/f2eaa92b0cc5a37a9e6010c7c6f5ad1a230ea49b/Objects/methodobject.c#L372.
So there should use PyCFunction_Check to check arg->ob_type.

Fixes #109877

@pytorch-bot
Copy link

pytorch-bot bot commented Sep 25, 2023 •
edited

🔗 Helpful Links

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

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

✅ No Failures

As of commit ae9368e with merge base 52e1478 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@fwenguang fwenguang mentioned this pull request Sep 25, 2023
Closed
@fwenguang fwenguang mentioned this pull request Sep 25, 2023
Closed
ezyang
ezyang approved these changes Sep 25, 2023
View reviewed changes
Copy link
Contributor

@ezyang ezyang left a comment

Choose a reason for hiding this comment

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

okey

@ezyang
Copy link
Contributor

ezyang commented Sep 25, 2023

@pytorchbot merge -r main

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

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

@pytorchmergebot
Copy link
Collaborator

Successfully rebased cfunc_check onto refs/remotes/origin/main, please pull locally before adding more changes (for example, via git checkout cfunc_check && git pull --rebase)

@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

@ezyang
Copy link
Contributor

ezyang commented Sep 25, 2023

@pytorchbot merge

@ezyang ezyang added the topic: not user facing topic category label Sep 25, 2023
@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: 1 jobs have failed, first few of them are: trunk / linux-focal-rocm5.6-py3.8 / test (default, 1, 3, linux.rocm.gpu)

Details for Dev Infra team Raised by workflow job

@ezyang
Copy link
Contributor

ezyang commented Sep 25, 2023

@pytorchbot merge -r main

@pytorchmergebot
Copy link
Collaborator

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

@pytorchmergebot
Copy link
Collaborator

Successfully rebased cfunc_check onto refs/remotes/origin/main, please pull locally before adding more changes (for example, via git checkout cfunc_check && git pull --rebase)

@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

@fwenguang fwenguang deleted the cfunc_check branch September 27, 2023 08:38
ringohoffman pushed a commit to ringohoffman/pytorch that referenced this pull request Sep 27, 2023
@ringohoffman
[profiler] use PyCFunction_Check to check both PyCMethod_Type and PyC… (
c1b242a 
pytorch#110002)

At https://github.com/pytorch/pytorch/blob/main/torch/csrc/autograd/profiler_python.cpp#L1096, when what is PyTrace_C_CALL, Py_TYPE(arg) only can be PyCFunction_Type before python3.9. But in python3.9 or later, Py_TYPE(arg) also can be PyCMethod_Type.
PyCMethod_Type is subtype of PyCFunction_Type, ref to
https://github.com/python/cpython/blob/f2eaa92b0cc5a37a9e6010c7c6f5ad1a230ea49b/Objects/methodobject.c#L372.
So there should use PyCFunction_Check to check arg->ob_type.

Fixes pytorch#109877

Pull Request resolved: pytorch#110002
Approved by: https://github.com/ezyang
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ezyang ezyang ezyang approved these changes

@aaronenyeshi aaronenyeshi Awaiting requested review from aaronenyeshi aaronenyeshi is a code owner

Assignees
No one assigned
Labels
ciflow/trunk Trigger trunk jobs on your pull request Merged open source topic: not user facing topic category
Projects
None yet
Milestone
No milestone
4 participants
@fwenguang @ezyang @pytorchmergebot @pytorchbot