Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI][ADRENO] Few updates to Adreno docker setup #15897

Merged
merged 1 commit into from
Oct 10, 2023
Merged

[CI][ADRENO] Few updates to Adreno docker setup #15897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/cpp_clml/scripts/clml_codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand Down
8 changes: 6 additions & 2 deletions docker/Dockerfile.ci_adreno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
1 change: 1 addition & 0 deletions tests/scripts/task_config_build_adreno.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down