-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor StreamAnalyzer and EventManager from InterpreterCore
- Loading branch information
1 parent
2bb4431
commit 3590bc9
Showing
9 changed files
with
288 additions
and
171 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #include "paddle/fluid/framework/new_executor/event_manager.h" | ||
|
|
||
| namespace paddle { | ||
| namespace framework { | ||
|
|
||
| void EventManager::WaitEvent(const Instruction& instruction, | ||
| const platform::Place& place) { | ||
| // If InterpreterCore in on CPUPlace, do nothing. | ||
| if (platform::is_cpu_place(place)) return; | ||
|
|
||
| VLOG(3) << "Deal StreamWaitEventOrSync for " | ||
| << instruction.kernel_func_.operator_base_->Type(); | ||
| auto* dev_ctx = instruction.dev_ctx_; | ||
|
|
||
| WaitOrSync(instruction.intput_events_, dev_ctx); | ||
| } | ||
|
|
||
| void EventManager::RecordEvent(const Instruction& instruction, | ||
| const OpFuncNode& op_func_node, | ||
| const platform::Place& place) { | ||
| // If InterpreterCore in on CPUPlace, do nothing. | ||
| if (platform::is_cpu_place(place)) return; | ||
|
|
||
| for (auto& event : instruction.output_events_) { | ||
| VLOG(3) << "Record event in out_var_id: " << event.var_id_; | ||
| event.event_->Record(instruction.dev_ctx_); | ||
| } | ||
| } | ||
|
|
||
| void EventManager::WaitOrSync(const std::vector<EventInter>& events, | ||
| const platform::DeviceContext* dev_ctx) { | ||
| for (auto& event_iter : events) { | ||
| if (event_iter.is_sync_) { | ||
| VLOG(3) << "host sync wait in_var_id " << event_iter.var_id_; | ||
| event_iter.event_->Wait(platform::kCPU, dev_ctx); | ||
| } else { | ||
| VLOG(3) << "stream async wait in_var_id " << event_iter.var_id_; | ||
| event_iter.event_->Wait(platform::kCUDA, dev_ctx); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } // namespace framework | ||
| } // namespace paddle |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #pragma once | ||
| #include "paddle/fluid/framework/new_executor/new_executor_defs.h" | ||
|
|
||
| namespace paddle { | ||
| namespace framework { | ||
|
|
||
| class EventManager { | ||
| public: | ||
| void RecordEvent(const Instruction& instruction, | ||
| const OpFuncNode& op_func_node, | ||
| const platform::Place& place); | ||
|
|
||
| void WaitEvent(const Instruction& instruction, const platform::Place& place); | ||
|
|
||
| private: | ||
| void WaitOrSync(const std::vector<EventInter>& events, | ||
| const platform::DeviceContext* dev_ctx); | ||
| }; | ||
|
|
||
| } // namespace framework | ||
| } // namespace paddle |
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
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
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
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
Oops, something went wrong.
3590bc9There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅Congratulation! Your pull request passed all required CI. You could ask reviewer(s) to approve and merge. 🎉