diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-18 15:44:21 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
| commit | d58cec032556abb103cdf7564ab29762d5c4c051 (patch) | |
| tree | 1c938fdb7f087129ee54654eeee55c53ffe97ca5 /tests/validation/NEON/FullyConnectedLayer.cpp | |
| parent | 81527bff7d6fc337fb9edec23c0b63a96b500bd4 (diff) | |
| download | ComputeLibrary-d58cec032556abb103cdf7564ab29762d5c4c051.tar.gz | |
COMPMID-415: Cleanup accessors
Change-Id: Id19c8c1ea76f6e6679a4ac770e804f8012a2b5a6
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80937
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/validation/NEON/FullyConnectedLayer.cpp')
| -rw-r--r-- | tests/validation/NEON/FullyConnectedLayer.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/validation/NEON/FullyConnectedLayer.cpp b/tests/validation/NEON/FullyConnectedLayer.cpp index fa962787d1..22572ecbf8 100644 --- a/tests/validation/NEON/FullyConnectedLayer.cpp +++ b/tests/validation/NEON/FullyConnectedLayer.cpp @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "NEON/NEAccessor.h" +#include "NEON/Accessor.h" #include "TypePrinter.h" #include "dataset/FullyConnectedLayerDataset.h" #include "tests/Globals.h" @@ -38,7 +38,6 @@ using namespace arm_compute; using namespace arm_compute::test; -using namespace arm_compute::test::neon; using namespace arm_compute::test::validation; namespace @@ -88,15 +87,15 @@ Tensor compute_fully_connected_layer(const TensorShape &input_shape, const Tenso if(dt == DataType::F16 || dt == DataType::F32) { std::uniform_real_distribution<> distribution(-1.0f, 1.0f); - library->fill(NEAccessor(src), distribution, 0); - library->fill(NEAccessor(weights), distribution, 1); - library->fill(NEAccessor(bias), distribution, 2); + library->fill(Accessor(src), distribution, 0); + library->fill(Accessor(weights), distribution, 1); + library->fill(Accessor(bias), distribution, 2); } else { - library->fill_tensor_uniform(NEAccessor(src), 0); - library->fill_tensor_uniform(NEAccessor(weights), 1); - library->fill_tensor_uniform(NEAccessor(bias), 2); + library->fill_tensor_uniform(Accessor(src), 0); + library->fill_tensor_uniform(Accessor(weights), 1); + library->fill_tensor_uniform(Accessor(bias), 2); } // Compute NEFullyConnectedLayer function @@ -170,7 +169,7 @@ BOOST_DATA_TEST_CASE(RunSmall, RawTensor ref_dst = Reference::compute_reference_fully_connected_layer(fc_set.src_shape, fc_set.weights_shape, fc_set.bias_shape, fc_set.dst_shape, dt, fc_set.transpose_weights, 0); // Validate output - validate(NEAccessor(dst), ref_dst, tolerance_f16); + validate(Accessor(dst), ref_dst, tolerance_f16); } BOOST_AUTO_TEST_SUITE_END() #endif /* ARM_COMPUTE_ENABLE_FP16 */ @@ -188,7 +187,7 @@ BOOST_DATA_TEST_CASE(RunSmall, RawTensor ref_dst = Reference::compute_reference_fully_connected_layer(fc_set.src_shape, fc_set.weights_shape, fc_set.bias_shape, fc_set.dst_shape, dt, fc_set.transpose_weights, 0); // Validate output - validate(NEAccessor(dst), ref_dst, tolerance_f32); + validate(Accessor(dst), ref_dst, tolerance_f32); } BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly")) @@ -203,7 +202,7 @@ BOOST_DATA_TEST_CASE(RunLarge, RawTensor ref_dst = Reference::compute_reference_fully_connected_layer(fc_set.src_shape, fc_set.weights_shape, fc_set.bias_shape, fc_set.dst_shape, dt, fc_set.transpose_weights, 0); // Validate output - validate(NEAccessor(dst), ref_dst, tolerance_f32); + validate(Accessor(dst), ref_dst, tolerance_f32); } BOOST_AUTO_TEST_SUITE_END() @@ -220,7 +219,7 @@ BOOST_DATA_TEST_CASE(RunSmall, RawTensor ref_dst = Reference::compute_reference_fully_connected_layer(fc_set.src_shape, fc_set.weights_shape, fc_set.bias_shape, fc_set.dst_shape, dt, fc_set.transpose_weights, fixed_point_position); // Validate output - validate(NEAccessor(dst), ref_dst, tolerance_q); + validate(Accessor(dst), ref_dst, tolerance_q); } BOOST_TEST_DECORATOR(*boost::unit_test::label("nightly")) @@ -235,7 +234,7 @@ BOOST_DATA_TEST_CASE(RunLarge, RawTensor ref_dst = Reference::compute_reference_fully_connected_layer(fc_set.src_shape, fc_set.weights_shape, fc_set.bias_shape, fc_set.dst_shape, dt, fc_set.transpose_weights, fixed_point_position); // Validate output - validate(NEAccessor(dst), ref_dst, tolerance_q); + validate(Accessor(dst), ref_dst, tolerance_q); } BOOST_AUTO_TEST_SUITE_END() |