diff options
-rw-r--r-- | arm_compute/core/Strides.h | 3 | ||||
-rw-r--r-- | arm_compute/core/utils/math/SafeOps.h | 4 | ||||
-rw-r--r-- | arm_compute/core/utils/misc/Utility.h | 3 | ||||
-rw-r--r-- | src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h | 4 | ||||
-rw-r--r-- | src/core/utils/helpers/bit_ops.h | 4 | ||||
-rw-r--r-- | src/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h | 4 | ||||
-rw-r--r-- | src/dynamic_fusion/sketch/gpu/template_writer/GpuKernelVariableTable.h | 4 | ||||
-rw-r--r-- | support/AclRequires.h (renamed from support/Requires.h) | 11 | ||||
-rw-r--r-- | support/Rounding.h | 4 | ||||
-rw-r--r-- | tests/validation/NEON/ActivationLayer.cpp | 4 | ||||
-rw-r--r-- | tests/validation/reference/Conv3D.cpp | 6 | ||||
-rw-r--r-- | tests/validation/reference/Convolution3d.h | 4 |
12 files changed, 27 insertions, 28 deletions
diff --git a/arm_compute/core/Strides.h b/arm_compute/core/Strides.h index 265799e41e..b582d066f7 100644 --- a/arm_compute/core/Strides.h +++ b/arm_compute/core/Strides.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2019, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -30,6 +30,7 @@ #include <algorithm> #include <array> #include <cstddef> +#include <cstdint> namespace arm_compute { diff --git a/arm_compute/core/utils/math/SafeOps.h b/arm_compute/core/utils/math/SafeOps.h index f0d76a3d02..dc928a0e5d 100644 --- a/arm_compute/core/utils/math/SafeOps.h +++ b/arm_compute/core/utils/math/SafeOps.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021 Arm Limited. + * Copyright (c) 2019-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #define ARM_COMPUTE_UTILS_MATH_SAFE_OPS #include "arm_compute/core/Error.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include <limits> diff --git a/arm_compute/core/utils/misc/Utility.h b/arm_compute/core/utils/misc/Utility.h index 648758ca07..e3e20d719f 100644 --- a/arm_compute/core/utils/misc/Utility.h +++ b/arm_compute/core/utils/misc/Utility.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -28,6 +28,7 @@ #include <algorithm> #include <array> +#include <cstdint> #include <limits> #include <numeric> #include <vector> diff --git a/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h b/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h index 779db6030d..7ba52a16b7 100644 --- a/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h +++ b/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ #include "src/core/NEON/NEFixedPoint.h" #include "src/core/NEON/wrapper/wrapper.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include <arm_neon.h> diff --git a/src/core/utils/helpers/bit_ops.h b/src/core/utils/helpers/bit_ops.h index 954fb56460..fbd0382509 100644 --- a/src/core/utils/helpers/bit_ops.h +++ b/src/core/utils/helpers/bit_ops.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ #ifndef ARM_COMPUTE_UTILS_HELPERS_BIT_OPS_H #define ARM_COMPUTE_UTILS_HELPERS_BIT_OPS_H -#include "support/Requires.h" +#include "support/AclRequires.h" #include <type_traits> diff --git a/src/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h b/src/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h index 95835e6dcf..8bc4d83c20 100644 --- a/src/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h +++ b/src/cpu/kernels/CpuDepthwiseConv2dNativeKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022 Arm Limited. + * Copyright (c) 2019-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ #include "arm_compute/core/utils/misc/Traits.h" #include "src/core/common/Macros.h" #include "src/cpu/ICpuKernel.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC #include <arm_neon.h> diff --git a/src/dynamic_fusion/sketch/gpu/template_writer/GpuKernelVariableTable.h b/src/dynamic_fusion/sketch/gpu/template_writer/GpuKernelVariableTable.h index 82b7513c0d..14f1c36a1c 100644 --- a/src/dynamic_fusion/sketch/gpu/template_writer/GpuKernelVariableTable.h +++ b/src/dynamic_fusion/sketch/gpu/template_writer/GpuKernelVariableTable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Arm Limited. + * Copyright (c) 2022-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/core/ITensorInfo.h" #include "src/dynamic_fusion/sketch/gpu/GpuKernelArgument.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include "support/StringSupport.h" #include <set> diff --git a/support/Requires.h b/support/AclRequires.h index 21c98ca766..1c20f7fbc3 100644 --- a/support/Requires.h +++ b/support/AclRequires.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,15 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_UTILS_REQUIRES_H -#define ARM_COMPUTE_UTILS_REQUIRES_H +#ifndef ARM_COMPUTE_UTILS_ACLREQUIRES_H +#define ARM_COMPUTE_UTILS_ACLREQUIRES_H namespace arm_compute { namespace utils { -namespace requires -{ // *INDENT-OFF* // clang-format off namespace detail @@ -42,10 +40,9 @@ enum class enabler /** Requirements as template */ #define ARM_COMPUTE_REQUIRES_T(...) template <bool Cond = (__VA_ARGS__), typename std::enable_if<Cond, int>::type = 0> /** Requirements as template argument */ -#define ARM_COMPUTE_REQUIRES_TA(...) typename = typename std::enable_if<(__VA_ARGS__), arm_compute::utils::requires::detail::enabler>::type +#define ARM_COMPUTE_REQUIRES_TA(...) typename = typename std::enable_if<(__VA_ARGS__), arm_compute::utils::detail::enabler>::type // clang-format on // *INDENT-ON* -} // namespace requires } // namespace utils } // namespace arm_compute #endif /*ARM_COMPUTE_UTILS_REQUIRES_H */ diff --git a/support/Rounding.h b/support/Rounding.h index 47c8f76834..e2732dc459 100644 --- a/support/Rounding.h +++ b/support/Rounding.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/core/Error.h" #include "arm_compute/core/utils/misc/Traits.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include "support/ToolchainSupport.h" #include <cmath> diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp index 20197cb432..d64945ab31 100644 --- a/tests/validation/NEON/ActivationLayer.cpp +++ b/tests/validation/NEON/ActivationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2022 Arm Limited. + * Copyright (c) 2017-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -40,7 +40,7 @@ #include "tests/validation/fixtures/ActivationLayerFixture.h" #include "arm_compute/Acl.hpp" -#include "support/Requires.h" +#include "support/AclRequires.h" namespace arm_compute { diff --git a/tests/validation/reference/Conv3D.cpp b/tests/validation/reference/Conv3D.cpp index 706059d1cb..e4010a507a 100644 --- a/tests/validation/reference/Conv3D.cpp +++ b/tests/validation/reference/Conv3D.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/core/utils/quantization/AsymmHelpers.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include "tests/validation/reference/UtilsQuantizedAsymm.h" // Source/Destination Tensor shape indices (N D H W C) @@ -257,4 +257,4 @@ template SimpleTensor<int8_t> conv3d(const SimpleTensor<int8_t> &src, const Simp } // namespace reference } // namespace validation } // namespace test -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute diff --git a/tests/validation/reference/Convolution3d.h b/tests/validation/reference/Convolution3d.h index 1666e3857b..b67e88e839 100644 --- a/tests/validation/reference/Convolution3d.h +++ b/tests/validation/reference/Convolution3d.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ #define ARM_COMPUTE_TEST_VALIDATION_CONVOLUTION_H #include "arm_compute/core/utils/quantization/AsymmHelpers.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include "tests/validation/Helpers.h" #include "tests/validation/reference/UtilsQuantizedAsymm.h" |