[module] Change the deleter of Program in Module to make android happy #4924
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/4924
Note: Links to docs will display an error until the docs builds have been completed. ✅ No FailuresAs of commit f92fc56 with merge base 3fb03dc ( This comment was automatically generated by Dr. CI and updates every 15 minutes. |
facebook-github-bot
added
the
CLA Signed
|
@larryliu0820 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
kirklandsign
approved these changes
Aug 27, 2024
|
@larryliu0820 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Summary:
When building the Android demo app I got:
```
> bash build/build_android_llm_demo.sh
/data/users/larryliu/android/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/memory:4013:39: error: call to implicitly-deleted copy constructor of '(lambda at /data/users/larryliu/executorch/extension/module/module.cpp:126:9)'
__cntrl_ = new _CntrlBlk(__p, __d, _AllocT());
^~~
/data/users/larryliu/executorch/extension/module/module.cpp:124:16: note: in instantiation of function template specialization 'std::shared_ptr<executorch::runtime::Program>::shared_ptr<executorch::runtime::Program, (lambda at /data/users/larryliu/executorch/extension/module/module.cpp:126:9)>' requested here
program_ = std::shared_ptr<Program>(
^
/data/users/larryliu/executorch/extension/module/module.cpp:126:10: note: copy constructor of '' is implicitly deleted because field '' has a deleted copy constructor
[data_loader = std::move(data_loader_)](Program* pointer) {
^
/data/users/larryliu/android/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/memory:2577:3: note: copy constructor is implicitly deleted because 'unique_ptr<executorch::runtime::DataLoader>' has a user-declared move constructor
unique_ptr(unique_ptr&& __u) _NOEXCEPT
^
/data/users/larryliu/android/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/memory:3575:39: note: passing argument to parameter '__d' here
__shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)
```
To fix this I am changing the deleter of Program to be capturing `this`
(Module) assuming the lifespan of `Module` is always longer than
`Program`.
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
larryliu0820
force-pushed
the
fix_android_demo
branch
from
5af44a6 to
f69f8c1
Compare
|
@larryliu0820 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@larryliu0820 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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:
When building the Android demo app I got:
To fix this I am changing the deleter of Program to be capturing
this(Module) assuming the lifespan ofModuleis always longer thanProgram.Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags: