add argmin and argmax op

This commit is contained in:
zhengzhouheng 2021-04-15 16:09:24 +08:00 committed by Kainan Cha
parent c9d3416c6b
commit eff71c38bf
3 changed files with 97 additions and 2 deletions

50
include/tim/vx/ops/arg.h Executable file
View File

@ -0,0 +1,50 @@
/****************************************************************************
*
* Copyright (c) 2021 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_VX_OPS_ARG_H_
#define TIM_VX_OPS_ARG_H_
#include "tim/vx/operation.h"
namespace tim {
namespace vx {
namespace ops {
#define DECLARE_ARG_OP(NAME) \
class Arg##NAME : public Operation { \
public: \
Arg##NAME(Graph* graph, int32_t axis); \
\
protected: \
int32_t axis_; \
};
DECLARE_ARG_OP(Min);
DECLARE_ARG_OP(Max);
#undef DECLARE_ARG_OP
} // namespace ops
} // namespace vx
} // namespace tim
#endif /* TIM_VX_OPS_ARG_H_ */

View File

@ -30,7 +30,7 @@ Relu|RELU|Mapped
L2Normalization|L2_NORMALIZE|Mapped
FullyConnected|FCL2|Mapped
||POOLWITHARGMAX|Unmapped
||ARGMAX|Unmapped
ArgMax|ARGMAX|Mapped
Maximum|MAXIMUM|Mapped
L2Normalization|L2NORMALIZESCALE|Mapped
||CROP|Unmapped
@ -111,7 +111,7 @@ Gather|GATHER|Mapped
LogicalNot|LOGICAL_NOT|Mapped
Sin|SIN|Mapped
Log|LOG|Mapped
||ARGMIN|Unmapped
ArgMin|ARGMIN|Mapped
||ROI_ALIGN|Unmapped
||HEATMAP_MAX_KEYPOINT|Unmapped
||AXIS_ALIGNED_BBOX_TRANSFORM|Unmapped

45
src/tim/vx/ops/arg.cc Executable file
View File

@ -0,0 +1,45 @@
/****************************************************************************
*
* Copyright (c) 2021 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.
*
*****************************************************************************/
#include "tim/vx/ops/arg.h"
#include "vsi_nn_pub.h"
#include "operation_private.h"
namespace tim {
namespace vx {
namespace ops {
#define DEFINE_ARG_OP(NAME, VSI_OP_TYPE, OP_PARAM) \
Arg##NAME::Arg##NAME(Graph* graph, int32_t axis) \
: Operation(graph, VSI_NN_OP_ARG##VSI_OP_TYPE), axis_(axis) { \
this->impl()->node()->nn_param.arg##OP_PARAM.axis = axis_; \
}
DEFINE_ARG_OP(Max, MAX, max);
DEFINE_ARG_OP(Min, MIN, min);
#undef DEFINE_ARG_OP
} // namespace ops
} // namespace vx
} // namespace tim