diff options
author | Anthony Barbier <anthony.barbier@arm.com> | 2017-10-26 15:23:08 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 7068f9900d136312318ff430aef588b14e0c87ad (patch) | |
tree | b57ca81231860f1d8755e6f18e5be7c959fb60c6 /examples | |
parent | d60737592736715dcfd0520535c48190d4ac77d2 (diff) | |
download | ComputeLibrary-7068f9900d136312318ff430aef588b14e0c87ad.tar.gz |
COMPMID-631: Merge branches/gles_compute branch
Last commit:
commit b25c5f68042b0c81bf611d59a1bb8535e1c42497
Author: Xinghang Zhou <xinghang.zhou@arm.com>
Date: Wed Oct 25 18:48:10 2017 +0800
Synced validation's tolerances of GCSoftmax from cl side
Change-Id: Ibe72054205c1c8721845d679a31af7ed0a7c5cf6
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93283
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/SConscript | 23 | ||||
-rw-r--r-- | examples/gc_absdiff.cpp | 112 |
2 files changed, 135 insertions, 0 deletions
diff --git a/examples/SConscript b/examples/SConscript index 52d2f26cfe..90b271d473 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -27,11 +27,18 @@ Import('env') if env['opencl']: Import('opencl') +if env['gles_compute'] and env['os'] != 'android': + Import('egl') + Import('glesv2') + examples_env = env.Clone() examples_env.Append(CPPPATH = ["#"]) examples_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']]) +if env['gles_compute'] and env['os'] != 'android': + examples_env.Append(LIBPATH = ["#build/%s/opengles-3.1/stubs" % env['build_dir']]) + # Build examples utils = examples_env.Object("../utils/Utils.cpp") @@ -86,3 +93,19 @@ if env['neon']: Depends(prog, arm_compute_dependency) 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]) + if env['os'] != 'android': + examples_env.Append(CPPPATH = ["#opengles-3.1/include", "#opengles-3.1/mali_include"]) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = [arm_compute_libs, "EGL", "GLESv2"]) + Depends(prog, [arm_compute_dependency, egl, glesv2]) + else: + if env['arch'] != 'armv7a': + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = [arm_compute_libs, "EGL", "GLESv3"]) + else: + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = [arm_compute_libs, "EGL", "GLESv2"]) + Depends(prog, [arm_compute_dependency]) + alias = examples_env.Alias(example, prog) + Default(alias) diff --git a/examples/gc_absdiff.cpp b/examples/gc_absdiff.cpp new file mode 100644 index 0000000000..cd3e42989c --- /dev/null +++ b/examples/gc_absdiff.cpp @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2017 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/Utils.h" + +using namespace arm_compute; +using namespace utils; + +void main_gc_absdiff(int argc, const char **argv) +{ + PPMLoader ppm1, ppm2; + GCImage src1, src2, dst; + 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()); + + GCAbsoluteDifference absdiff; + 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); + } + if(ppm2.is_open()) + { + ppm2.fill_image(src2); + } + + // Execute the functions: + absdiff.run(); + + // Make sure all the jobs are done executing: + GCScheduler::get().sync(); + + // Save the result to file: + if(ppm1.is_open()) + { + const std::string output_filename = std::string(argv[1]) + "_out.ppm"; + save_to_ppm(dst, output_filename); // save_to_ppm maps and unmaps the image to store as PPM + } +} + +/** 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, const char **argv) +{ + return utils::run_example(argc, argv, main_gc_absdiff); +} |