Skip to content

Commit a79f632

Browse files
authored
[CI][ADRENO] Few updates to Adreno docker setup (#15897)
Enabling google tests and clang-format version update.
1 parent 8994359 commit a79f632

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

apps/cpp_clml/scripts/clml_codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def main():
5757
f_src = open("../clml_models.cc", "w")
5858
f_src.write("\n".join(gen_src))
5959
f_src.close()
60-
os.popen("clang-format-10 -i ../clml_models.cc")
60+
os.popen("clang-format-15 -i ../clml_models.cc")
6161

6262

6363
if __name__ == "__main__":

docker/Dockerfile.ci_adreno

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
# CI docker GPU env
19-
FROM tlcpack/ci-gpu:20220908-060034-62bdc91b1
19+
FROM tlcpack/ci-gpu
2020

2121
COPY utils/apt-install-and-clear.sh /usr/local/bin/apt-install-and-clear
2222

@@ -26,4 +26,8 @@ RUN bash /install/ubuntu_install_androidsdk.sh 25.2.9519653 3.22.1 33.0.2 33
2626
ENV PATH /opt/android-sdk-linux/platform-tools:$PATH
2727

2828
# Clang tool for CLML source codegen
29-
RUN apt-get update && apt-install-and-clear -y clang-format-10
29+
RUN apt-get update && apt-install-and-clear -y clang-format-15
30+
31+
#Google Test
32+
COPY install/ubuntu_install_googletest.sh /install/ubuntu_install_googletest.sh
33+
RUN bash install/ubuntu_install_googletest.sh

tests/scripts/task_config_build_adreno.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ mkdir -p "$BUILD_DIR"
2323
cd "$BUILD_DIR"
2424
cp ../cmake/config.cmake .
2525

26+
echo set\(USE_OPENCL_GTEST /googletest\) >> config.cmake
2627
if [ -f "${ADRENO_OPENCL}/CL/cl_qcom_ml_ops.h" ] ; then
2728
echo set\(USE_CLML ${ADRENO_OPENCL}\) >> config.cmake
2829
else

0 commit comments

Comments
 (0)