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 --- examples/SConscript | 9 ---- examples/gc_absdiff.cpp | 127 ---------------------------------------------- examples/gc_dc.cpp | 132 ------------------------------------------------ 3 files changed, 268 deletions(-) delete mode 100644 examples/gc_absdiff.cpp delete mode 100644 examples/gc_dc.cpp (limited to 'examples') diff --git a/examples/SConscript b/examples/SConscript index c7bc7dfb36..8ee688e76d 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -128,15 +128,6 @@ if env['neon']: alias = examples_env.Alias(example, prog) Default(alias) -if env['gles_compute']: - for file in Glob("./gc_*.cpp"): - example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = examples_libs + arm_compute_libs) - Depends(prog, arm_compute_dependency) - prog = install_bin(prog) - alias = examples_env.Alias(example, prog) - Default(alias) - if env['external_tests_dir']: for file in Glob(env['external_tests_dir'] + "/examples/graph_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) diff --git a/examples/gc_absdiff.cpp b/examples/gc_absdiff.cpp deleted file mode 100644 index 701e43f820..0000000000 --- a/examples/gc_absdiff.cpp +++ /dev/null @@ -1,127 +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_GC /* Needed by Utils.cpp to handle OpenGL ES exceptions properly */ -#error "This example needs to be built with -DARM_COMPUTE_GC" -#endif /* ARM_COMPUTE_GC */ - -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/GLES_COMPUTE/GCFunctions.h" -#include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "utils/ImageLoader.h" -#include "utils/Utils.h" - -using namespace arm_compute; -using namespace utils; - -class GCAbsDiffExample : public Example -{ -public: - bool do_setup(int argc, char **argv) override - { - PPMLoader ppm1{}; - PPMLoader ppm2{}; - - GCScheduler::get().default_init(); - if(argc < 2) - { - // Print help - std::cout << "Usage: " << argv[0] << " [input0_image.ppm] [input1_image.ppm] \n\n"; - std::cout << "No input_image provided, creating two dummy 640x480 images\n"; - // Create two empty grayscale 640x480 images - src1.allocator()->init(TensorInfo(640, 480, Format::U8)); - src2.allocator()->init(TensorInfo(640, 480, Format::U8)); - } - else if(argc < 3) - { - // Print help - std::cout << "Usage: " << argv[0] << " [input0_image.ppm] [input1_image.ppm] \n\n"; - std::cout << "Only one input_image provided, creating a dummy 640x480 image\n"; - ppm1.open(argv[1]); - ppm1.init_image(src1, Format::U8); - // Create an empty grayscale 640x480 image - src2.allocator()->init(TensorInfo(640, 480, Format::U8)); - } - else - { - ppm1.open(argv[1]); - ppm1.init_image(src1, Format::U8); - ppm2.open(argv[2]); - ppm2.init_image(src2, Format::U8); - } - - // Configure the temporary and destination images - dst.allocator()->init(*src1.info()); - - absdiff.configure(&src1, &src2, &dst); - - // Allocate all the images - src1.allocator()->allocate(); - src2.allocator()->allocate(); - dst.allocator()->allocate(); - - // Fill the input image with the content of the PPM image if a filename was provided: - if(ppm1.is_open()) - { - ppm1.fill_image(src1); - output_filename = std::string(argv[1]) + "_out.ppm"; - } - if(ppm2.is_open()) - { - ppm2.fill_image(src2); - } - - return true; - } - void do_run() override - { - // Execute the functions: - absdiff.run(); - } - void do_teardown() override - { - // Save the result to file: - if(!output_filename.empty()) - { - // save_to_ppm maps and unmaps the image to store as PPM - // The GCTensor::map call inside the save_to_ppm will block until all pending operations on that image have completed - save_to_ppm(dst, output_filename); - } - } - -private: - GCImage src1{}, src2{}, dst{}; - GCAbsoluteDifference absdiff{}; - std::string output_filename{}; -}; - -/** Main program for absdiff test - * - * @param[in] argc Number of arguments - * @param[in] argv Arguments ( [optional] Path to the first PPM image to process, [optional] Path the the second PPM image to process ) - */ -int main(int argc, char **argv) -{ - return utils::run_example(argc, argv); -} diff --git a/examples/gc_dc.cpp b/examples/gc_dc.cpp deleted file mode 100644 index ac235fd2a1..0000000000 --- a/examples/gc_dc.cpp +++ /dev/null @@ -1,132 +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_GC -#error "This example needs to be built with -DARM_COMPUTE_GC" -#endif /* ARM_COMPUTE_GC */ - -#include "arm_compute/runtime/GLES_COMPUTE/GCFunctions.h" -#include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "half/half.hpp" -#include "utils/Utils.h" - -using namespace arm_compute; -using namespace utils; - -class GCDCExample : public Example -{ -public: - bool do_setup(int argc, char **argv) override - { - ARM_COMPUTE_UNUSED(argc); - ARM_COMPUTE_UNUSED(argv); - - // init instance - GCScheduler::get().default_init(); - - const TensorShape src_shape = TensorShape{ 11U /* W */, 13U /* H */, 4U /* C */, 3U /* N */ }; - const unsigned int kernel_size = 3; - const int stride_x = 1; - const int stride_y = 1; - const int pad_x = 0; - const int pad_y = 0; - const unsigned int num_kernels = 256; - const DataType data_type = DataType::F16; - - // generate shape - const TensorShape weights_shape(kernel_size, kernel_size, src_shape.z(), num_kernels); - const TensorShape bias_shape(num_kernels); - const PadStrideInfo pad_info(stride_x, stride_y, pad_x, pad_y, DimensionRoundingType::FLOOR); - - // output shape should be 9*11*256*3 (W*H*C*N) - const TensorShape dst_shape = get_output_shape(src_shape, weights_shape, pad_info); - - // create tensors - src.allocator()->init(TensorInfo(src_shape, 1, data_type)); - weights.allocator()->init(TensorInfo(weights_shape, 1, data_type)); - bias.allocator()->init(TensorInfo(bias_shape, 1, data_type)); - dst.allocator()->init(TensorInfo(dst_shape, 1, data_type)); - - // configure layer - conv.configure(&src, &weights, &bias, &dst, pad_info); - - // allocate tensors - src.allocator()->allocate(); - weights.allocator()->allocate(); - bias.allocator()->allocate(); - dst.allocator()->allocate(); - - // To demonstrate how to fill tensor with some values... - src.map(); - Window window; - window.use_tensor_dimensions(src_shape); - Iterator it(&src, window); - execute_window_loop(window, [&](const Coordinates &) - { - *reinterpret_cast(it.ptr()) = half_float::half(1.f); - }); - src.unmap(); - - return true; - } - void do_run() override - { - // run the layer - conv.run(); - } - void do_teardown() override - { - // check result - dst.map(); - // do something - dst.unmap(); - } - -private: - GCTensor src{}, weights{}, bias{}, dst{}; - GCDirectConvolutionLayer conv{}; - - TensorShape get_output_shape(TensorShape in_shape, TensorShape kernel_shape, const PadStrideInfo &info) - { - TensorShape out_shape(in_shape); - const std::pair scaled_dims = scaled_dimensions(in_shape.x(), - in_shape.y(), - kernel_shape.x(), - kernel_shape.y(), - info); - out_shape.set(0, scaled_dims.first); - out_shape.set(1, scaled_dims.second); - out_shape.set(2, kernel_shape[3]); - return out_shape; - } -}; - -/** Main program for directconvolution test - * - * @param[in] argc Number of arguments - * @param[in] argv Arguments - */ -int main(int argc, char **argv) -{ - return utils::run_example(argc, argv); -} -- cgit v1.2.1