Added broadcast layout infernece (#438)
Signed-off-by: Chen Xin <jack.chen@verisilicon.com> Co-authored-by: Chen Xin <jack.chen@verisilicon.com>
This commit is contained in:
parent
7d88a668e3
commit
cfe8c808bd
|
|
@ -63,6 +63,7 @@
|
||||||
#include "ops/default_layout_inference.h"
|
#include "ops/default_layout_inference.h"
|
||||||
#include "ops/transpose_layout_inference.h"
|
#include "ops/transpose_layout_inference.h"
|
||||||
#include "ops/unidirectional_lstm_layout_inference.h"
|
#include "ops/unidirectional_lstm_layout_inference.h"
|
||||||
|
#include "ops/broadcast_layout_inference.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|
@ -265,6 +266,7 @@ std::vector<std::shared_ptr<vx::Tensor>> HandleLayoutInfer(
|
||||||
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_PERMUTE, Transpose);
|
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_PERMUTE, Transpose);
|
||||||
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_CONV3D, Conv3d);
|
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_CONV3D, Conv3d);
|
||||||
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_LSTM_OVXLIB, UnidirectionalLstm);
|
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_LSTM_OVXLIB, UnidirectionalLstm);
|
||||||
|
REGIST_LAYOUT_INFERENCE(VSI_NN_OP_EXPAND_BROADCAST, Broadcast);
|
||||||
REGIST_LOGICAL_LAYOUT_INFERENCE(VSI_NN_OP_LOGICAL_OPS);
|
REGIST_LOGICAL_LAYOUT_INFERENCE(VSI_NN_OP_LOGICAL_OPS);
|
||||||
REGIST_REDUCE_LAYOUT_INFERENCE(VSI_NN_OP_REDUCE);
|
REGIST_REDUCE_LAYOUT_INFERENCE(VSI_NN_OP_REDUCE);
|
||||||
// use default layout inference
|
// use default layout inference
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
/****************************************************************************
|
||||||
|
*
|
||||||
|
* Copyright (c) 2022 Vivante Corporation
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
* DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
#ifndef TIM_LAYOUT_INFER_BROADCAST_LAYOUT_INFERENCE_H_
|
||||||
|
#define TIM_LAYOUT_INFER_BROADCAST_LAYOUT_INFERENCE_H_
|
||||||
|
|
||||||
|
#include "ops/op_layout_inference.h"
|
||||||
|
#include "permute_vector.h"
|
||||||
|
#include "direct_map_op_impl.h"
|
||||||
|
|
||||||
|
namespace tim {
|
||||||
|
namespace transform {
|
||||||
|
|
||||||
|
class BroadcastLayoutInfer : public OpLayoutInfer {
|
||||||
|
public:
|
||||||
|
BroadcastLayoutInfer(
|
||||||
|
const std::shared_ptr<vx::Operation> op,
|
||||||
|
std::shared_ptr<layout_inference_impl::LayoutInferContext>& context)
|
||||||
|
: OpLayoutInfer(op, context) {}
|
||||||
|
|
||||||
|
// reverse any applied permute on it's input tensor
|
||||||
|
void OnInputs(
|
||||||
|
std::vector<std::shared_ptr<vx::Tensor>>& next_tensors) override {
|
||||||
|
ReverseInputsPermuteVector();
|
||||||
|
|
||||||
|
auto cloned_op = op_->Clone(context_->infer_graph_);
|
||||||
|
|
||||||
|
for (const auto& i_src : op_->impl()->InputsTensor()) {
|
||||||
|
(*cloned_op).BindInput(context_->GetMapedTensor(i_src));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::shared_ptr<IPermuteVector>> required_pv_lst;
|
||||||
|
for (auto out_tensor : op_->impl()->OutputsTensor()) {
|
||||||
|
required_pv_lst.push_back(
|
||||||
|
MakeShared(op_->impl()->node()->nn_param.expand_broadcast.dim_num));
|
||||||
|
}
|
||||||
|
auto out_infer = CreateOutputsTensor(required_pv_lst);
|
||||||
|
|
||||||
|
(*cloned_op).BindOutputs(out_infer);
|
||||||
|
uint32_t i = 0;
|
||||||
|
for (auto out_tensor : op_->impl()->OutputsTensor()) {
|
||||||
|
context_->SetPermuteVector(out_tensor, required_pv_lst[i++]);
|
||||||
|
next_tensors.push_back(out_tensor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace transform
|
||||||
|
} // namespace tim
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue