[NNAdapter][Ascend][Host] Add softplus op and shuffle_channel, fix interpolate scales vector maybe empty bug

lite/backends/nnadapter/nnadapter/core/operation/all.h

@@ -27,6 +27,7 @@ REGISTER_OPERATION(AVERAGE_POOL_2D, PreparePool2D)
 REGISTER_OPERATION(BATCH_NORMALIZATION, PrepareBatchNormalization)
 REGISTER_OPERATION(CAST, PrepareCast)
 REGISTER_OPERATION(CLIP, PrepareClip)
+REGISTER_OPERATION(CHANNEL_SHUFFLE, PrepareChannelShuffle)
 REGISTER_OPERATION(CONCAT, PrepareConcat)
 REGISTER_OPERATION(CONV_2D, PrepareConv2D)
 REGISTER_OPERATION(CONV_2D_TRANSPOSE, PrepareConv2DTranspose)
@@ -81,6 +82,7 @@ REGISTER_OPERATION(SHAPE, PrepareShape)
 REGISTER_OPERATION(SIGMOID, PrepareUnaryActivations)
 REGISTER_OPERATION(SLICE, PrepareSlice)
 REGISTER_OPERATION(SOFTMAX, PrepareSoftmax)
+REGISTER_OPERATION(SOFTPLUS, PrepareSoftplus)
 REGISTER_OPERATION(SPLIT, PrepareSplit)
 REGISTER_OPERATION(SQUARE, PrepareUnaryActivations)
 REGISTER_OPERATION(SQUEEZE, PrepareSqueeze)

lite/backends/nnadapter/nnadapter/core/operation/channel_shuffle.cc

@@ -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.
+
+#include "core/operation/channel_shuffle.h"
+#include "core/hal/types.h"
+#include "utility/debug.h"
+#include "utility/logging.h"
+#include "utility/modeling.h"
+#include "utility/utility.h"
+
+namespace nnadapter {
+namespace operation {
+
+int PrepareChannelShuffle(hal::Operation* operation) {
+  CHANNEL_SHUFFLE_OPERATION_EXTRACT_INPUTS_OUTPUTS
+
+  // Infer the shape and type of output operands
+  CopyOperandTypeExceptQuantParams(&output_operand->type, input_operand->type);
+  NNADAPTER_VLOG(5) << "output: " << OperandToString(output_operand);
+  return NNADAPTER_NO_ERROR;
+}
+
+}  // namespace operation
+}  // namespace nnadapter

lite/backends/nnadapter/nnadapter/core/operation/channel_shuffle.h

@@ -0,0 +1,38 @@
+// 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
+
+namespace nnadapter {
+namespace operation {
+
+#define CHANNEL_SHUFFLE_OPERATION_EXTRACT_INPUTS_OUTPUTS                    \
+  auto& input_operands = operation->input_operands;                         \
+  auto& output_operands = operation->output_operands;                       \
+  auto input_count = input_operands.size();                                 \
+  auto output_count = output_operands.size();                               \
+  NNADAPTER_CHECK_EQ(input_count, 2);                                       \
+  NNADAPTER_CHECK_EQ(output_count, 1);                                      \
+  /* Input */                                                               \
+  auto input_operand = input_operands[0];                                   \
+  NNADAPTER_VLOG(5) << "input_operand: " << OperandToString(input_operand); \
+  /* Group */                                                               \
+  int32_t group = *reinterpret_cast<int32_t*>(input_operands[1]->buffer);   \
+  NNADAPTER_VLOG(5) << "group: " << group;                                  \
+  /* Output */                                                              \
+  auto output_operand = output_operands[0];                                 \
+  NNADAPTER_VLOG(5) << "output: " << OperandToString(output_operand);
+
+}  // namespace operation
+}  // namespace nnadapter

lite/backends/nnadapter/nnadapter/core/operation/softplus.cc

@@ -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.
+
+#include "core/operation/softplus.h"
+#include "core/hal/types.h"
+#include "utility/debug.h"
+#include "utility/logging.h"
+#include "utility/modeling.h"
+#include "utility/utility.h"
+
+namespace nnadapter {
+namespace operation {
+
+int PrepareSoftplus(hal::Operation* operation) {
+  SOFTPLUS_OPERATION_EXTRACT_INPUTS_OUTPUTS
+
+  // Infer the shape and type of output operands
+  CopyOperandTypeExceptQuantParams(&output_operand->type, input_operand->type);
+  NNADAPTER_VLOG(5) << "output: " << OperandToString(output_operand);
+  return NNADAPTER_NO_ERROR;
+}
+
+}  // namespace operation
+}  // namespace nnadapter

