Fix unqualified uses of executorch functions #5709
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/5709
Note: Links to docs will display an error until the docs builds have been completed. ❗ 1 Active SEVsThere are 1 currently active SEVs. If your PR is affected, please view them below: ✅ No FailuresAs of commit ca66a33 with merge base 905b88c ( This comment was automatically generated by Dr. CI and updates every 15 minutes. |
facebook-github-bot
added
the
CLA Signed
|
This pull request was exported from Phabricator. Differential Revision: D63476419 |
swolchok
approved these changes
Sep 27, 2024
|
This pull request was exported from Phabricator. Differential Revision: D63476419 |
dbort
force-pushed
the
export-D63476419
branch
from
5ee8ce4 to
97e1fa5
Compare
dbort
added a commit
to dbort/executorch
that referenced
this pull request
Sep 27, 2024
Summary: Pull Request resolved: pytorch#5709 I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217. In a few places I used `namespace etrt = executorch::runtime;` instead of a using statement for a particular function, like `etrt::isIntegralType`. If I just say `using executorch::runtime::isIntegralType`, those files fail in aten mode because the unqualified call to `isIntegralType()` is deemed ambiguous in the presence of `c10::isIntegralType()` -- but afaict that `c10` version isn't `using`'d into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now. I also updated custom_kernel_example to stop using the `torch::` namespace. Differential Revision: D63476419 Reviewed By: swolchok
Summary: Pull Request resolved: pytorch#5709 I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217. In a few places I used `namespace etrt = executorch::runtime;` instead of a using statement for a particular function, like `etrt::isIntegralType`. If I just say `using executorch::runtime::isIntegralType`, those files fail in aten mode because the unqualified call to `isIntegralType()` is deemed ambiguous in the presence of `c10::isIntegralType()` -- but afaict that `c10` version isn't `using`'d into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now. I also updated custom_kernel_example to stop using the `torch::` namespace. Reviewed By: swolchok Differential Revision: D63476419
dbort
added a commit
to dbort/executorch
that referenced
this pull request
Sep 30, 2024
Summary: Pull Request resolved: pytorch#5709 I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217. In a few places I used `namespace etrt = executorch::runtime;` instead of a using statement for a particular function, like `etrt::isIntegralType`. If I just say `using executorch::runtime::isIntegralType`, those files fail in aten mode because the unqualified call to `isIntegralType()` is deemed ambiguous in the presence of `c10::isIntegralType()` -- but afaict that `c10` version isn't `using`'d into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now. I also updated custom_kernel_example to stop using the `torch::` namespace. Differential Revision: D63476419 Reviewed By: swolchok
|
This pull request was exported from Phabricator. Differential Revision: D63476419 |
dbort
force-pushed
the
export-D63476419
branch
from
97e1fa5 to
ca66a33
Compare
|
This pull request has been merged in 5605954. |
|
@pytorchbot cherry-pick --onto release/0.4 -c fixnewfeature |
pytorchbot
pushed a commit
that referenced
this pull request
Sep 30, 2024
Summary: Pull Request resolved: #5709 I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217. In a few places I used `namespace etrt = executorch::runtime;` instead of a using statement for a particular function, like `etrt::isIntegralType`. If I just say `using executorch::runtime::isIntegralType`, those files fail in aten mode because the unqualified call to `isIntegralType()` is deemed ambiguous in the presence of `c10::isIntegralType()` -- but afaict that `c10` version isn't `using`'d into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now. I also updated custom_kernel_example to stop using the `torch::` namespace. Reviewed By: swolchok Differential Revision: D63476419 fbshipit-source-id: 2300fc1fa5d5af6f6f747d3a0c31db5099389dcc (cherry picked from commit 5605954)
Cherry picking #5709The cherry pick PR is at #5772 and it is recommended to link a fixnewfeature cherry pick PR with an issue. The following tracker issues are updated: Details for Dev Infra teamRaised by workflow job |
jackzhxng
pushed a commit
that referenced
this pull request
Sep 30, 2024
Fix unqualified uses of executorch functions (#5709) Summary: Pull Request resolved: #5709 I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217. In a few places I used `namespace etrt = executorch::runtime;` instead of a using statement for a particular function, like `etrt::isIntegralType`. If I just say `using executorch::runtime::isIntegralType`, those files fail in aten mode because the unqualified call to `isIntegralType()` is deemed ambiguous in the presence of `c10::isIntegralType()` -- but afaict that `c10` version isn't `using`'d into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now. I also updated custom_kernel_example to stop using the `torch::` namespace. Reviewed By: swolchok Differential Revision: D63476419 fbshipit-source-id: 2300fc1fa5d5af6f6f747d3a0c31db5099389dcc (cherry picked from commit 5605954) Co-authored-by: Dave Bort <dbort@meta.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
I'm not sure how this worked before, but these sites called functions under torch::executor without actually qualifying them. Qualify them explicitly, because the "can call without qualification" magic stops working when we move the etensor types in D63294217.
In a few places I used
namespace etrt = executorch::runtime;instead of a using statement for a particular function, likeetrt::isIntegralType. If I just sayusing executorch::runtime::isIntegralType, those files fail in aten mode because the unqualified call toisIntegralType()is deemed ambiguous in the presence ofc10::isIntegralType()-- but afaict thatc10version isn'tusing'd into the global namespace, so I don't know why it conflicts. It'd be good to figure that out at some point, but this works for now.Differential Revision: D63476419