!13969 [MSLITE] Fix bug of pad operator.
From: @wang_shaocong Reviewed-by: @zhanghaibo5,@zhang_xue_tong Signed-off-by: @zhang_xue_tongpull/13969/MERGE
mindspore-ci-bot
4 years ago
committed by
Gitee
commit
4f0ad9398e
@ -0,0 +1,143 @@
|
||||
/**
|
||||
* Copyright 2021 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 "tools/optimizer/graph/onnx_pad_adjust_pass.h"
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
#include "ops/reshape.h"
|
||||
#include "ops/transpose.h"
|
||||
#include "ops/primitive_c.h"
|
||||
#include "src/param_value_lite.h"
|
||||
#include "tools/optimizer/common/gllo_utils.h"
|
||||
|
||||
namespace mindspore::opt {
|
||||
namespace {
|
||||
constexpr uint32_t kTripleNum = 3;
|
||||
} // namespace
|
||||
ParameterPtr OnnxPadAdjustPass::CreateNewParameter(const FuncGraphPtr &func_graph, const std::vector<int> &data) {
|
||||
MS_ASSERT(func_graph != nullptr);
|
||||
MS_ASSERT(data != nullptr);
|
||||
auto parameter = func_graph->add_parameter();
|
||||
std::vector<int> shape;
|
||||
shape.push_back(static_cast<int>(data.size()));
|
||||
std::vector<int64_t> shape_vector;
|
||||
(void)std::transform(shape.begin(), shape.end(), std::back_inserter(shape_vector),
|
||||
[](const int32_t &value) { return static_cast<int64_t>(value); });
|
||||
auto type_id = static_cast<TypeId>(kNumberTypeInt32);
|
||||
auto type_ptr = TypeIdToType(type_id);
|
||||
auto abstract_tensor = std::make_shared<abstract::AbstractTensor>(type_ptr, shape_vector);
|
||||
parameter->set_abstract(abstract_tensor);
|
||||
|
||||
ParamValueLitePtr param_value = std::make_shared<ParamValueLite>();
|
||||
MS_ASSERT(param_value != nullptr);
|
||||
param_value->set_tensor_shape(shape);
|
||||
param_value->set_tensor_type(type_id);
|
||||
param_value->set_format(schema::Format_NCHW);
|
||||
|
||||
size_t size = data.size() * sizeof(int);
|
||||
auto tensor_data = new (std::nothrow) uint8_t[size];
|
||||
if (tensor_data == nullptr) {
|
||||
MS_LOG(ERROR) << "tensor_data is nullptr";
|
||||
return nullptr;
|
||||
}
|
||||
auto ret = memcpy_s(tensor_data, size, data.data(), size);
|
||||
if (ret != 0) {
|
||||
MS_LOG(ERROR) << "set tensor data failed.";
|
||||
return nullptr;
|
||||
}
|
||||
param_value->SetTensorData(tensor_data, size);
|
||||
parameter->set_default_param(param_value);
|
||||
return parameter;
|
||||
}
|
||||
|
||||
CNodePtr OnnxPadAdjustPass::NewReshapeOpNode(const FuncGraphPtr &func_graph, const AnfNodePtr input_node,
|
||||
const std::vector<int> &shape) {
|
||||
auto reshape_prim = std::make_shared<ops::Reshape>();
|
||||
if (reshape_prim == nullptr) {
|
||||
MS_LOG(ERROR) << "create reshape failed.";
|
||||
return nullptr;
|
||||
}
|
||||
reshape_prim->set_attr("shape", MakeValue(shape));
|
||||
ValueNodePtr value_node = NewValueNode(reshape_prim);
|
||||
auto new_parameter = CreateNewParameter(func_graph, shape);
|
||||
new_parameter->set_name(input_node->fullname_with_scope() + "_reshape/shape");
|
||||
std::vector<AnfNodePtr> op_inputs = {value_node, input_node, new_parameter};
|
||||
auto reshape = func_graph->NewCNode(op_inputs);
|
||||
reshape->set_fullname_with_scope(input_node->fullname_with_scope() + "_reshape");
|
||||
return reshape;
|
||||
}
|
||||
|
||||
CNodePtr OnnxPadAdjustPass::NewTransposeOpNode(const FuncGraphPtr &func_graph, const AnfNodePtr input_node,
|
||||
std::vector<int> perm) {
|
||||
auto transpose_prim = std::make_shared<ops::Transpose>();
|
||||
if (transpose_prim == nullptr) {
|
||||
MS_LOG(ERROR) << "create transpose failed.";
|
||||
return nullptr;
|
||||
}
|
||||
transpose_prim->set_attr("perm", MakeValue(perm));
|
||||
ValueNodePtr value_node = NewValueNode(transpose_prim);
|
||||
auto new_parameter = CreateNewParameter(func_graph, perm);
|
||||
new_parameter->set_name(input_node->fullname_with_scope() + "_transpose/perm");
|
||||
std::vector<AnfNodePtr> op_inputs = {value_node, input_node, new_parameter};
|
||||
auto reshape = func_graph->NewCNode(op_inputs);
|
||||
reshape->set_fullname_with_scope(input_node->fullname_with_scope() + "_transpose");
|
||||
return reshape;
|
||||
}
|
||||
|
||||
bool OnnxPadAdjustPass::Run(const FuncGraphPtr &func_graph) {
|
||||
MS_ASSERT(func_graph != nullptr);
|
||||
auto cnodes = func_graph->GetOrderedCnodes();
|
||||
for (auto &cnode : cnodes) {
|
||||
if (!CheckPrimitiveType(cnode, prim::kPrimPadFusion) || cnode->inputs().size() != kTripleNum) {
|
||||
continue;
|
||||
}
|
||||
// get the second input node whose output is the padding parameter of pad.
|
||||
auto input_node = cnode->input(2);
|
||||
if (!input_node->isa<CNode>()) {
|
||||
continue;
|
||||
}
|
||||
// reshape the padding of pad operator to 2 x 4.
|
||||
std::vector<int> shape_pre = {2, 4};
|
||||
auto reshape_pre = NewReshapeOpNode(func_graph, input_node, shape_pre);
|
||||
if (reshape_pre == nullptr) {
|
||||
MS_LOG(ERROR) << "create reshape failed.";
|
||||
return false;
|
||||
}
|
||||
std::vector<int> perm = {1, 0};
|
||||
auto transpose = NewTransposeOpNode(func_graph, reshape_pre, perm);
|
||||
if (transpose == nullptr) {
|
||||
MS_LOG(ERROR) << "create transpose failed.";
|
||||
return false;
|
||||
}
|
||||
// reshape the padding of pad operator to -1.
|
||||
std::vector<int> shape_pos = {-1};
|
||||
auto reshape_pos = NewReshapeOpNode(func_graph, transpose, shape_pos);
|
||||
if (reshape_pos == nullptr) {
|
||||
MS_LOG(ERROR) << "create reshape failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto manager = func_graph->manager();
|
||||
if (manager == nullptr) {
|
||||
MS_LOG(ERROR) << "manager is nullptr.";
|
||||
return false;
|
||||
}
|
||||
manager->Replace(input_node, reshape_pos);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
} // namespace mindspore::opt
|
||||
@ -0,0 +1,38 @@
|
||||
/**
|
||||
* Copyright 2021 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.
|
||||
*/
|
||||
|
||||
#ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_ONNX_PAD_ADJUST_PASS_H_
|
||||
#define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_ONNX_PAD_ADJUST_PASS_H_
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "backend/optimizer/common/pass.h"
|
||||
#include "backend/optimizer/common/optimizer.h"
|
||||
|
||||
namespace mindspore::opt {
|
||||
class OnnxPadAdjustPass : public Pass {
|
||||
public:
|
||||
OnnxPadAdjustPass() : Pass("onnx_pad_adjust") {}
|
||||
~OnnxPadAdjustPass() override = default;
|
||||
|
||||
bool Run(const FuncGraphPtr &func_graph) override;
|
||||
|
||||
private:
|
||||
ParameterPtr CreateNewParameter(const FuncGraphPtr &func_graph, const std::vector<int> &data);
|
||||
CNodePtr NewReshapeOpNode(const FuncGraphPtr &func_graph, const AnfNodePtr input_node, const std::vector<int> &shape);
|
||||
CNodePtr NewTransposeOpNode(const FuncGraphPtr &func_graph, const AnfNodePtr input_node, std::vector<int> perm);
|
||||
};
|
||||
} // namespace mindspore::opt
|
||||
#endif // MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_ONNX_PAD_ADJUST_PASS_H_
|
||||
Loading…
Reference in new issue