diff options
author | Prasanna R/SNAP /SRI-Bangalore/Engineer/삼성전자 <prasanna.r@samsung.com> | 2018-12-17 06:35:23 +0530 |
---|---|---|
committer | 오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com> | 2018-12-17 10:05:23 +0900 |
commit | d24f5825496140bcef6a4d922ac41561badda730 (patch) | |
tree | c09b58d4be6eb228c14d25ee7d9538c8aa7a102f /runtimes | |
parent | 4c0e194a33ba4fe17b39888b01f15051714ec265 (diff) | |
download | nnfw-d24f5825496140bcef6a4d922ac41561badda730.tar.gz nnfw-d24f5825496140bcef6a4d922ac41561badda730.tar.bz2 nnfw-d24f5825496140bcef6a4d922ac41561badda730.zip |
Add CLKernel calls for Comparison operators (#4044)
This patch adds CLKernel calls for comparison operators
- Equal
- Not Equal
Signed-off-by: prasannar <prasanna.r@samsung.com>
Diffstat (limited to 'runtimes')
-rw-r--r-- | runtimes/pure_arm_compute/src/compilation.cc | 13 | ||||
-rw-r--r-- | runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc index b80b6efc9..5f7bfb971 100644 --- a/runtimes/pure_arm_compute/src/compilation.cc +++ b/runtimes/pure_arm_compute/src/compilation.cc @@ -62,12 +62,11 @@ #include <arm_compute/runtime/CL/functions/CLExp.h> #include <arm_compute/runtime/CL/functions/CLBatchToSpaceND.h> #include <arm_compute/runtime/CL/functions/CLEmbeddingLookup.h> -#include <arm_compute/runtime/CL/functions/CLEqual.h> #include <arm_compute/runtime/CL/functions/CLSquaredDifference.h> #include <arm_compute/runtime/CL/functions/CLNeg.h> #include <arm_compute/runtime/CL/functions/CLPReLU.h> -#include <arm_compute/runtime/CL/functions/CLNotEqual.h> #include <arm_compute/runtime/CL/functions/CLBinaryLogicalOp.h> +#include <arm_compute/runtime/CL/functions/CLComparisonOp.h> #include <arm_compute/runtime/SubTensor.h> #include <arm_compute/runtime/NEON/functions/NESoftmaxLayer.h> @@ -3949,9 +3948,10 @@ void Planner::visit(const ::internal::tflite::op::Equal::Node &node) if (::internal::arm_compute::isGpuMode()) { - auto fn = nnfw::cpp14::make_unique<::arm_compute::CLEqual>(); + auto fn = nnfw::cpp14::make_unique<::arm_compute::CLComparisonOp>(); - fn->configure(CAST_CL(input1_alloc), CAST_CL(input2_alloc), CAST_CL(output_alloc)); + fn->configure(CAST_CL(input1_alloc), CAST_CL(input2_alloc), CAST_CL(output_alloc), + ::arm_compute::ComparisonOperation::EQUAL); builder.append("Equal", std::move(fn)); } @@ -5635,9 +5635,10 @@ void Planner::visit(const ::internal::tflite::op::NotEqual::Node &node) if (::internal::arm_compute::isGpuMode()) { - auto fn = nnfw::cpp14::make_unique<::arm_compute::CLNotEqual>(); + auto fn = nnfw::cpp14::make_unique<::arm_compute::CLComparisonOp>(); - fn->configure(CAST_CL(input1_alloc), CAST_CL(input2_alloc), CAST_CL(output_alloc)); + fn->configure(CAST_CL(input1_alloc), CAST_CL(input2_alloc), CAST_CL(output_alloc), + ::arm_compute::ComparisonOperation::NOT_EQUAL); builder.append("NotEqual", std::move(fn)); } diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux index dd406f4ac..468649f0e 100644 --- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux +++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux @@ -1,4 +1,3 @@ -GeneratedTests.equal_ex* GeneratedTests.lsh_projection GeneratedTests.lsh_projection_2 GeneratedTests.lsh_projection_weights_as_inputs @@ -12,7 +11,6 @@ GeneratedTests.lstm3_state2 GeneratedTests.lstm3_state3 GeneratedTests.lstm_state GeneratedTests.lstm_state2 -GeneratedTests.notequal* GeneratedTests.svdf GeneratedTests.svdf2 GeneratedTests.svdf_state |