Skip to content

Commit d3900be

Browse files
mshr-hmshr-h
authored
[CI] Disable NNPACK build and fix error on Android SDK installaion (#17337)
* disable nnpack on ci * fix android sdk installation error * port from octoml/relax#38 * remove androidsdk from ci image
1 parent a355a52 commit d3900be

File tree

10 files changed

+14
-41
lines changed

10 files changed

+14
-41
lines changed

‎cmake/modules/contrib/TFLite.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ if(NOT USE_TFLITE STREQUAL "OFF")
3939
endif()
4040
find_library(TFLITE_CONTRIB_LIB libtensorflow-lite.a ${USE_TFLITE})
4141
file(GLOB_RECURSE TFLITE_DEPS "${USE_TFLITE}/*.a")
42+
# the order of the next libs are important for correct build
43+
list(REMOVE_ITEM TFLITE_DEPS "${USE_TFLITE}/_deps/clog-build/libclog.a" "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a")
44+
list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/cpuinfo-build/libcpuinfo.a")
45+
list(APPEND TFLITE_DEPS "${USE_TFLITE}/_deps/clog-build/libclog.a")
4246

4347
list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_CONTRIB_LIB})
4448
list(APPEND TVM_RUNTIME_LINKER_LIBS ${TFLITE_DEPS})

‎docker/Dockerfile.ci_adreno‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ FROM tlcpack/ci-gpu
2020

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

23-
# Android SDK
24-
COPY install/ubuntu_install_androidsdk.sh /install/ubuntu_install_androidsdk.sh
25-
RUN bash /install/ubuntu_install_androidsdk.sh 25.2.9519653 3.22.1 33.0.2 33
26-
ENV PATH /opt/android-sdk-linux/platform-tools:$PATH
27-
2823
# Clang tool for CLML source codegen
2924
RUN apt-get update && apt-install-and-clear -y clang-format-15
3025

‎docker/Dockerfile.ci_cpu‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ COPY install/ubuntu_install_golang.sh /install/ubuntu_install_golang.sh
7777
RUN bash /install/ubuntu_install_golang.sh
7878
ENV PATH $PATH:/usr/lib/go-1.18/bin
7979

80-
# NNPACK deps
81-
COPY install/ubuntu_install_nnpack.sh /install/ubuntu_install_nnpack.sh
82-
RUN bash /install/ubuntu_install_nnpack.sh
83-
8480
# ANTLR deps
8581
COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh
8682
RUN bash /install/ubuntu_install_java.sh
@@ -129,10 +125,6 @@ RUN bash /install/ubuntu_install_ethosn_driver_stack.sh
129125
COPY install/ubuntu_install_vitis_ai_packages_ci.sh /install/ubuntu_install_vitis_ai_packages_ci.sh
130126
RUN bash /install/ubuntu_install_vitis_ai_packages_ci.sh
131127

132-
# Android SDK
133-
COPY install/ubuntu_install_androidsdk.sh /install/ubuntu_install_androidsdk.sh
134-
RUN bash /install/ubuntu_install_androidsdk.sh
135-
136128
# PaddlePaddle deps
137129
COPY install/ubuntu_install_paddle.sh /install/ubuntu_install_paddle.sh
138130
RUN bash /install/ubuntu_install_paddle.sh

‎docker/Dockerfile.ci_gpu‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ RUN bash /install/ubuntu_install_wasmtime.sh
133133
COPY install/ubuntu_install_redis.sh /install/ubuntu_install_redis.sh
134134
RUN bash /install/ubuntu_install_redis.sh
135135

136-
# NNPACK deps
137-
COPY install/ubuntu_install_nnpack.sh /install/ubuntu_install_nnpack.sh
138-
RUN bash /install/ubuntu_install_nnpack.sh
139-
140136
# BYODT deps
141137
COPY install/ubuntu_install_universal.sh /install/ubuntu_install_universal.sh
142138
RUN bash /install/ubuntu_install_universal.sh

‎docker/Dockerfile.ci_hexagon‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,6 @@ RUN bash /install/ubuntu_install_python_package.sh
5858
COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh
5959
RUN bash /install/ubuntu_install_java.sh
6060

61-
# Android SDK
62-
COPY install/ubuntu_install_androidsdk.sh /install/ubuntu_install_androidsdk.sh
63-
RUN bash /install/ubuntu_install_androidsdk.sh
64-
ENV ANDROID_HOME=/opt/android-sdk-linux
65-
ENV PATH /opt/android-sdk-linux/platform-tools:$PATH
66-
6761
# Hexagon
6862
COPY install/ubuntu_install_hexagon.sh /install/ubuntu_install_hexagon.sh
6963
RUN bash /install/ubuntu_install_hexagon.sh

‎docker/Dockerfile.demo_vitis_ai‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ RUN bash /install/ubuntu_install_python_package.sh
4545
COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
4646
RUN bash /install/ubuntu_install_llvm.sh
4747

