colin
/
TIM-VX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix slope shpae 1 crash issue (#663) 

graph compile will crash when shape is broadcast from 1 to 1,1,1,1

Type: Bug fix

Signed-off-by: Chen <jack.chen@verisilicon.com>
Co-authored-by: Chen <jack.chen@verisilicon.com>
This commit is contained in:
chxin66 2023-12-05 09:35:10 +08:00 committed by GitHub
parent 4578f40953
commit e013cf0a65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/tim/transform/ops/activation_layout_inference.h
View File

@ -73,40 +73,56 @@ class PReluLayoutInfer : public OpLayoutInfer {
auto slope_shape = src_slope->GetShape(); auto slope_shape = src_slope->GetShape();
auto input_pv = context_->GetPermuteVector(src_input); auto input_pv = context_->GetPermuteVector(src_input);
std::vector<uint32_t> boardcast_shape; std::vector<uint32_t> boardcast_shape;
for (uint32_t i = 0; i < input_shape.size(); ++i) { if (slope_shape.size() != 1) { // Need to be transposed along with the input
if (i < slope_shape.size()) { for (uint32_t i = 0; i < input_shape.size(); ++i) {
boardcast_shape.push_back(slope_shape[i]); if (i < slope_shape.size()) {
} else { boardcast_shape.push_back(slope_shape[i]);
boardcast_shape.push_back(1); } else {
boardcast_shape.push_back(1);
}
} }
}
if (src_slope->IsConstTensor()) { if (src_slope->IsConstTensor()) {
std::vector<uint8_t> dataRef(src_slope->GetSpec().GetByteSize()); std::vector<uint8_t> dataRef(src_slope->GetSpec().GetByteSize());
src_slope->CopyDataFromTensor(dataRef.data()); src_slope->CopyDataFromTensor(dataRef.data());
auto infer_slope_spec = src_slope->GetSpec(); auto infer_slope_spec = src_slope->GetSpec();
infer_slope_spec.SetShape(boardcast_shape); infer_slope_spec.SetShape(boardcast_shape);
auto infer_slope = context_->infer_graph_->CreateTensor( auto infer_slope = context_->infer_graph_->CreateTensor(
infer_slope_spec, (const void*)dataRef.data()); infer_slope_spec, (const void*)dataRef.data());
if (!input_pv->IsAligned()) { if (!input_pv->IsAligned()) {
//The dimension of slop is already the same as input, directly use input_pv to convert //The dimension of slop is already the same as input, directly use input_pv to convert
auto out_slope = PermuteConstTensor(infer_slope, input_pv); auto out_slope = PermuteConstTensor(infer_slope, input_pv);
context_->UpdateTensorMap(src_slope, out_slope); context_->UpdateTensorMap(src_slope, out_slope);
} else {
context_->UpdateTensorMap(src_slope, infer_slope);
}
} else { } else {
auto infer_slope_spec = src_slope->GetSpec().AsTransientSpec();
auto reshape_out =
context_->infer_graph_->CreateTensor(infer_slope_spec);
boardcast_shape =
MapMultipleAxis(input_pv->AsStdVec(), boardcast_shape);
auto reshape =
context_->infer_graph_->CreateOperation<vx::ops::Reshape>(
boardcast_shape);
(*reshape)
.BindInput(context_->GetMapedTensor(src_slope))
.BindOutput(reshape_out);
context_->UpdateTensorMap(src_slope, reshape_out);
}
context_->SetPermuteVector(src_slope, input_pv);
} else { // 1d slope tensor need not transpose
if (src_slope->IsConstTensor()) {
std::vector<uint8_t> dataRef(src_slope->GetSpec().GetByteSize());
src_slope->CopyDataFromTensor(dataRef.data());
auto infer_slope_spec = src_slope->GetSpec();
auto infer_slope = context_->infer_graph_->CreateTensor(
infer_slope_spec, (const void*)dataRef.data());
context_->UpdateTensorMap(src_slope, infer_slope); context_->UpdateTensorMap(src_slope, infer_slope);
context_->SetPermuteVector(src_slope, MakeShared(1));
} }
} else {
auto infer_slope_spec = src_slope->GetSpec().AsTransientSpec();
auto reshape_out = context_->infer_graph_->CreateTensor(infer_slope_spec);
boardcast_shape = MapMultipleAxis(input_pv->AsStdVec(), boardcast_shape);
auto reshape = context_->infer_graph_->CreateOperation<vx::ops::Reshape>(boardcast_shape);
(*reshape)
.BindInput(context_->GetMapedTensor(src_slope))
.BindOutput(reshape_out);
context_->UpdateTensorMap(src_slope, reshape_out);
} }
context_->SetPermuteVector(src_slope, input_pv);
auto axis = auto axis =
MapAxis(input_pv->AsStdVec(), op_->impl()->node()->nn_param.prelu.axis); MapAxis(input_pv->AsStdVec(), op_->impl()->node()->nn_param.prelu.axis);