lite/backends/nnadapter/nnadapter/core/operation/softplus.h

@@ -0,0 +1,41 @@
+// 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
+
+namespace nnadapter {
+namespace operation {
+
+#define SOFTPLUS_OPERATION_EXTRACT_INPUTS_OUTPUTS                           \
+  auto& input_operands = operation->input_operands;                         \
+  auto& output_operands = operation->output_operands;                       \
+  auto input_count = input_operands.size();                                 \
+  auto output_count = output_operands.size();                               \
+  NNADAPTER_CHECK_EQ(input_count, 3);                                       \
+  NNADAPTER_CHECK_EQ(output_count, 1);                                      \
+  /* Input */                                                               \
+  auto input_operand = input_operands[0];                                   \
+  NNADAPTER_VLOG(5) << "input_operand: " << OperandToString(input_operand); \
+  /* Beta */                                                                \
+  float beta = *reinterpret_cast<float*>(input_operands[1]->buffer);        \
+  NNADAPTER_VLOG(5) << "beta: " << beta;                                    \
+  /* Threshold */                                                           \
+  float threshold = *reinterpret_cast<float*>(input_operands[2]->buffer);   \
+  NNADAPTER_VLOG(5) << "threshold: " << threshold;                          \
+  /* Output */                                                              \
+  auto output_operand = output_operands[0];                                 \
+  NNADAPTER_VLOG(5) << "output: " << OperandToString(output_operand);
+
+}  // namespace operation
+}  // namespace nnadapter

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/all.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.
@@ -27,6 +27,7 @@ REGISTER_CONVERTER(AVERAGE_POOL_2D, ConvertPool2D)
 REGISTER_CONVERTER(BATCH_NORMALIZATION, ConvertBatchNormalization)
 REGISTER_CONVERTER(CAST, ConvertCast)
 REGISTER_CONVERTER(CLIP, ConvertClip)
+REGISTER_CONVERTER(CHANNEL_SHUFFLE, ConvertChannelShuffle)
 REGISTER_CONVERTER(CONCAT, ConvertConcat)
 REGISTER_CONVERTER(CONV_2D, ConvertConv2D)
 REGISTER_CONVERTER(CONV_2D_TRANSPOSE, ConvertConv2DTranspose)
@@ -81,6 +82,7 @@ REGISTER_CONVERTER(SHAPE, ConvertShape)
 REGISTER_CONVERTER(SIGMOID, ConvertUnaryActivations)
 REGISTER_CONVERTER(SLICE, ConvertSlice)
 REGISTER_CONVERTER(SOFTMAX, ConvertSoftmax)
+REGISTER_CONVERTER(SOFTPLUS, ConvertSoftplus)
 REGISTER_CONVERTER(SPLIT, ConvertSplit)
 REGISTER_CONVERTER(SQUARE, ConvertUnaryActivations)
 REGISTER_CONVERTER(SQUEEZE, ConvertSqueeze)

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/batch_normalization.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/channel_shuffle.cc

@@ -0,0 +1,40 @@
+// 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 "core/operation/channel_shuffle.h"
+#include "driver/huawei_ascend_npu/converter/converter.h"
+#include "utility/debug.h"
+#include "utility/logging.h"
+
+namespace nnadapter {
+namespace huawei_ascend_npu {
+
+int ConvertChannelShuffle(Converter* converter, hal::Operation* operation) {
+  CHANNEL_SHUFFLE_OPERATION_EXTRACT_INPUTS_OUTPUTS
+
+  // Convert to GE operators
+  auto input_operator = converter->GetMappedOperator(input_operand);
+  if (!input_operator) {
+    input_operator = converter->ConvertOperand(input_operand);
+  }
+  auto shuffle_channel_op =
+      converter->AddOperator<ge::op::ShuffleChannel>(output_operand);
+  shuffle_channel_op->set_attr_group(group);
+  SET_INPUT(shuffle_channel_op, x, input_operator);
+  MAP_OUTPUT(shuffle_channel_op, y, output_operand);
+  return NNADAPTER_NO_ERROR;
+}
+
+}  // namespace huawei_ascend_npu
+}  // namespace nnadapter

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/clip.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/concat.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/converter.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/converter.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/cum_sum.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/elementwise.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/expand.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/flatten.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/fully_connected.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/gather.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/group_normalization.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/instance_normalization.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/layer_normalization.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/leaky_relu.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/pad.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/pool2d.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/pow.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/range.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/reduce.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/reshape.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/roi_align.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/slice.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.

lite/backends/nnadapter/nnadapter/driver/huawei_ascend_npu/converter/softmax.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+// 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.