From fd76611f50b0abe5effbe4b7f7129a745115fdf9 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Wed, 9 Nov 2022 16:01:44 +0000 Subject: Fix compiler warnings in dynamic fusion Remove conflicting Padding2D from the unused comparison operator in the prototpye Resolve unused variables in release mode Resolves COMPMID-5683 Signed-off-by: SiCong Li Change-Id: I19d74c57e51e6cf64003ddcbc74227608bb866d2 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8590 Reviewed-by: Jakub Sujak Reviewed-by: Viet-Hoa Do Tested-by: Arm Jenkins Benchmark: Arm Jenkins Comments-Addressed: Arm Jenkins --- arm_compute/core/experimental/OperatorGraph.h | 1 - .../dynamic_fusion/WorkloadImpl/OperatorGraphImpl.cpp | 8 ++------ src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.h | 1 + src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp | 1 + src/dynamic_fusion/sketch/utils/DependencyGraph.h | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arm_compute/core/experimental/OperatorGraph.h b/arm_compute/core/experimental/OperatorGraph.h index f2e352146f..f40ad0d8c5 100644 --- a/arm_compute/core/experimental/OperatorGraph.h +++ b/arm_compute/core/experimental/OperatorGraph.h @@ -206,7 +206,6 @@ struct FloorDescriptor Operator add_op_floor(OperatorGraph &graph, const FloorDescriptor &desc, OpTensor src, OpTensor dst); bool operator==(const OpTensor &t0, const OpTensor &t1); -bool operator==(const Padding2D &pad0, const Padding2D &pad1); bool operator==(const Conv2dDescriptor &conv2d0, const Conv2dDescriptor &conv2d1); bool operator==(const ElementwiseDescriptor &, const ElementwiseDescriptor &); bool operator==(const FloorDescriptor &, const FloorDescriptor &); diff --git a/src/core/experimental/dynamic_fusion/WorkloadImpl/OperatorGraphImpl.cpp b/src/core/experimental/dynamic_fusion/WorkloadImpl/OperatorGraphImpl.cpp index 274a2517bb..663b89e235 100644 --- a/src/core/experimental/dynamic_fusion/WorkloadImpl/OperatorGraphImpl.cpp +++ b/src/core/experimental/dynamic_fusion/WorkloadImpl/OperatorGraphImpl.cpp @@ -104,13 +104,9 @@ bool operator==(const OpTensor &t0, const OpTensor &t1) { return std::make_tuple(t0.id()) == std::make_tuple(t1.id()); } -bool operator==(const Padding2D &pad0, const Padding2D &pad1) -{ - return std::make_tuple(pad0.top, pad0.right, pad0.bottom, pad0.left) == std::make_tuple(pad1.top, pad1.right, pad1.bottom, pad1.left); -} bool operator==(const Conv2dDescriptor &conv2d0, const Conv2dDescriptor &conv2d1) { - return std::make_tuple(conv2d0.pad, conv2d0.stride, conv2d0.dilation) == std::make_tuple(conv2d1.pad, conv2d1.stride, conv2d1.dilation); + return std::make_tuple(conv2d0.stride, conv2d0.dilation) == std::make_tuple(conv2d1.stride, conv2d1.dilation); } bool operator==(const ElementwiseDescriptor &ed0, const ElementwiseDescriptor &ed1) @@ -424,4 +420,4 @@ Status translate(ClKernelGraph &kernel_graph, const OperatorGraph::Implementatio } // namespace dynamic_fusion } // namespace experimental } // namespace arm_compute -#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ \ No newline at end of file +#endif /* ENABLE_EXPERIMENTAL_DYNAMIC_FUSION */ diff --git a/src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.h b/src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.h index fbcb2c10ea..e4f498b130 100644 --- a/src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.h +++ b/src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.h @@ -76,6 +76,7 @@ public: const auto src_tensor_ids = get_tensor_ids(tensors.get_const_src_tensors()); const auto dst_tensor_ids = get_tensor_ids(tensors.get_const_dst_tensors()); bool success = _dependency_graph.add_operator(comp->id(), src_tensor_ids, dst_tensor_ids); + ARM_COMPUTE_UNUSED(success); ARM_COMPUTE_ERROR_ON(!success); _components[comp->id()] = std::move(comp); for(auto t : tensors.get_const_src_tensors()) diff --git a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp index 7746f8bbf3..c560e9a931 100644 --- a/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp +++ b/src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp @@ -79,6 +79,7 @@ void GpuLogicalKernel::add_load_store() tensors); _store_components.push_back(std::move(store)); auto success = _comp_group.add_component(_store_components.back().get()); + ARM_COMPUTE_UNUSED(success); ARM_COMPUTE_ERROR_ON(!success); // It's guaranteed that any load store insertion should be successful } } diff --git a/src/dynamic_fusion/sketch/utils/DependencyGraph.h b/src/dynamic_fusion/sketch/utils/DependencyGraph.h index 55eb4c5c77..03678defae 100644 --- a/src/dynamic_fusion/sketch/utils/DependencyGraph.h +++ b/src/dynamic_fusion/sketch/utils/DependencyGraph.h @@ -130,6 +130,7 @@ public: { ARM_COMPUTE_ERROR_ON(!try_add_operator_as_linear(op, inputs, outputs)); auto success = add_operator(op, inputs, outputs); + ARM_COMPUTE_UNUSED(success); ARM_COMPUTE_ERROR_ON(!success); } /** Add a new operator -- cgit v1.2.1