diff options
author | Ioan-Cristian Szabo <ioan-cristian.szabo@arm.com> | 2017-10-26 15:42:24 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 33fd07bd27be3cba183b7cacef63ea220c770c23 (patch) | |
tree | 0ccd4269992a90542697c85a0bd1c690872327b5 /tests/benchmark | |
parent | eae4ce085ed44c67de6d87eeba7726570ac23787 (diff) | |
download | ComputeLibrary-33fd07bd27be3cba183b7cacef63ea220c770c23.tar.gz |
COMPMID-634: Enable clang with libc++ to compile for Android (32 and 64 bits)
Change-Id: I693f64e70cd478e93675a8b04360128ded3b60d4
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93015
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests/benchmark')
-rw-r--r-- | tests/benchmark/NEON/ActivationLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/BatchNormalizationLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/ConvolutionLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/FullyConnectedLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/GEMM.cpp | 4 | ||||
-rw-r--r-- | tests/benchmark/NEON/NormalizationLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/PoolingLayer.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/SYSTEM/AlexNet.cpp | 6 |
8 files changed, 23 insertions, 23 deletions
diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp index a00e7ec2e6..fccb0f8ee2 100644 --- a/tests/benchmark/NEON/ActivationLayer.cpp +++ b/tests/benchmark/NEON/ActivationLayer.cpp @@ -45,11 +45,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8, DataType::QS16 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8, DataType::QS16 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEActivationLayerFixture = ActivationLayerFixture<Tensor, NEActivationLayer, Accessor>; diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp index 5bfd234704..84f3ccc3e4 100644 --- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp +++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp @@ -41,11 +41,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEBatchNormalizationLayerFixture = BatchNormalizationLayerFixture<Tensor, NEBatchNormalizationLayer, Accessor>; diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp index effcf63b8b..f2d9305464 100644 --- a/tests/benchmark/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark/NEON/ConvolutionLayer.cpp @@ -45,11 +45,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8, DataType::QS16 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8, DataType::QS16 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEConvolutionLayerFixture = ConvolutionLayerFixture<Tensor, NEConvolutionLayer, Accessor>; diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp index c12d7cedb9..befa530c8f 100644 --- a/tests/benchmark/NEON/FullyConnectedLayer.cpp +++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp @@ -43,11 +43,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8, DataType::QS16 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8, DataType::QS16 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEFullyConnectedLayerFixture = FullyConnectedLayerFixture<Tensor, NEFullyConnectedLayer, Accessor>; diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp index a713501d9a..fb43b9cf0d 100644 --- a/tests/benchmark/NEON/GEMM.cpp +++ b/tests/benchmark/NEON/GEMM.cpp @@ -43,9 +43,9 @@ namespace { const auto data_types = framework::dataset::make("DataType", { -#if ARM_COMPUTE_ENABLE_FP16 +#if ARM_COMPUTE_AARCH64_V8_2 DataType::F16, -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ DataType::F32, DataType::QS8 }); diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp index 383cec98d0..22957e4a2e 100644 --- a/tests/benchmark/NEON/NormalizationLayer.cpp +++ b/tests/benchmark/NEON/NormalizationLayer.cpp @@ -40,11 +40,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::QS16, DataType::F16, DataType::F32 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::QS16, DataType::F32 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NENormalizationLayerFixture = NormalizationLayerFixture<Tensor, NENormalizationLayer, Accessor>; diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp index 8d4e0a086d..9999fec5ce 100644 --- a/tests/benchmark/NEON/PoolingLayer.cpp +++ b/tests/benchmark/NEON/PoolingLayer.cpp @@ -45,11 +45,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEPoolingLayerFixture = PoolingLayerFixture<Tensor, NEPoolingLayer, Accessor>; diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp index 19598e3ca5..1b90fbddfb 100644 --- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp @@ -45,11 +45,11 @@ namespace test { namespace { -#ifdef ARM_COMPUTE_ENABLE_FP16 +#ifdef ARM_COMPUTE_AARCH64_V8_2 const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); -#else /* ARM_COMPUTE_ENABLE_FP16 */ +#else /* ARM_COMPUTE_AARCH64_V8_2 */ const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); -#endif /* ARM_COMPUTE_ENABLE_FP16 */ +#endif /* ARM_COMPUTE_AARCH64_V8_2 */ } // namespace using NEAlexNetFixture = AlexNetFixture<ITensor, |