From 186bf91d170c9edcfdcda9ab937c047c112524f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 5 Dec 2018 12:08:23 +0900 Subject: [PATCH] Change operator TENSORFLOW_SUM name (#3747) Change operator ANEURALNETWORKS_TENSORFLOW_SUM_EX name to ANEURALNETWORKS_REDUCE_SUM_EX Signed-off-by: Hyeongseok Oh --- include/NeuralNetworksEx.h | 12 +-- libs/support/tflite/src/nnapi_delegate.cpp | 4 +- runtimes/pure_arm_compute/src/model.cc | 2 +- .../generated/all_generated_tests.cpp | 112 ++++++++++----------- ...mple.cpp => reduce_sum_ex_2D_float.example.cpp} | 2 +- ...mple.cpp => reduce_sum_ex_4D_float.example.cpp} | 2 +- ... reduce_sum_ex_4D_float_reducing_C.example.cpp} | 2 +- ...reduce_sum_ex_4D_float_reducing_HW.example.cpp} | 2 +- ....model.cpp => reduce_sum_ex_2D_float.model.cpp} | 4 +- ....model.cpp => reduce_sum_ex_4D_float.model.cpp} | 4 +- ...=> reduce_sum_ex_4D_float_reducing_C.model.cpp} | 4 +- ...> reduce_sum_ex_4D_float_reducing_HW.model.cpp} | 4 +- ...me_run_android_nn_test.skip.armv7l-linux.neurun | 2 +- .../runtime_run_android_nn_test.skip.armv7l-tizen | 4 +- .../runtime_run_android_nn_test.skip.x86_64-linux | 2 +- ..._float.mod.py => reduce_sum_ex_2D_float.mod.py} | 2 +- ..._float.mod.py => reduce_sum_ex_4D_float.mod.py} | 2 +- ...py => reduce_sum_ex_4D_float_reducing_C.mod.py} | 2 +- ...y => reduce_sum_ex_4D_float_reducing_HW.mod.py} | 2 +- 19 files changed, 85 insertions(+), 85 deletions(-) rename runtimes/tests/neural_networks_test/generated/examples/{tensorflowsum_ex_2D_float.example.cpp => reduce_sum_ex_2D_float.example.cpp} (87%) rename runtimes/tests/neural_networks_test/generated/examples/{tensorflowsum_ex_4D_float.example.cpp => reduce_sum_ex_4D_float.example.cpp} (87%) rename runtimes/tests/neural_networks_test/generated/examples/{tensorflowsum_ex_4D_float_reducing_C.example.cpp => reduce_sum_ex_4D_float_reducing_C.example.cpp} (92%) rename runtimes/tests/neural_networks_test/generated/examples/{tensorflowsum_ex_4D_float_reducing_HW.example.cpp => reduce_sum_ex_4D_float_reducing_HW.example.cpp} (91%) rename runtimes/tests/neural_networks_test/generated/models/{tensorflowsum_ex_2D_float.model.cpp => reduce_sum_ex_2D_float.model.cpp} (81%) rename runtimes/tests/neural_networks_test/generated/models/{tensorflowsum_ex_4D_float.model.cpp => reduce_sum_ex_4D_float.model.cpp} (81%) rename runtimes/tests/neural_networks_test/generated/models/{tensorflowsum_ex_4D_float_reducing_C.model.cpp => reduce_sum_ex_4D_float_reducing_C.model.cpp} (80%) rename runtimes/tests/neural_networks_test/generated/models/{tensorflowsum_ex_4D_float_reducing_HW.model.cpp => reduce_sum_ex_4D_float_reducing_HW.model.cpp} (80%) rename runtimes/tests/neural_networks_test/specs/Ex/{tensorflowsum_ex_2D_float.mod.py => reduce_sum_ex_2D_float.mod.py} (87%) rename runtimes/tests/neural_networks_test/specs/Ex/{tensorflowsum_ex_4D_float.mod.py => reduce_sum_ex_4D_float.mod.py} (87%) rename runtimes/tests/neural_networks_test/specs/Ex/{tensorflowsum_ex_4D_float_reducing_C.mod.py => reduce_sum_ex_4D_float_reducing_C.mod.py} (93%) rename runtimes/tests/neural_networks_test/specs/Ex/{tensorflowsum_ex_4D_float_reducing_HW.mod.py => reduce_sum_ex_4D_float_reducing_HW.mod.py} (93%) diff --git a/include/NeuralNetworksEx.h b/include/NeuralNetworksEx.h index 3785b85..a877b83 100644 --- a/include/NeuralNetworksEx.h +++ b/include/NeuralNetworksEx.h @@ -271,18 +271,18 @@ typedef enum { * Outputs: * * 0: A tensor of the same {@link OperandCode} as input0. */ - ANEURALNETWORKS_TENSORFLOW_SUM_EX = 50009, + ANEURALNETWORKS_REDUCE_SUM_EX = 50009, /** * A transposed convolutional layer carries out a regular convolution but reverts its spatisal transformation. * Transpose convolution basically performs convolution with transposed weights. - * + * * Supported tensor {@link OperandCode}: * {@link ANEURALNETWORKS_TENSOR_FLOAT32} * {@link ANEURALNETWORKS_TENSOR_INT32} - * + * * Supported tensor rank: only 4 - * + * * Inputs: * 0: An {@link ANEURALNETWORKS_INT32} 1-D four element tensor, specifying the output shape. * 1: A 4-D tensor, of shape [depth_out, filter_height, filter_width, depth_in], specifying the filter. @@ -292,7 +292,7 @@ typedef enum { * walking through input in the ‘width’ dimension. * 5: An {@link ANEURALNETWORKS_INT32} scalar, specifying the stride when * walking through input in the height dimension. - * + * * Outputs: * 0: The output 4-D tensor, of shape [batches, out_height, out_width, depth_out]. */ @@ -395,7 +395,7 @@ typedef enum { * number of splits along unpack axis. * Outputs: * * 0 ~ n-1: The list of n output tensors, of shape - * [D0, D1, ..., Daxis(i), ..., Dm]. The output tensors are of the same + * [D0, D1, ..., Daxis(i), ..., Dm]. The output tensors are of the same * {@link OperandCode} as the input tensor 0. */ ANEURALNETWORKS_UNPACK_EX = 50014, diff --git a/libs/support/tflite/src/nnapi_delegate.cpp b/libs/support/tflite/src/nnapi_delegate.cpp index f706770..123787b 100644 --- a/libs/support/tflite/src/nnapi_delegate.cpp +++ b/libs/support/tflite/src/nnapi_delegate.cpp @@ -808,7 +808,7 @@ TfLiteStatus AddOpsAndParams( continue; case tflite::BuiltinOperator_SUM: CHECK_NN(ANeuralNetworksModel_addOperationEx( - nn_model, ANEURALNETWORKS_TENSORFLOW_SUM_EX, + nn_model, ANEURALNETWORKS_REDUCE_SUM_EX, static_cast(augmented_inputs.size()), augmented_inputs.data(), static_cast(node.outputs->size), @@ -923,7 +923,7 @@ TfLiteStatus AddOpsAndParams( } else if (custom_name.compare("TensorFlowSum") == 0) { CHECK_NN(ANeuralNetworksModel_addOperationEx( - nn_model, ANEURALNETWORKS_TENSORFLOW_SUM_EX, + nn_model, ANEURALNETWORKS_REDUCE_SUM_EX, static_cast(augmented_inputs.size()), augmented_inputs.data(), static_cast(node.outputs->size), diff --git a/runtimes/pure_arm_compute/src/model.cc b/runtimes/pure_arm_compute/src/model.cc index a144b26..2c4120d 100644 --- a/runtimes/pure_arm_compute/src/model.cc +++ b/runtimes/pure_arm_compute/src/model.cc @@ -941,7 +941,7 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model, break; } - case ANEURALNETWORKS_TENSORFLOW_SUM_EX: + case ANEURALNETWORKS_REDUCE_SUM_EX: { using internal::tflite::op::ReduceSum::Param; using internal::tflite::op::ReduceSum::Node; diff --git a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp index 440610d..783e104 100644 --- a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp +++ b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp @@ -3571,6 +3571,62 @@ TEST_F(GeneratedTests, reduce_min_ex) { reduce_min_ex::examples); } +namespace reduce_sum_ex_2D_float { +std::vector examples = { +// Generated reduce_sum_ex_2D_float test +#include "generated/examples/reduce_sum_ex_2D_float.example.cpp" +}; +// Generated model constructor +#include "generated/models/reduce_sum_ex_2D_float.model.cpp" +} // namespace reduce_sum_ex_2D_float +TEST_F(GeneratedTests, reduce_sum_ex_2D_float) { + execute(reduce_sum_ex_2D_float::CreateModel, + reduce_sum_ex_2D_float::is_ignored, + reduce_sum_ex_2D_float::examples); +} + +namespace reduce_sum_ex_4D_float { +std::vector examples = { +// Generated reduce_sum_ex_4D_float test +#include "generated/examples/reduce_sum_ex_4D_float.example.cpp" +}; +// Generated model constructor +#include "generated/models/reduce_sum_ex_4D_float.model.cpp" +} // namespace reduce_sum_ex_4D_float +TEST_F(GeneratedTests, reduce_sum_ex_4D_float) { + execute(reduce_sum_ex_4D_float::CreateModel, + reduce_sum_ex_4D_float::is_ignored, + reduce_sum_ex_4D_float::examples); +} + +namespace reduce_sum_ex_4D_float_reducing_C { +std::vector examples = { +// Generated reduce_sum_ex_4D_float_reducing_C test +#include "generated/examples/reduce_sum_ex_4D_float_reducing_C.example.cpp" +}; +// Generated model constructor +#include "generated/models/reduce_sum_ex_4D_float_reducing_C.model.cpp" +} // namespace reduce_sum_ex_4D_float_reducing_C +TEST_F(GeneratedTests, reduce_sum_ex_4D_float_reducing_C) { + execute(reduce_sum_ex_4D_float_reducing_C::CreateModel, + reduce_sum_ex_4D_float_reducing_C::is_ignored, + reduce_sum_ex_4D_float_reducing_C::examples); +} + +namespace reduce_sum_ex_4D_float_reducing_HW { +std::vector examples = { +// Generated reduce_sum_ex_4D_float_reducing_HW test +#include "generated/examples/reduce_sum_ex_4D_float_reducing_HW.example.cpp" +}; +// Generated model constructor +#include "generated/models/reduce_sum_ex_4D_float_reducing_HW.model.cpp" +} // namespace reduce_sum_ex_4D_float_reducing_HW +TEST_F(GeneratedTests, reduce_sum_ex_4D_float_reducing_HW) { + execute(reduce_sum_ex_4D_float_reducing_HW::CreateModel, + reduce_sum_ex_4D_float_reducing_HW::is_ignored, + reduce_sum_ex_4D_float_reducing_HW::examples); +} + namespace rsqrt_ex_float_1 { std::vector examples = { // Generated rsqrt_ex_float_1 test @@ -3865,62 +3921,6 @@ TEST_F(GeneratedTests, tensorflowmax_ex_quant8_2) { tensorflowmax_ex_quant8_2::examples); } -namespace tensorflowsum_ex_2D_float { -std::vector examples = { -// Generated tensorflowsum_ex_2D_float test -#include "generated/examples/tensorflowsum_ex_2D_float.example.cpp" -}; -// Generated model constructor -#include "generated/models/tensorflowsum_ex_2D_float.model.cpp" -} // namespace tensorflowsum_ex_2D_float -TEST_F(GeneratedTests, tensorflowsum_ex_2D_float) { - execute(tensorflowsum_ex_2D_float::CreateModel, - tensorflowsum_ex_2D_float::is_ignored, - tensorflowsum_ex_2D_float::examples); -} - -namespace tensorflowsum_ex_4D_float { -std::vector examples = { -// Generated tensorflowsum_ex_4D_float test -#include "generated/examples/tensorflowsum_ex_4D_float.example.cpp" -}; -// Generated model constructor -#include "generated/models/tensorflowsum_ex_4D_float.model.cpp" -} // namespace tensorflowsum_ex_4D_float -TEST_F(GeneratedTests, tensorflowsum_ex_4D_float) { - execute(tensorflowsum_ex_4D_float::CreateModel, - tensorflowsum_ex_4D_float::is_ignored, - tensorflowsum_ex_4D_float::examples); -} - -namespace tensorflowsum_ex_4D_float_reducing_C { -std::vector examples = { -// Generated tensorflowsum_ex_4D_float_reducing_C test -#include "generated/examples/tensorflowsum_ex_4D_float_reducing_C.example.cpp" -}; -// Generated model constructor -#include "generated/models/tensorflowsum_ex_4D_float_reducing_C.model.cpp" -} // namespace tensorflowsum_ex_4D_float_reducing_C -TEST_F(GeneratedTests, tensorflowsum_ex_4D_float_reducing_C) { - execute(tensorflowsum_ex_4D_float_reducing_C::CreateModel, - tensorflowsum_ex_4D_float_reducing_C::is_ignored, - tensorflowsum_ex_4D_float_reducing_C::examples); -} - -namespace tensorflowsum_ex_4D_float_reducing_HW { -std::vector examples = { -// Generated tensorflowsum_ex_4D_float_reducing_HW test -#include "generated/examples/tensorflowsum_ex_4D_float_reducing_HW.example.cpp" -}; -// Generated model constructor -#include "generated/models/tensorflowsum_ex_4D_float_reducing_HW.model.cpp" -} // namespace tensorflowsum_ex_4D_float_reducing_HW -TEST_F(GeneratedTests, tensorflowsum_ex_4D_float_reducing_HW) { - execute(tensorflowsum_ex_4D_float_reducing_HW::CreateModel, - tensorflowsum_ex_4D_float_reducing_HW::is_ignored, - tensorflowsum_ex_4D_float_reducing_HW::examples); -} - namespace topk_v2_ex_1D_float { std::vector examples = { // Generated topk_v2_ex_1D_float test diff --git a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_2D_float.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_2D_float.example.cpp similarity index 87% rename from runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_2D_float.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_2D_float.example.cpp index b537ac4..abcbb9c 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_2D_float.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_2D_float.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_2D_float.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_2D_float.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float.example.cpp similarity index 87% rename from runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float.example.cpp index 9dfe605..71e60b9 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_C.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_C.example.cpp similarity index 92% rename from runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_C.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_C.example.cpp index 26632c8..41f14b3 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_C.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_C.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float_reducing_C.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float_reducing_C.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_HW.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_HW.example.cpp similarity index 91% rename from runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_HW.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_HW.example.cpp index e8a1d8a..0b99225 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/tensorflowsum_ex_4D_float_reducing_HW.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/reduce_sum_ex_4D_float_reducing_HW.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float_reducing_HW.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float_reducing_HW.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_2D_float.model.cpp b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_2D_float.model.cpp similarity index 81% rename from runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_2D_float.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_2D_float.model.cpp index fbac69f..c4a4f01 100644 --- a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_2D_float.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_2D_float.model.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_2D_float.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_2D_float.mod.py). Do not edit void CreateModel(Model *model) { OperandType type1(Type::INT32, {}); OperandType type0(Type::TENSOR_FLOAT32, {3, 4}); @@ -10,7 +10,7 @@ void CreateModel(Model *model) { // Phase 2, operations static int32_t axis_init[] = {1}; model->setOperandValue(axis, axis_init, sizeof(int32_t) * 1); - model->addOperationEx(ANEURALNETWORKS_TENSORFLOW_SUM_EX, {input, axis}, {output}); + model->addOperationEx(ANEURALNETWORKS_REDUCE_SUM_EX, {input, axis}, {output}); // Phase 3, inputs and outputs model->identifyInputsAndOutputs( {input}, diff --git a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float.model.cpp b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float.model.cpp similarity index 81% rename from runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float.model.cpp index 6bf4cca..ce301da 100644 --- a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float.model.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float.mod.py). Do not edit void CreateModel(Model *model) { OperandType type1(Type::INT32, {}); OperandType type0(Type::TENSOR_FLOAT32, {1, 3, 4, 1}); @@ -10,7 +10,7 @@ void CreateModel(Model *model) { // Phase 2, operations static int32_t axis_init[] = {1}; model->setOperandValue(axis, axis_init, sizeof(int32_t) * 1); - model->addOperationEx(ANEURALNETWORKS_TENSORFLOW_SUM_EX, {input, axis}, {output}); + model->addOperationEx(ANEURALNETWORKS_REDUCE_SUM_EX, {input, axis}, {output}); // Phase 3, inputs and outputs model->identifyInputsAndOutputs( {input}, diff --git a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_C.model.cpp b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_C.model.cpp similarity index 80% rename from runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_C.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_C.model.cpp index d34fe49..f7cb830 100644 --- a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_C.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_C.model.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float_reducing_C.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float_reducing_C.mod.py). Do not edit void CreateModel(Model *model) { OperandType type0(Type::TENSOR_FLOAT32, {2, 3, 4, 5}); OperandType type2(Type::TENSOR_FLOAT32, {2, 3, 4}); @@ -10,7 +10,7 @@ void CreateModel(Model *model) { // Phase 2, operations static int32_t axis_init[] = {3, -1}; model->setOperandValue(axis, axis_init, sizeof(int32_t) * 2); - model->addOperationEx(ANEURALNETWORKS_TENSORFLOW_SUM_EX, {input, axis}, {output}); + model->addOperationEx(ANEURALNETWORKS_REDUCE_SUM_EX, {input, axis}, {output}); // Phase 3, inputs and outputs model->identifyInputsAndOutputs( {input}, diff --git a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_HW.model.cpp b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_HW.model.cpp similarity index 80% rename from runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_HW.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_HW.model.cpp index 4400d86..a2cfbc5 100644 --- a/runtimes/tests/neural_networks_test/generated/models/tensorflowsum_ex_4D_float_reducing_HW.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/reduce_sum_ex_4D_float_reducing_HW.model.cpp @@ -1,4 +1,4 @@ -// Generated file (from: tensorflowsum_ex_4D_float_reducing_HW.mod.py). Do not edit +// Generated file (from: reduce_sum_ex_4D_float_reducing_HW.mod.py). Do not edit void CreateModel(Model *model) { OperandType type0(Type::TENSOR_FLOAT32, {2, 3, 4, 5}); OperandType type2(Type::TENSOR_FLOAT32, {2, 5}); @@ -10,7 +10,7 @@ void CreateModel(Model *model) { // Phase 2, operations static int32_t axis_init[] = {1, 2, -3, -2}; model->setOperandValue(axis, axis_init, sizeof(int32_t) * 4); - model->addOperationEx(ANEURALNETWORKS_TENSORFLOW_SUM_EX, {input, axis}, {output}); + model->addOperationEx(ANEURALNETWORKS_REDUCE_SUM_EX, {input, axis}, {output}); // Phase 3, inputs and outputs model->identifyInputsAndOutputs( {input}, diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun index 9b5c359..0b6def0 100644 --- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun +++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun @@ -104,7 +104,7 @@ GeneratedTests.cast_ex* GeneratedTests.gather_ex* GeneratedTests.strided_slice_ex* GeneratedTests.tensorflowmax_ex* -GeneratedTests.tensorflowsum_ex* +GeneratedTests.reduce_sum_ex* GeneratedTests.topk_v2* # Unhandled exception GeneratedTests.concat* diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen index e068f44..9f26f75 100644 --- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen +++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen @@ -76,8 +76,8 @@ GeneratedTests.tensorflowmax_ex_float_1 GeneratedTests.tensorflowmax_ex_float_2 GeneratedTests.tensorflowmax_ex_quant8_1 GeneratedTests.tensorflowmax_ex_quant8_2 -GeneratedTests.tensorflowsum_ex_2D_float -GeneratedTests.tensorflowsum_ex_4D_float +GeneratedTests.reduce_sum_ex_2D_float +GeneratedTests.reduce_sum_ex_4D_float GeneratedTests.transpose GeneratedTests.transpose_float_1 GeneratedTests.transpose_quant8_1 diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux index ab29975..98fa20e 100644 --- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux +++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux @@ -70,7 +70,7 @@ GeneratedTests.strided_slice_float_8 GeneratedTests.strided_slice_float_9 GeneratedTests.strided_slice GeneratedTests.tensorflowmax_ex* -GeneratedTests.tensorflowsum_ex* +GeneratedTests.reduce_sum_ex* GeneratedTests.sub_broadcast_float TrivialTest.* ValidationTest.* diff --git a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_2D_float.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_2D_float.mod.py similarity index 87% rename from runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_2D_float.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_2D_float.mod.py index a6833c9..1368f66 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_2D_float.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_2D_float.mod.py @@ -3,7 +3,7 @@ model = Model() i1 = Input("input", "TENSOR_FLOAT32", "{3, 4}") axis = Int32Scalar("axis", 1) out1 = Output("output", "TENSOR_FLOAT32", "{3}") -model = model.Operation("TENSORFLOW_SUM_EX", i1, axis).To(out1) +model = model.Operation("REDUCE_SUM_EX", i1, axis).To(out1) # Example 1. Input in operand 0, 1 input0 = {i1: # input 0 diff --git a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float.mod.py similarity index 87% rename from runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float.mod.py index 4f9e0db..15b8dd7 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float.mod.py @@ -3,7 +3,7 @@ model = Model() i1 = Input("input", "TENSOR_FLOAT32", "{1, 3, 4, 1}") axis = Int32Scalar("axis", 1) out1 = Output("output", "TENSOR_FLOAT32", "{1, 4, 1}") -model = model.Operation("TENSORFLOW_SUM_EX", i1, axis).To(out1) +model = model.Operation("REDUCE_SUM_EX", i1, axis).To(out1) # Example 1. Input in operand 0, 1 input0 = {i1: # input 0 diff --git a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_C.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py similarity index 93% rename from runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_C.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py index 5a7bedd..4bfea0f 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_C.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py @@ -19,7 +19,7 @@ i1 = Input("input", "TENSOR_FLOAT32", "{%d, %d, %d, %d}" % (batch, rows, cols, d axis = Parameter("axis", "TENSOR_INT32", "{2}", [3, -1]) output = Output("output", "TENSOR_FLOAT32", "{%d, %d, %d}" % (batch, rows, cols)) -model = model.Operation("TENSORFLOW_SUM_EX", i1, axis).To(output) +model = model.Operation("REDUCE_SUM_EX", i1, axis).To(output) # Example 1. Input in operand 0, input0 = {i1: # input 0 diff --git a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_HW.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py similarity index 93% rename from runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_HW.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py index 52b63da..d94bcf7 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/tensorflowsum_ex_4D_float_reducing_HW.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py @@ -19,7 +19,7 @@ i1 = Input("input", "TENSOR_FLOAT32", "{%d, %d, %d, %d}" % (batch, rows, cols, d axis = Parameter("axis", "TENSOR_INT32", "{4}", [1, 2, -3, -2]) output = Output("output", "TENSOR_FLOAT32", "{%d, %d}" % (batch, depth)) -model = model.Operation("TENSORFLOW_SUM_EX", i1, axis).To(output) +model = model.Operation("REDUCE_SUM_EX", i1, axis).To(output) # Example 1. Input in operand 0, input0 = {i1: # input 0 -- 2.7.4