ZhennanQin commented on a change in pull request #13297: [MKLDNN]Add quantized concat URL: https://github.com/apache/incubator-mxnet/pull/13297#discussion_r235575791
########## File path: src/operator/quantization/quantized_concat.cc ########## @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +/*! + * Copyright (c) 2018 by Contributors + * \file quantized_concat.cc + * \brief +*/ + +#include "../nn/concat-inl.h" + +namespace mxnet { +namespace op { + +static bool ConcatShape(const nnvm::NodeAttrs& attrs, std::vector<TShape>* in_shape, + std::vector<TShape>* out_shape) { + using namespace mshadow; + const ConcatParam& param_ = nnvm::get<ConcatParam>(attrs.parsed); + CHECK_EQ(in_shape->size(), static_cast<size_t>(param_.num_args * 3)); + CHECK_EQ(out_shape->size(), 3U); + TShape dshape; + index_t size = 0; + bool has_zero = false; + int axis = -1; + for (int i = 0; i < param_.num_args; ++i) { + TShape tmp = (*in_shape)[i]; + if (tmp.ndim()) { + axis = CheckAxis(param_.dim, tmp.ndim()); + has_zero = tmp[axis] == 0 || has_zero; + size += tmp[axis]; + tmp[axis] = 0; + shape_assign(&dshape, tmp); + } + } + + TShape tmp = (*out_shape)[0]; + if (tmp.ndim()) { + axis = CheckAxis(param_.dim, tmp.ndim()); + tmp[axis] = 0; + shape_assign(&dshape, tmp); + } + + if (dshape.ndim() == 0) return false; + + for (int i = 0; i < param_.num_args; ++i) { + CHECK(shape_assign(&(*in_shape)[i], dshape)) + << "Incompatible input shape: expected " << dshape << ", got " << (*in_shape)[i]; + } + + if (!has_zero) dshape[axis] = size; + CHECK(shape_assign(&(*out_shape)[0], dshape)) + << "Incompatible output shape: expected " << dshape << ", got " << (*out_shape)[0]; + + for (int i = param_.num_args; i < param_.num_args * 3; ++i) { + SHAPE_ASSIGN_CHECK(*in_shape, i, TShape{1}); + } + SHAPE_ASSIGN_CHECK(*out_shape, 1, TShape{1}); + SHAPE_ASSIGN_CHECK(*out_shape, 2, TShape{1}); + return dshape.Size() != 0; +} + +static bool ConcatType(const nnvm::NodeAttrs& attrs, std::vector<int>* in_type, + std::vector<int>* out_type) { + const ConcatParam& param_ = nnvm::get<ConcatParam>(attrs.parsed); + CHECK_EQ(in_type->size(), static_cast<size_t>(param_.num_args * 3)); + CHECK_EQ(out_type->size(), 3U); + int dtype = mshadow::kUint8; + + for (int i = 0; i < param_.num_args; ++i) { + if (in_type->at(i) == mshadow::kInt8) { + dtype = mshadow::kInt8; + } else { + TYPE_ASSIGN_CHECK(*in_type, i, mshadow::kUint8); + } + } + TYPE_ASSIGN_CHECK(*out_type, 0, dtype); + TYPE_ASSIGN_CHECK(*out_type, 1, mshadow::kFloat32); + TYPE_ASSIGN_CHECK(*out_type, 2, mshadow::kFloat32); + + return true; +} + +NNVM_REGISTER_OP(_contrib_quantized_concat) +.describe(R"code(Joins input arrays along a given axis. + +The dimensions of the input arrays should be the same except the axis along +which they will be concatenated. +The dimension of the output array along the concatenated axis will be equal +to the sum of the corresponding dimensions of the input arrays. +All inputs with different min/max will be rescaled by using largest [min, max] pairs. +If any input holds int8, then the output will be int8. Otherwise output will be uint8. + +)code" ADD_FILELINE) +.set_num_inputs([](const NodeAttrs& attrs) { + const ConcatParam& params = nnvm::get<ConcatParam>(attrs.parsed); + return params.num_args * 3; +}) +.set_num_outputs(3) +.set_attr_parser(ParamParser<ConcatParam>) +.set_attr<nnvm::FListInputNames>("FListInputNames", [](const NodeAttrs& attrs) { + const ConcatParam& params = nnvm::get<ConcatParam>(attrs.parsed); + std::vector<std::string> ret; + for (int i = 0; i < params.num_args; ++i) { + ret.push_back(std::string("arg") + std::to_string(i)); + } + for (int i = params.num_args; i < params.num_args * 2; ++i) { Review comment: Yes, we suppose so. Because they are a part of op visible inputs. All quantized op follow this design, like quantized_conv, quantized_pooling. What kind of test do you want? Just test the ListInputNames functionality? It's not the scope of this PR. It should be covered by existing unit test. And I don't see any op adding test for checking its ListInputNames. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
