Browse Source

modify MemcpyAddrAsyncPass::run

pull/1681/head^2
zhengyuanhua 4 years ago
parent
commit
f62a61f306
3 changed files with 56 additions and 8 deletions
  1. +7
    -7
      ge/graph/passes/memcpy_addr_async_pass.cc
  2. +2
    -1
      tests/ut/ge/CMakeLists.txt
  3. +47
    -0
      tests/ut/ge/graph/passes/memcpy_addr_async_unittest.cc

+ 7
- 7
ge/graph/passes/memcpy_addr_async_pass.cc View File

@@ -25,15 +25,15 @@
namespace ge {
Status MemcpyAddrAsyncPass::Run(ComputeGraphPtr graph) {
GE_CHECK_NOTNULL(graph);
for (const auto &node : graph->GetAllNodes()) {
if (node->GetType() == STREAMSWITCH) {
auto sub_graph = node->GetOwnerComputeGraph();
if (sub_graph != nullptr && !sub_graph->GetGraphUnknownFlag()) {
GE_CHK_STATUS_RET(AddMemcpyAsyncNode(node), "Add memcpyasync node failed in known subgraph.");
if (graph->GetGraphUnknownFlag()) {
for (const auto &node : graph->GetAllNodes()) {
if (node->GetType() == STREAMSWITCH) {
auto sub_graph = node->GetOwnerComputeGraph();
if (sub_graph != nullptr && !sub_graph->GetGraphUnknownFlag()) {
GE_CHK_STATUS_RET(AddMemcpyAsyncNode(node), "Add memcpyasync node failed in known subgraph.");
}
}
}
}
if (graph->GetGraphUnknownFlag()) {
GELOGD("Graph[%s] is unknown graph, skip.", graph->GetName().c_str());
return SUCCESS;
}


+ 2
- 1
tests/ut/ge/CMakeLists.txt View File

@@ -669,7 +669,8 @@ set(PASS_TEST_FILES
"graph/passes/permute_pass_unittest.cc"
"graph/passes/print_op_pass_unittest.cc"
"graph/passes/shape_operate_op_remove_pass_unittest.cc"
"graph/passes/variable_op_pass_unittest.cc"
"graph/passes/variable_op_pass_unittest.cc"
"graph/passes/memcpy_addr_async_unittest.cc"
"graph/passes/base_pass_unittest.cc"
"graph/passes/addn_pass_unittest.cc"
"graph/passes/save_pass_unittest.cc"


+ 47
- 0
tests/ut/ge/graph/passes/memcpy_addr_async_unittest.cc View File

@@ -0,0 +1,47 @@
/**
* Copyright 2019-2020 Huawei Technologies Co., Ltd
*
* 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 <gtest/gtest.h>
#include <cstdint>
#include <memory>
#include <string>

#define private public
#include "graph/passes/memcpy_addr_async_pass.h"
#include "common/ge_inner_error_codes.h"
#include "inc/pass_manager.h"
#undef private

namespace ge {
class UtestMemcpyAddrAsyncPass : public testing::Test {
protected:
void SetUp() {}
void TearDown() {}
};

TEST_F(UtestMemcpyAddrAsyncPass, run) {
ge::ComputeGraphPtr graph = std::make_shared<ge::ComputeGraph>("default");
ge::OpDescPtr op = std::make_shared<ge::OpDesc>();
op->SetType(STREAMSWITCH);
op->SetName("stream_switch");
op->AddOutputDesc(ge::GeTensorDesc());
ge::NodePtr node = graph->AddNode(op);
graph->SetGraphUnknownFlag(true);
MemcpyAddrAsyncPass pass;
Status ret = pass.Run(graph);
EXPECT_EQ(ret, SUCCESS);
}
} // namespace ge

Loading…
Cancel
Save