From fce453eb22f3d4418437a5878baf749e3cbfbf64 Mon Sep 17 00:00:00 2001 From: Siva Date: Mon, 9 Oct 2023 20:44:59 +0530 Subject: [PATCH] [CI][ADRENO] Few updates to Adreno docker setup Enabling google tests and clang-format version update. --- apps/cpp_clml/scripts/clml_codegen.py | 2 +- docker/Dockerfile.ci_adreno | 8 ++++++-- tests/scripts/task_config_build_adreno.sh | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/cpp_clml/scripts/clml_codegen.py b/apps/cpp_clml/scripts/clml_codegen.py index bf19c0e4b9b6..7540812ed58b 100644 --- a/apps/cpp_clml/scripts/clml_codegen.py +++ b/apps/cpp_clml/scripts/clml_codegen.py @@ -57,7 +57,7 @@ def main(): f_src = open("../clml_models.cc", "w") f_src.write("\n".join(gen_src)) f_src.close() - os.popen("clang-format-10 -i ../clml_models.cc") + os.popen("clang-format-15 -i ../clml_models.cc") if __name__ == "__main__": diff --git a/docker/Dockerfile.ci_adreno b/docker/Dockerfile.ci_adreno index 11be0a8baac7..961977c54286 100644 --- a/docker/Dockerfile.ci_adreno +++ b/docker/Dockerfile.ci_adreno @@ -16,7 +16,7 @@ # under the License. # CI docker GPU env -FROM tlcpack/ci-gpu:20220908-060034-62bdc91b1 +FROM tlcpack/ci-gpu COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear @@ -26,4 +26,8 @@ RUN bash /install/ubuntu_install_androidsdk.sh 25.2.9519653 3.22.1 33.0.2 33 ENV PATH /opt/android-sdk-linux/platform-tools:$PATH # Clang tool for CLML source codegen -RUN apt-get update && apt-install-and-clear -y clang-format-10 +RUN apt-get update && apt-install-and-clear -y clang-format-15 + +#Google Test +COPY install/ubuntu_install_googletest.sh /install/ubuntu_install_googletest.sh +RUN bash install/ubuntu_install_googletest.sh diff --git a/tests/scripts/task_config_build_adreno.sh b/tests/scripts/task_config_build_adreno.sh index 1b6750f16580..afe6407cba58 100755 --- a/tests/scripts/task_config_build_adreno.sh +++ b/tests/scripts/task_config_build_adreno.sh @@ -23,6 +23,7 @@ mkdir -p "$BUILD_DIR" cd "$BUILD_DIR" cp ../cmake/config.cmake . +echo set\(USE_OPENCL_GTEST /googletest\) >> config.cmake if [ -f "${ADRENO_OPENCL}/CL/cl_qcom_ml_ops.h" ] ; then echo set\(USE_CLML ${ADRENO_OPENCL}\) >> config.cmake else