From 473cb01e84cef6cab057e9492bfa3b68f708e5d7 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 23 Feb 2021 11:48:12 +0000 Subject: Remove Compute Vision CL support Resolves COMPMID-4151 Change-Id: I46f541efe8c4087f27794d2e158b6c1547d459ba Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5160 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- examples/cl_convolution.cpp | 137 ------------------------------------------ examples/cl_events.cpp | 132 ---------------------------------------- examples/neon_convolution.cpp | 130 --------------------------------------- 3 files changed, 399 deletions(-) delete mode 100644 examples/cl_convolution.cpp delete mode 100644 examples/cl_events.cpp delete mode 100644 examples/neon_convolution.cpp (limited to 'examples') diff --git a/examples/cl_convolution.cpp b/examples/cl_convolution.cpp deleted file mode 100644 index bfa53f3379..0000000000 --- a/examples/cl_convolution.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (c) 2016-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_CL /* Needed by Utils.cpp to handle OpenCL exceptions properly */ -#error "This example needs to be built with -DARM_COMPUTE_CL" -#endif /* ARM_COMPUTE_CL */ - -#include "arm_compute/core/CL/OpenCL.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/CLScheduler.h" -#include "arm_compute/runtime/CL/functions/CLConvolution.h" -#include "utils/ImageLoader.h" -#include "utils/Utils.h" - -using namespace arm_compute; -using namespace utils; - -/** Gaussian 3x3 matrix - */ -const std::array gaussian3x3 = -{ - 1, 2, 1, - 2, 4, 2, - 1, 2, 1 -}; - -/** Gaussian 5x5 matrix - */ -const std::array gaussian5x5 = -{ - 1, 4, 6, 4, 1, - 4, 16, 24, 16, 4, - 6, 24, 36, 24, 6, - 4, 16, 24, 16, 4, - 1, 4, 6, 4, 1 -}; - -class CLConvolutionExample : public Example -{ -public: - bool do_setup(int argc, char **argv) override - { - PPMLoader ppm; - - CLScheduler::get().default_init(); - - if(argc < 2) - { - // Print help - std::cout << "Usage: ./build/cl_convolution [input_image.ppm]\n\n"; - std::cout << "No input_image provided, creating a dummy 640x480 image\n"; - // Create an empty grayscale 640x480 image - src.allocator()->init(TensorInfo(640, 480, Format::U8)); - } - else - { - ppm.open(argv[1]); - ppm.init_image(src, Format::U8); - } - - // Configure the temporary and destination images - tmp.allocator()->init(*src.info()); - dst.allocator()->init(*src.info()); - - // Apply a Gaussian 3x3 filter to the source image followed by a Gaussian 5x5: - conv3x3.configure(&src, &tmp, gaussian3x3.data(), 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED); - conv5x5.configure(&tmp, &dst, gaussian5x5.data(), 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED); - - // Allocate all the images - src.allocator()->allocate(); - tmp.allocator()->allocate(); - dst.allocator()->allocate(); - // Fill the input image with the content of the PPM image if a filename was provided: - if(ppm.is_open()) - { - ppm.fill_image(src); - output_filename = std::string(argv[1]) + "_out.ppm"; - } - - return true; - } - void do_run() override - { - // Execute the functions: - conv3x3.run(); - conv5x5.run(); - - // Make sure all the OpenCL jobs are done executing: - CLScheduler::get().sync(); - } - void do_teardown() override - { - // Save the result to file: - if(!output_filename.empty()) - { - save_to_ppm(dst, output_filename); // save_to_ppm maps and unmaps the image to store as PPM - } - } - -private: - CLImage src{}; - CLImage tmp{}; - CLImage dst{}; - CLConvolution3x3 conv3x3{}; - CLConvolution5x5 conv5x5{}; - std::string output_filename{}; -}; - -/** Main program for convolution test - * - * @param[in] argc Number of arguments - * @param[in] argv Arguments ( [optional] Path to PPM image to process ) - */ -int main(int argc, char **argv) -{ - return utils::run_example(argc, argv); -} diff --git a/examples/cl_events.cpp b/examples/cl_events.cpp deleted file mode 100644 index 27c063cbc9..0000000000 --- a/examples/cl_events.cpp +++ /dev/null @@ -1,132 +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_CL /* Needed by Utils.cpp to handle OpenCL exceptions properly */ -#error "This example needs to be built with -DARM_COMPUTE_CL" -#endif /* ARM_COMPUTE_CL */ - -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/CLScheduler.h" -#include "arm_compute/runtime/CL/functions/CLGaussian5x5.h" -#include "arm_compute/runtime/CL/functions/CLMedian3x3.h" -#include "arm_compute/runtime/CL/functions/CLScale.h" -#include "utils/ImageLoader.h" -#include "utils/Utils.h" - -using namespace arm_compute; -using namespace utils; - -class CLEventsExample : public Example -{ -public: - bool do_setup(int argc, char **argv) override - { - /** [OpenCL events] **/ - PPMLoader ppm; - constexpr int scale_factor = 2; - - CLScheduler::get().default_init(); - - if(argc < 2) - { - // Print help - std::cout << "Usage: ./build/cl_events [input_image.ppm]\n\n"; - std::cout << "No input_image provided, creating a dummy 640x480 image\n"; - // Create an empty grayscale 640x480 image - src.allocator()->init(TensorInfo(640, 480, Format::U8)); - } - else - { - ppm.open(argv[1]); - ppm.init_image(src, Format::U8); - } - - TensorInfo dst_info(src.info()->dimension(0) / scale_factor, src.info()->dimension(1) / scale_factor, Format::U8); - - // Configure the temporary and destination images - dst.allocator()->init(dst_info); - tmp_scale_median.allocator()->init(dst_info); - tmp_median_gauss.allocator()->init(dst_info); - - //Configure the functions: - scale.configure(&src, &tmp_scale_median, ScaleKernelInfo{ InterpolationPolicy::NEAREST_NEIGHBOR, BorderMode::REPLICATE }); - median.configure(&tmp_scale_median, &tmp_median_gauss, BorderMode::REPLICATE); - gauss.configure(&tmp_median_gauss, &dst, BorderMode::REPLICATE); - - // Allocate all the images - src.allocator()->allocate(); - dst.allocator()->allocate(); - tmp_scale_median.allocator()->allocate(); - tmp_median_gauss.allocator()->allocate(); - - // Fill the input image with the content of the PPM image if a filename was provided: - if(ppm.is_open()) - { - ppm.fill_image(src); - output_filename = std::string(argv[1]) + "_out.ppm"; - } - /** [OpenCL events] **/ - - return true; - } - void do_run() override - { - // Enqueue and flush the scale OpenCL kernel: - scale.run(); - // Create a synchronisation event between scale and median: - cl::Event scale_event = CLScheduler::get().enqueue_sync_event(); - // Enqueue and flush the median OpenCL kernel: - median.run(); - // Enqueue and flush the Gaussian OpenCL kernel: - gauss.run(); - - //Make sure all the OpenCL jobs are done executing: - scale_event.wait(); // Block until Scale is done executing (Median3x3 and Gaussian5x5 might still be running) - CLScheduler::get().sync(); // Block until Gaussian5x5 is done executing - } - void do_teardown() override - { - // Save the result to file: - if(!output_filename.empty()) - { - save_to_ppm(dst, output_filename); // save_to_ppm maps and unmaps the image to store as PPM - } - } - -private: - CLImage src{}, tmp_scale_median{}, tmp_median_gauss{}, dst{}; - CLScale scale{}; - CLMedian3x3 median{}; - CLGaussian5x5 gauss{}; - std::string output_filename{}; -}; - -/** Main program for convolution test - * - * @param[in] argc Number of arguments - * @param[in] argv Arguments ( [optional] Path to PPM image to process ) - */ -int main(int argc, char **argv) -{ - return utils::run_example(argc, argv); -} diff --git a/examples/neon_convolution.cpp b/examples/neon_convolution.cpp deleted file mode 100644 index 0b33c76d51..0000000000 --- a/examples/neon_convolution.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright (c) 2016-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. - */ -#include "arm_compute/runtime/NEON/NEFunctions.h" - -#include "arm_compute/core/Types.h" -#include "utils/ImageLoader.h" -#include "utils/Utils.h" - -using namespace arm_compute; -using namespace utils; - -/** Gaussian 3x3 matrix - */ -const std::array gaussian3x3 = -{ - 1, 2, 1, - 2, 4, 2, - 1, 2, 1 -}; - -/** Gaussian 5x5 matrix - */ -const std::array gaussian5x5 = -{ - 1, 4, 6, 4, 1, - 4, 16, 24, 16, 4, - 6, 24, 36, 24, 6, - 4, 16, 24, 16, 4, - 1, 4, 6, 4, 1 -}; - -class NEONConvolutionExample : public Example -{ -public: - bool do_setup(int argc, char **argv) override - { - /** [Accurate padding] **/ - PPMLoader ppm; - - if(argc < 2) - { - // Print help - std::cout << "Usage: ./build/neon_convolution [input_image.ppm]\n\n"; - std::cout << "No input_image provided, creating a dummy 640x480 image\n"; - // Initialize just the dimensions and format of your buffers: - src.allocator()->init(TensorInfo(640, 480, Format::U8)); - } - else - { - ppm.open(argv[1]); - // Initialize just the dimensions and format of your buffers: - ppm.init_image(src, Format::U8); - } - - // Initialize just the dimensions and format of the temporary and destination images: - tmp.allocator()->init(*src.info()); - dst.allocator()->init(*src.info()); - - // Apply a Gaussian 3x3 filter to the source image followed by a Gaussian 5x5: - // The function will automatically update the padding information inside input and output to match its requirements - conv3x3.configure(&src, &tmp, gaussian3x3.data(), 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED); - conv5x5.configure(&tmp, &dst, gaussian5x5.data(), 0 /* Let arm_compute calculate the scale */, BorderMode::UNDEFINED); - - // Now that the padding requirements are known we can allocate the images: - src.allocator()->allocate(); - tmp.allocator()->allocate(); - dst.allocator()->allocate(); - - // Fill the input image with the content of the PPM image if a filename was provided: - if(ppm.is_open()) - { - ppm.fill_image(src); - output_filename = std::string(argv[1]) + "_out.ppm"; - } - /** [Accurate padding] **/ - - return true; - } - void do_run() override - { - //Execute the functions: - conv3x3.run(); - conv5x5.run(); - } - void do_teardown() override - { - // Save the result to file: - if(!output_filename.empty()) - { - save_to_ppm(dst, output_filename); // save_to_ppm maps and unmaps the image to store as PPM - } - } - -private: - Image src{}, tmp{}, dst{}; - NEConvolution3x3 conv3x3{}; - NEConvolution5x5 conv5x5{}; - std::string output_filename{}; -}; - -/** Main program for convolution test - * - * @param[in] argc Number of arguments - * @param[in] argv Arguments ( [optional] Path to PPM image to process ) - */ -int main(int argc, char **argv) -{ - return utils::run_example(argc, argv); -} -- cgit v1.2.1