From 6b344cc71798305226f08f935d9a34f5073c8c2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Prasanna=20R/SNAP=20/SRI-Bangalore/Engineer/=EC=82=BC?= =?utf8?q?=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 4 Dec 2018 16:27:06 +0530 Subject: [PATCH] Redefining ArgMinMax CPU implementation as SimpleArgMinMax (#3812) This patch redefines ArgMinMax CPU implementation as SimpleArgMinMax, Since we follow adding 'Simple' as prefix for CPU implementation as a naming convention. Signed-off-by: prasannar --- runtimes/pure_arm_compute/src/compilation.cc | 4 ++-- .../src/internal/layers/{ArgMinMax.cc => SimpleArgMinMax.cc} | 8 ++++---- .../src/internal/layers/{ArgMinMax.h => SimpleArgMinMax.h} | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) rename runtimes/pure_arm_compute/src/internal/layers/{ArgMinMax.cc => SimpleArgMinMax.cc} (95%) rename runtimes/pure_arm_compute/src/internal/layers/{ArgMinMax.h => SimpleArgMinMax.h} (89%) diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc index dbe925d..aa88e82 100644 --- a/runtimes/pure_arm_compute/src/compilation.cc +++ b/runtimes/pure_arm_compute/src/compilation.cc @@ -105,7 +105,7 @@ #include "internal/layers/SimpleSpaceToBatchND.h" #include "internal/layers/SimpleNeg.h" #include "internal/layers/SimpleSQRT.h" -#include "internal/layers/ArgMinMax.h" +#include "internal/layers/SimpleArgMinMax.h" #include "util/matrix/IndexIterator.h" #include "util/kernel/IndexIterator.h" @@ -3716,7 +3716,7 @@ void Planner::visit(const ::internal::tflite::op::ArgMax::Node &node) auto ofm_alloc = ctx.at(::internal::tflite::operand::Index{param.ofm_index}); auto ifm_alloc = ctx.at(::internal::tflite::operand::Index{param.ifm_index}); - auto fn = nnfw::make_unique(); + auto fn = nnfw::make_unique(); bool is_min = false, is_max = true; fn->configure(CAST_CL(ifm_alloc), CAST_CL(ofm_alloc), param.axis, param.rank, is_min, is_max); diff --git a/runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.cc b/runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.cc similarity index 95% rename from runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.cc rename to runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.cc index be71e46..99d88dc 100644 --- a/runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.cc +++ b/runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "internal/layers/ArgMinMax.h" +#include "internal/layers/SimpleArgMinMax.h" #include -void ArgMinMax::configure(::arm_compute::ITensor *input, ::arm_compute::ITensor *output, - std::vector axis, int rank, bool is_min, bool is_max) +void SimpleArgMinMax::configure(::arm_compute::ITensor *input, ::arm_compute::ITensor *output, + std::vector axis, int rank, bool is_min, bool is_max) { _input = input; _output = output; @@ -132,7 +132,7 @@ inline void getArgMinMax(const ::arm_compute::ITensor *input, } } -void ArgMinMax::run() +void SimpleArgMinMax::run() { if (::internal::arm_compute::isGpuMode()) { diff --git a/runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.h b/runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.h similarity index 89% rename from runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.h rename to runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.h index 416efe5..91b46c2 100644 --- a/runtimes/pure_arm_compute/src/internal/layers/ArgMinMax.h +++ b/runtimes/pure_arm_compute/src/internal/layers/SimpleArgMinMax.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef __ARG_MIN_MAX_H__ -#define __ARG_MIN_MAX_H__ +#ifndef __SIMPLE_ARG_MIN_MAX_H__ +#define __SIMPLE_ARG_MIN_MAX_H__ #include "internal/arm_compute.h" -class ArgMinMax : public ::arm_compute::IFunction +class SimpleArgMinMax : public ::arm_compute::IFunction { public: - ArgMinMax(void) + SimpleArgMinMax(void) : _input(nullptr), _output(nullptr), _axis(), _input_rank(0), _is_min(false), _is_max(false) { // DO NOTHING @@ -53,4 +53,4 @@ private: bool _is_max; }; -#endif /*__ARG_MIN_MAX_H__ */ +#endif /*__SIMPLE_ARG_MIN_MAX_H__ */ -- 2.7.4