aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViet-Hoa Do <viet-hoa.do@arm.com>2022-12-23 14:42:55 +0000
committerViet-Hoa Do <viet-hoa.do@arm.com>2022-12-28 15:04:31 +0000
commit81f796b1d49d737d5f24fdc83397dbdbd1fac7d7 (patch)
tree61214f68f9f2db8f804929ec8e01a8379140626b
parentaecb5d93225deace061cb7038d5844eec32c4e52 (diff)
downloadComputeLibrary-81f796b1d49d737d5f24fdc83397dbdbd1fac7d7.tar.gz
Fix various compilation errors
Partially resolves: COMPMID-5794 Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com> Change-Id: I275d0401be978e86507990bdb7dc5b1538a108d8 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8884 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Gunes Bayir <gunes.bayir@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Benchmark: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r--src/core/NEON/kernels/arm_gemm/std_transforms_sme.hpp1
-rw-r--r--src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp3
-rw-r--r--src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h1
-rw-r--r--src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp3
-rw-r--r--src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp4
-rw-r--r--src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h2
-rw-r--r--tests/validation/dynamic_fusion/gpu/cl/Resize.cpp2
7 files changed, 7 insertions, 9 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/std_transforms_sme.hpp b/src/core/NEON/kernels/arm_gemm/std_transforms_sme.hpp
index 054088e0b5..3c9a902298 100644
--- a/src/core/NEON/kernels/arm_gemm/std_transforms_sme.hpp
+++ b/src/core/NEON/kernels/arm_gemm/std_transforms_sme.hpp
@@ -69,6 +69,7 @@ public:
template<typename TOut>
void Merge(TOut *out, const TResult *in, int stride, int y0, int ymax, int x0, int xmax, const TOut *bias, const Activation act, bool accumulate) {
// Separate merge not supported for SME.
+ ARM_COMPUTE_UNUSED(out, in, stride, y0, ymax, x0, xmax, bias, act, accumulate);
}
};
diff --git a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp
index 66760b3812..00f625de28 100644
--- a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp
+++ b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp
@@ -38,8 +38,9 @@ namespace experimental
namespace dynamic_fusion
{
GpuLogicalKernel::GpuLogicalKernel(GpuComponentServices *services, const GpuKernelComponentGroup &components)
- : _services{ services }, _comp_group{ components }, _store_components{}
+ : _comp_group{ components }, _store_components{}
{
+ ARM_COMPUTE_UNUSED(services);
}
GpuKernelSourceCode GpuLogicalKernel::write_kernel_code()
diff --git a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h
index 2654224329..1fd40f0acd 100644
--- a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h
+++ b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h
@@ -65,7 +65,6 @@ public:
GpuKernelSourceCode write_kernel_code();
private:
- GpuComponentServices *_services;
GpuKernelComponentGroup _comp_group{};
std::vector<std::unique_ptr<IGpuKernelComponent>> _store_components{};
};
diff --git a/src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp b/src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp
index 89f1e999b8..caccbb1830 100644
--- a/src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp
+++ b/src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp
@@ -287,8 +287,7 @@ void GpuDepthwiseConv2d::create_op(GpuWorkloadSketch &sketch,
if(sketch_ctx->gpu_language() == GpuLanguage::OpenCL)
{
- const auto cl_compile_ctx = sketch_ctx->cl_compile_context();
- ARM_COMPUTE_ERROR_ON(cl_compile_ctx == nullptr);
+ ARM_COMPUTE_ERROR_ON_NULLPTR(sketch_ctx->cl_compile_context());
// Add Depthwise Conv2d Component
{
diff --git a/src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp b/src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp
index 073924947c..aec22e100c 100644
--- a/src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp
+++ b/src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp
@@ -74,6 +74,7 @@ Status GpuElementwiseBinaryCommon::is_supported_op(const GpuWorkloadContext
{
const auto cl_compile_ctx = context.cl_compile_context();
ARM_COMPUTE_RETURN_ERROR_ON(cl_compile_ctx == nullptr);
+
// Validate ElementwiseBinary Component
{
ArgumentPack<ITensorInfo> arguments;
@@ -149,8 +150,7 @@ void GpuElementwiseBinaryCommon::create_op(GpuWorkloadSketch
if(sketch_ctx->gpu_language() == GpuLanguage::OpenCL)
{
- const auto cl_compile_ctx = sketch_ctx->cl_compile_context();
- ARM_COMPUTE_ERROR_ON(cl_compile_ctx == nullptr);
+ ARM_COMPUTE_ERROR_ON_NULLPTR(sketch_ctx->cl_compile_context());
// Add ElementwiseBinary Component
{
diff --git a/src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h b/src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h
index 08255ca5af..3adca4edc9 100644
--- a/src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h
+++ b/src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h
@@ -94,7 +94,7 @@ public:
private:
const ITensorInfo *_src;
const ITensorInfo *_dst;
- const Attributes _attributes;
+ Attributes _attributes;
};
} // namespace dynamic_fusion
} // namespace experimental
diff --git a/tests/validation/dynamic_fusion/gpu/cl/Resize.cpp b/tests/validation/dynamic_fusion/gpu/cl/Resize.cpp
index 17c341b803..3791aef44c 100644
--- a/tests/validation/dynamic_fusion/gpu/cl/Resize.cpp
+++ b/tests/validation/dynamic_fusion/gpu/cl/Resize.cpp
@@ -88,8 +88,6 @@ const auto default_output_shape = TensorShape{ 4, 6, 3, 2 };
constexpr auto default_data_type = DataType::U8;
constexpr auto default_data_layout = DataLayout::NHWC;
-constexpr auto default_interpolation_policy = InterpolationPolicy::NEAREST_NEIGHBOR;
-constexpr bool default_use_padding = false;
TEST_CASE(NullPtr, framework::DatasetMode::ALL)
{