From ceaa0bfe219631b5a4e638613f90f9fa47a3defe Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Tue, 16 Feb 2021 15:15:19 +0000 Subject: Remove OpenGL ES support Remove the following: - Relevant backend kernels - Relevant backend functions - Relevant backend validation tests - Relevant backend specific examples - Remove backend support from Graph API - Remove backend support from build system Update documentation Resolves: COMPMID-4149 Change-Id: Id0621d6ee35169754de458103907aaba4ef770c0 Signed-off-by: Manuel Bottini Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5097 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Reviewed-by: Georgios Pinitas --- tests/GLES_COMPUTE/GCAccessor.h | 148 ---------------------------------------- tests/GLES_COMPUTE/Helper.h | 94 ------------------------- 2 files changed, 242 deletions(-) delete mode 100644 tests/GLES_COMPUTE/GCAccessor.h delete mode 100644 tests/GLES_COMPUTE/Helper.h (limited to 'tests/GLES_COMPUTE') diff --git a/tests/GLES_COMPUTE/GCAccessor.h b/tests/GLES_COMPUTE/GCAccessor.h deleted file mode 100644 index 65df0a5ddc..0000000000 --- a/tests/GLES_COMPUTE/GCAccessor.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2017-2020 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef ARM_COMPUTE_TEST_GCACCESSOR_H -#define ARM_COMPUTE_TEST_GCACCESSOR_H - -#include "arm_compute/runtime/GLES_COMPUTE/GCTensor.h" -#include "tests/IAccessor.h" - -namespace arm_compute -{ -namespace test -{ -/** Accessor implementation for @ref GCTensor objects. */ -class GCAccessor : public IAccessor -{ -public: - /** Create an accessor for the given @p tensor. - * - * @param[in, out] tensor To be accessed tensor. - * - * @note The GLES memory is mapped by the constructor. - * - */ - GCAccessor(GCTensor &tensor); - - /** Prevent instances of this class from being copy constructed */ - GCAccessor(const GCAccessor &) = delete; - /** Prevent instances of this class from being copied */ - GCAccessor &operator=(const GCAccessor &) = delete; - /** Allow instances of this class to be move constructed */ - GCAccessor(GCAccessor &&) = default; - /** Prevent instances of this class to be moved */ - GCAccessor &operator=(GCAccessor &&) = delete; - - /** Destructor that unmaps the GLES memory. */ - ~GCAccessor(); - - TensorShape shape() const override; - size_t element_size() const override; - size_t size() const override; - Format format() const override; - DataLayout data_layout() const override; - DataType data_type() const override; - int num_channels() const override; - int num_elements() const override; - PaddingSize padding() const override; - QuantizationInfo quantization_info() const override; - const void *operator()(const Coordinates &coord) const override; - void *operator()(const Coordinates &coord) override; - -private: - GCTensor &_tensor; -}; - -inline GCAccessor::GCAccessor(GCTensor &tensor) - : _tensor{ tensor } -{ - _tensor.map(); -} - -inline GCAccessor::~GCAccessor() -{ - _tensor.unmap(); -} - -inline TensorShape GCAccessor::shape() const -{ - return _tensor.info()->tensor_shape(); -} - -inline size_t GCAccessor::element_size() const -{ - return _tensor.info()->element_size(); -} - -inline size_t GCAccessor::size() const -{ - return _tensor.info()->total_size(); -} - -inline Format GCAccessor::format() const -{ - return _tensor.info()->format(); -} - -inline DataLayout GCAccessor::data_layout() const -{ - return _tensor.info()->data_layout(); -} - -inline DataType GCAccessor::data_type() const -{ - return _tensor.info()->data_type(); -} - -inline int GCAccessor::num_channels() const -{ - return _tensor.info()->num_channels(); -} - -inline int GCAccessor::num_elements() const -{ - return _tensor.info()->tensor_shape().total_size(); -} - -inline PaddingSize GCAccessor::padding() const -{ - return _tensor.info()->padding(); -} - -inline QuantizationInfo GCAccessor::quantization_info() const -{ - return _tensor.info()->quantization_info(); -} - -inline const void *GCAccessor::operator()(const Coordinates &coord) const -{ - return _tensor.ptr_to_element(coord); -} - -inline void *GCAccessor::operator()(const Coordinates &coord) -{ - return _tensor.ptr_to_element(coord); -} -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_GCACCESSOR_H */ diff --git a/tests/GLES_COMPUTE/Helper.h b/tests/GLES_COMPUTE/Helper.h deleted file mode 100644 index fb1679e3ff..0000000000 --- a/tests/GLES_COMPUTE/Helper.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2017-2019 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef ARM_COMPUTE_TEST_GC_HELPER_H -#define ARM_COMPUTE_TEST_GC_HELPER_H - -#include "tests/Globals.h" - -#include "arm_compute/core/ITensor.h" -#include "arm_compute/runtime/GLES_COMPUTE/GCTensor.h" - -#include - -namespace arm_compute -{ -namespace test -{ -/** Helper to create an empty tensor. - * - * @param[in] shape Desired shape. - * @param[in] data_type Desired data type. - * @param[in] num_channels (Optional) It indicates the number of channels for each tensor element - * - * @return Empty @ref GCTensor with the specified shape and data type. - */ -inline GCTensor create_tensor(const TensorShape &shape, DataType data_type, int num_channels = 1) -{ - GCTensor tensor; - tensor.allocator()->init(TensorInfo(shape, num_channels, data_type)); - - return tensor; -} - -/** Helper to create an empty tensor. - * - * @param[in] name File name from which to get the dimensions. - * @param[in] data_type Desired data type. - * - * @return Empty @ref GCTensor with the specified shape and data type. - */ -inline GCTensor create_tensor(const std::string &name, DataType data_type) -{ - constexpr unsigned int num_channels = 1; - - const RawTensor &raw = library->get(name); - - GCTensor tensor; - tensor.allocator()->init(TensorInfo(raw.shape(), num_channels, data_type)); - - return tensor; -} - -/** Helper to print tensor. - * - * @param[in] tensor Tensor to print. - * @param[in] name Tensor name. - * @param[in] info Format information. - * - * @return Empty @ref GCTensor with the specified shape and data type. - */ -inline void print_tensor(ITensor &tensor, const std::string &name, IOFormatInfo info = IOFormatInfo(IOFormatInfo::PrintRegion::Full)) -{ - std::ostringstream s; - IGCTensor &t = dynamic_cast(tensor); - t.map(); - t.print(s, info); - - std::cout << name << ":" << std::endl; - std::cout << s.str().c_str(); - t.unmap(); -} -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_GC_HELPER_H */ -- cgit v1.2.1