From 81f796b1d49d737d5f24fdc83397dbdbd1fac7d7 Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Fri, 23 Dec 2022 14:42:55 +0000 Subject: Fix various compilation errors Partially resolves: COMPMID-5794 Signed-off-by: Viet-Hoa Do Change-Id: I275d0401be978e86507990bdb7dc5b1538a108d8 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8884 Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp | 3 ++- src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.h | 1 - src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp | 3 +-- .../sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp | 4 ++-- src/dynamic_fusion/sketch/gpu/template_writer/cl/ClTemplateCast.h | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/dynamic_fusion') 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> _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 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 -- cgit v1.2.1