48-
# NNPACK deps
49-
COPY install/ubuntu_install_nnpack.sh /install/ubuntu_install_nnpack.sh
50-
RUN bash /install/ubuntu_install_nnpack.sh
51-
5248
ENV PATH $PATH:$CARGO_HOME/bin:/usr/lib/go-1.10/bin
5349

5450
# ANTLR deps

‎docker/install/ubuntu_install_androidsdk.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ ANDROID_HOME=/opt/android-sdk-linux
2525
ASDKTOOLS_HOME=/opt/android-sdk-tools
2626
ASDKTOOLS_VERSION=3859397
2727
ASDKTOOLS_SHA256=444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0
28+
COMMANDLINETOOLS_VERSION=11076708
29+
COMMANDLINETOOLS_SHA256=2d2d50857e4eb553af5a6dc3ad507a17adf43d115264b1afc116f95c92e5e258
2830

2931
ANDROID_NDK_VERSION=21.3.6528147
3032
CMAKE_VERSION=3.6.4111459
@@ -52,11 +54,11 @@ echo "Cmake Version: ${CMAKE_VERSION}"
5254
echo "Build Tools: ${BUILD_TOOLS_VERSION}"
5355
echo "Android Platform: ${ANDROID_PLATFORM}"
5456

55-
wget -q http://dl.google.com/android/repository/sdk-tools-linux-${ASDKTOOLS_VERSION}.zip -O sdk-tools-linux.zip
56-
echo "${ASDKTOOLS_SHA256} *sdk-tools-linux.zip" | sha256sum --check -
57-
unzip sdk-tools-linux.zip
58-
rm sdk-tools-linux.zip
59-
mv tools "${ASDKTOOLS_HOME}/"
57+
wget -q https://dl.google.com/android/repository/commandlinetools-linux-${COMMANDLINETOOLS_VERSION}_latest.zip -O commandlinetools-linux.zip
58+
echo "${COMMANDLINETOOLS_SHA256} commandlinetools-linux.zip" | sha256sum --check -
59+
unzip commandlinetools-linux.zip
60+
rm commandlinetools-linux.zip
61+
mv cmdline-tools/ "${ASDKTOOLS_HOME}/"
6062
# The following popular fix makes sdkmanager honour $http_proxy variables
6163
mv ${ASDKTOOLS_HOME}/bin/sdkmanager ${ASDKTOOLS_HOME}/bin/sdkmanager-vanilla
6264
cat >${ASDKTOOLS_HOME}/bin/sdkmanager <<"EOF"
@@ -90,8 +92,6 @@ extras;google;market_apk_expansion
9092
extras;google;market_licensing
9193
extras;google;simulators
9294
extras;google;webdriver
93-
extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
94-
extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
9595
platforms;android-26
9696
platforms;android-${ANDROID_PLATFORM}
9797
tools

‎docker/install/ubuntu_install_java.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o errexit -o nounset
2020
set -o pipefail
2121

2222
apt-get update
23-
apt-install-and-clear -y openjdk-8-jdk maven
23+
apt-install-and-clear -y openjdk-17-jdk maven
2424
arch=$(uname -m)
2525
jre_arch="unknown"
2626
case $arch in
@@ -36,8 +36,8 @@ case $arch in
3636
;;
3737
esac
3838

39-
if [ ! -d "/usr/lib/jvm/java-8-openjdk-$jre_arch/jre" ]; then
39+
if [ ! -d "/usr/lib/jvm/java-17-openjdk-$jre_arch" ]; then
4040
echo "error: missing openjdk for $jre_arch" >&2
4141
exit 1
4242
fi
43-
echo "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$jre_arch/jre" >> /etc/profile
43+
echo "export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-$jre_arch" >> /etc/profile

‎tests/scripts/task_config_build_cpu.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ echo set\(USE_PROFILER ON\) >> config.cmake
3030
echo set\(USE_DNNL ON\) >> config.cmake
3131
echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake
3232
echo set\(USE_LLVM \"/usr/bin/llvm-config-17 --link-static\"\) >> config.cmake
33-
echo set\(USE_NNPACK ON\) >> config.cmake
34-
echo set\(NNPACK_PATH /NNPACK/build/\) >> config.cmake
3533
echo set\(USE_ANTLR ON\) >> config.cmake
3634
echo set\(CMAKE_CXX_FLAGS \"-Werror -Wno-error=range-loop-construct\"\) >> config.cmake
3735
echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake

‎tests/scripts/task_config_build_gpu.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ echo set\(USE_OPENCL_GTEST \"/googletest\"\) >> config.cmake
3333
echo set\(USE_MICRO ON\) >> config.cmake
3434
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
3535
echo set\(USE_LLVM \"/usr/bin/llvm-config-15 --link-static\"\) >> config.cmake
36-
echo set\(USE_NNPACK ON\) >> config.cmake
37-
echo set\(NNPACK_PATH /NNPACK/build/\) >> config.cmake
3836
echo set\(USE_RPC ON\) >> config.cmake
3937
echo set\(USE_SORT ON\) >> config.cmake
4038
echo set\(USE_GRAPH_EXECUTOR ON\) >> config.cmake

0 commit comments

Comments
 (0)