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 /tests/framework | |
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 'tests/framework')
-rw-r--r-- | tests/framework/Framework.cpp | 11 | ||||
-rw-r--r-- | tests/framework/SConscript | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index a5c665c458..39fe1fa00a 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -30,6 +30,11 @@ #include "arm_compute/runtime/CL/CLScheduler.h" #endif /* ARM_COMPUTE_CL */ +#ifdef ARM_COMPUTE_GC +#include "arm_compute/core/GLES_COMPUTE/OpenGLES.h" +#include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" +#endif /* ARM_COMPUTE_GC */ + #include <chrono> #include <iostream> #include <sstream> @@ -292,6 +297,12 @@ void Framework::run_test(const TestInfo &info, TestCaseFactory &test_factory) CLScheduler::get().sync(); } #endif /* ARM_COMPUTE_CL */ +#ifdef ARM_COMPUTE_GC + if(opengles31_is_available()) + { + GCScheduler::get().sync(); + } +#endif /* ARM_COMPUTE_GC */ profiler.stop(); } diff --git a/tests/framework/SConscript b/tests/framework/SConscript index 52b8bed10f..f4beaf85ce 100644 --- a/tests/framework/SConscript +++ b/tests/framework/SConscript @@ -48,6 +48,11 @@ Help(new_options.GenerateHelpText(framework_env)) if(env['opencl']): framework_env.Append(CPPDEFINES=['ARM_COMPUTE_CL']) +if(env['gles_compute']): + framework_env.Append(CPPDEFINES=['ARM_COMPUTE_GC']) + if env['os'] != 'android': + framework_env.Append(CPPPATH = ["#opengles-3.1/include", "#opengles-3.1/mali_include"]) + framework_env.Append(CPPPATH = ["."]) framework_env.Append(CPPFLAGS=['-Wno-overloaded-virtual']) |