[PHI Decoupling]Remove memory header (Part3) #51288
Merged
Conversation
This file contains 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
|
你的PR提交成功，感谢你对开源项目的贡献! |
jiahy0825
previously approved these changes
Mar 10, 2023
| @@ -51,7 +51,7 @@ inline std::unique_ptr<DeviceContext> CreateDeviceContext( | |||
| using PtrType = std::unique_ptr<DeviceContext>; | |||
|
|
|||
| DevCtx* dev_ctx = ConstructDevCtx<DevCtx>(p, stream_priority); | |||
|
|
|||
| auto& instance = *(MemoryUtils::Instance().GetAllocatorFacade()); | |||
There was a problem hiding this comment.
Why move this line outside the macro #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)? (see line 63)
There was a problem hiding this comment.
为了能复用instance这个变量
zyfncg
reviewed
Mar 10, 2023
| @@ -289,6 +307,44 @@ void Copy(const Place& dst_place, | |||
| const void* src, | |||
| size_t num); | |||
| int64_t DeviceMemoryStatCurrentValue(const std::string& stat_type, int dev_id); | |||
|
|
|||
| class Buffer { | |||
There was a problem hiding this comment.
Buffer看上去用的地方不多，这是不是一个可以去掉的数据结构？
There was a problem hiding this comment.
这个数据结构确实能通过memory下的方法组合出来，不过我觉得buffer这个设计初衷应该是为了方便使用memory的方法，我倾向于保留该结构
zyfncg
approved these changes
Mar 23, 2023
Comment on lines
+296
to
+315
| void EmplaceDeviceContexts( | ||
| std::map<Place, std::shared_future<std::unique_ptr<DeviceContext>>>* | ||
| place_to_device_context, | ||
| const std::vector<phi::Place>& places, | ||
| bool disable_setting_default_stream_for_allocator, | ||
| int stream_priority) { | ||
| CheckMemoryMethod(); | ||
| PADDLE_ENFORCE_NE( | ||
| memory_method_->emplace_device_contexts, | ||
| nullptr, | ||
| phi::errors::Unavailable( | ||
| "emplace_device_contexts method in memory_method_ is not " | ||
| "initiazed yet. You need init it first.")); | ||
| memory_method_->emplace_device_contexts( | ||
| place_to_device_context, | ||
| places, | ||
| disable_setting_default_stream_for_allocator, | ||
| stream_priority); | ||
| } | ||
|
|
There was a problem hiding this comment.
这个函数功能与memory相关性已经不大了，后面看怎么调整下命名或者位置
luotao1
approved these changes
Mar 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR types
Others
PR changes
Others
Describe
Pcard-67890
memory头文件解耦第二个PR，移除：paddle/fluid/memory/allocation/allocator_facade.h 和 paddle/fluid/memory/buffer.h