From 78e76912f0758c60e83922098231645efc02d8d6 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Thu, 6 May 2021 10:05:22 +0100 Subject: Remove TODOs Remove TODO/FIXME either already done or won't do. Partially resolve: COMPMID-4471 Signed-off-by: Sheri Zhang Change-Id: Iec8f25b9bf1b2a70c072dd17d44625fa93e84ed1 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5591 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Tested-by: Georgios Pinitas --- arm_compute/graph/GraphBuilder.h | 4 +--- arm_compute/runtime/IAllocator.h | 3 +-- src/core/CL/cl_kernels/warp_helpers.h | 4 +--- src/core/CL/cl_kernels/warp_helpers_quantized.h | 4 +--- src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp | 2 +- src/core/SubTensorInfo.cpp | 1 - src/graph/Workload.cpp | 1 - src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp | 2 +- src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp | 1 - 9 files changed, 6 insertions(+), 16 deletions(-) diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 8c727e3c8e..14ad0571ef 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -137,8 +137,6 @@ public: */ static NodeID add_channel_shuffle_node(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_groups); /** Adds a convolution layer node to the graph - * - * TODO (COMPMID-1113): Add a graph descriptor for convolution layer node * * @param[in] g Graph to add the node to * @param[in] params Common node parameters diff --git a/arm_compute/runtime/IAllocator.h b/arm_compute/runtime/IAllocator.h index 3eb86700b5..5c28b24fea 100644 --- a/arm_compute/runtime/IAllocator.h +++ b/arm_compute/runtime/IAllocator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -37,7 +37,6 @@ class IAllocator public: /** Default virtual destructor. */ virtual ~IAllocator() = default; - // TODO (COMPMID-1088) : Change allocator and rest interfaces to use IMemoryRegion /** Interface to be implemented by the child class to allocate bytes * * @param[in] size Size to allocate diff --git a/src/core/CL/cl_kernels/warp_helpers.h b/src/core/CL/cl_kernels/warp_helpers.h index 64828259d0..005861ddfa 100644 --- a/src/core/CL/cl_kernels/warp_helpers.h +++ b/src/core/CL/cl_kernels/warp_helpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 Arm Limited. + * Copyright (c) 2016, 2017, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -38,7 +38,6 @@ inline const float8 clamp_to_border_with_size(float8 coords, const float width, return (float8)(clamped_x.s0, clamped_y.s0, clamped_x.s1, clamped_y.s1, clamped_x.s2, clamped_y.s2, clamped_x.s3, clamped_y.s3); } -/* FIXME(COMPMID-682): Clamp border properly in UNDEFINED border mode in Warp, Scale, Remap */ /** Clamps the given coordinates to the borders. * * @param[in] coords Vector of 2D coordinates to clamp. Even positions are X coords, odd positions are Y coords. @@ -126,7 +125,6 @@ inline const VEC_DATA_TYPE(DATA_TYPE, 4) bilinear_interpolate_with_border(const return CONVERT(fr, VEC_DATA_TYPE(DATA_TYPE, 4)); } -/* FIXME(COMPMID-682): Clamp border properly in UNDEFINED border mode in Warp, Scale, Remap */ /** Computes the bilinear interpolation for each set of coordinates in the vector coords and returns the values * * @param[in] in Pointer to the source image. diff --git a/src/core/CL/cl_kernels/warp_helpers_quantized.h b/src/core/CL/cl_kernels/warp_helpers_quantized.h index ca21be6765..b10890aff0 100644 --- a/src/core/CL/cl_kernels/warp_helpers_quantized.h +++ b/src/core/CL/cl_kernels/warp_helpers_quantized.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -38,7 +38,6 @@ inline const float8 clamp_to_border_with_size_quantized(float8 coords, const flo return (float8)(clamped_x.s0, clamped_y.s0, clamped_x.s1, clamped_y.s1, clamped_x.s2, clamped_y.s2, clamped_x.s3, clamped_y.s3); } -/* FIXME(COMPMID-682): Clamp border properly in UNDEFINED border mode in Warp, Scale, Remap */ /** Clamps the given coordinates to the borders. * * @param[in] coords Vector of 2D coordinates to clamp. Even positions are X coords, odd positions are Y coords. @@ -122,7 +121,6 @@ inline const VEC_DATA_TYPE(DATA_TYPE, 4) bilinear_interpolate_with_border_quanti return res; } -/* FIXME(COMPMID-682): Clamp border properly in UNDEFINED border mode in Warp, Scale, Remap */ /** Computes the bilinear interpolation for each set of coordinates in the vector coords and returns the values * * @param[in] in Pointer to the source image. diff --git a/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp b/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp index 2a1365e6e2..91a2f5745a 100644 --- a/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp +++ b/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NHWCKernel.cpp @@ -47,7 +47,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *weights, ARM_COMPUTE_UNUSED(act_info); ARM_COMPUTE_RETURN_ERROR_ON_F16_UNSUPPORTED(input); ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::F16, DataType::F32); - ARM_COMPUTE_RETURN_ERROR_ON(depth_multiplier > 1); // COMPMID-1071 Add depth multiplier support for NHWC + ARM_COMPUTE_RETURN_ERROR_ON(depth_multiplier > 1); ARM_COMPUTE_RETURN_ERROR_ON(conv_info.stride().first < 1); ARM_COMPUTE_RETURN_ERROR_ON(std::max(conv_info.pad_top(), conv_info.pad_bottom()) > 4); diff --git a/src/core/SubTensorInfo.cpp b/src/core/SubTensorInfo.cpp index fd3ebf26e8..3d68331181 100644 --- a/src/core/SubTensorInfo.cpp +++ b/src/core/SubTensorInfo.cpp @@ -121,7 +121,6 @@ bool SubTensorInfo::extend_padding(const PaddingSize &padding) ARM_COMPUTE_ERROR_ON(_parent->total_size() == 0); // Check that you do not extend padding on sub-tensors unless XY shape matches parent tensor - // TODO(COMPMID-3558): Remove _extend_parent check if(!_extend_parent && (padding.left || padding.right)) { ARM_COMPUTE_ERROR_ON(_parent->tensor_shape().x() != tensor_shape().x()); diff --git a/src/graph/Workload.cpp b/src/graph/Workload.cpp index 2bae1c8ca6..b9d57295b0 100644 --- a/src/graph/Workload.cpp +++ b/src/graph/Workload.cpp @@ -45,7 +45,6 @@ void execute_task(ExecutionTask &task) task.task->run(); } #ifdef ARM_COMPUTE_ASSERTS_ENABLED - // COMPMID-3012 - Hide the printing logic from the execute_task method in the graph API else if(task.node->type() == NodeType::PrintLayer) { auto print_node = utils::cast::polymorphic_downcast(task.node); diff --git a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp index 7fb1d583ff..c58a662f10 100644 --- a/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp +++ b/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp @@ -75,7 +75,7 @@ Params extract_parameters(const ITensor *a, const ITensor *b, const ITensor *d, else { p.multis = b->info()->tensor_shape().z(); - p.batches = d->info()->tensor_shape().total_size_upper(2) / p.multis; //COMPMID-1423: Agree on and document the layout of gemm inputs/outputs + p.batches = d->info()->tensor_shape().total_size_upper(2) / p.multis; } // Update M in case of GEMM3D for output diff --git a/src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp b/src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp index 5f5304cded..039714abb1 100644 --- a/src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp +++ b/src/runtime/cpu/operators/CpuDepthwiseConvolutionAssemblyDispatch.cpp @@ -459,7 +459,6 @@ bool CpuDepthwiseConvolutionAssemblyDispatch::is_optimized_supported(const ITens } // Check data type - // TODO (COMPMID-3004): Add assembly optimized routine for QASYMM8_SIGNED NEDepthwiseConvolutionLayer const DataType input_type = input->data_type(); const bool is_input_type_valid = is_data_type_float(input_type) || input_type == DataType::QASYMM8; const DataType weights_type = weights->data_type(); -- cgit v1.2.1