commit 7068f9900d136312318ff430aef588b14e0c87ad
author Anthony Barbier <anthony.barbier@arm.com> Thu Oct 26 15:23:08 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:35:24 2018 +0000
tree b57ca81231860f1d8755e6f18e5be7c959fb60c6
parent d60737592736715dcfd0520535c48190d4ac77d2

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>

scripts/check_bad_style.sh

diff --git a/scripts/check_bad_style.sh b/scripts/check_bad_style.sh
index 827163f..cd6e904 100755
--- a/scripts/check_bad_style.sh
+++ b/scripts/check_bad_style.sh
@@ -21,7 +21,7 @@
     exit -1
 fi
 
-grep -HnRE --exclude-dir=assembly "\buint " --exclude-dir=cl_kernels $DIRECTORIES | tee bad_style.log
+grep -HnRE --exclude-dir=assembly "\buint " --exclude-dir=cl_kernels --exclude-dir=cs_shaders $DIRECTORIES | tee bad_style.log
 if [[ $(cat bad_style.log | wc -l) > 0 ]]
 then
     echo ""

scripts/clang_tidy_rules.py

diff --git a/scripts/clang_tidy_rules.py b/scripts/clang_tidy_rules.py
index 09dc2e1..c70395f 100755
--- a/scripts/clang_tidy_rules.py
+++ b/scripts/clang_tidy_rules.py
@@ -6,13 +6,14 @@
 import sys
 
 def get_list_includes():
-    return "include . 3rdparty/include kernels computer_vision".split()
+    return "opengles-3.1/include opengles-3.1/mali_include include . 3rdparty/include kernels computer_vision".split()
 
 def get_list_flags( filename, arch):
     assert arch in ["armv7", "aarch64"]
     flags = ["-std=c++11"]
     flags.append("-DARM_COMPUTE_CPP_SCHEDULER=1")
     flags.append("-DARM_COMPUTE_CL")
+    flags.append("-DARM_COMPUTE_GC")
     if arch == "aarch64":
         flags.append("-DARM_COMPUTE_AARCH64_V8_2")
     return flags

scripts/fix_code_formatting.sh

diff --git a/scripts/fix_code_formatting.sh b/scripts/fix_code_formatting.sh
index a07d261..721ade8 100755
--- a/scripts/fix_code_formatting.sh
+++ b/scripts/fix_code_formatting.sh
@@ -22,7 +22,7 @@
 
 if [ $# -eq 0 ]
 then
-    files=$(find $DIRECTORIES -type f \( -name \*.cpp -o -iname \*.h -o -name \*.inl -o -name \*.cl \))
+    files=$(find $DIRECTORIES -type f \( -name \*.cpp -o -iname \*.h -o -name \*.inl -o -name \*.cl -o -name \*.cs \))
 else
 	files=$@
 fi