Skip to content

Commit a640b20

Browse files
tqchenwweic
tqchen
authored and
wweic
committed
[CI] Upgrade LLVM envs (apache#3590)
1 parent ba23e03 commit a640b20

22 files changed

+86
-83
lines changed

‎Jenkinsfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
// - Periodically cleanup the old versions on local workers
4040
//
4141
ci_lint = "tvmai/ci-lint:v0.51"
42-
ci_gpu = "tvmai/ci-gpu:v0.52"
43-
ci_cpu = "tvmai/ci-cpu:v0.50"
44-
ci_i386 = "tvmai/ci-i386:v0.50"
42+
ci_gpu = "tvmai/ci-gpu:v0.53"
43+
ci_cpu = "tvmai/ci-cpu:v0.51"
44+
ci_i386 = "tvmai/ci-i386:v0.51"
4545

4646
// tvm libraries
4747
tvm_runtime = "build/libtvm_runtime.so, build/config.cmake"
@@ -136,7 +136,7 @@ stage('Build') {
136136
echo set\\(USE_CUDA ON\\) >> config.cmake
137137
echo set\\(USE_OPENGL ON\\) >> config.cmake
138138
echo set\\(USE_MICRO ON\\) >> config.cmake
139-
echo set\\(USE_LLVM llvm-config-6.0\\) >> config.cmake
139+
echo set\\(USE_LLVM llvm-config-7\\) >> config.cmake
140140
echo set\\(USE_NNPACK ON\\) >> config.cmake
141141
echo set\\(NNPACK_PATH /NNPACK/build/\\) >> config.cmake
142142
echo set\\(USE_RPC ON\\) >> config.cmake
@@ -160,7 +160,7 @@ stage('Build') {
160160
echo set\\(USE_VULKAN ON\\) >> config.cmake
161161
echo set\\(USE_MICRO ON\\) >> config.cmake
162162
echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake
163-
echo set\\(CMAKE_CXX_COMPILER clang-6.0\\) >> config.cmake
163+
echo set\\(CMAKE_CXX_COMPILER clang-7\\) >> config.cmake
164164
echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake
165165
"""
166166
make(ci_gpu, 'build2', '-j4')
@@ -178,7 +178,7 @@ stage('Build') {
178178
echo set\\(USE_SORT ON\\) >> config.cmake
179179
echo set\\(USE_MICRO ON\\) >> config.cmake
180180
echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake
181-
echo set\\(USE_LLVM llvm-config-4.0\\) >> config.cmake
181+
echo set\\(USE_LLVM llvm-config-8\\) >> config.cmake
182182
echo set\\(USE_NNPACK ON\\) >> config.cmake
183183
echo set\\(NNPACK_PATH /NNPACK/build/\\) >> config.cmake
184184
echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake
@@ -208,7 +208,7 @@ stage('Build') {
208208
echo set\\(USE_SORT ON\\) >> config.cmake
209209
echo set\\(USE_RPC ON\\) >> config.cmake
210210
echo set\\(USE_GRAPH_RUNTIME_DEBUG ON\\) >> config.cmake
211-
echo set\\(USE_LLVM llvm-config-5.0\\) >> config.cmake
211+
echo set\\(USE_LLVM llvm-config-4.0\\) >> config.cmake
212212
echo set\\(CMAKE_CXX_COMPILER g++\\) >> config.cmake
213213
echo set\\(CMAKE_CXX_FLAGS -Werror\\) >> config.cmake
214214
"""

‎docker/Dockerfile.ci_gpu‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ RUN bash /install/ubuntu_install_coreml.sh
7272
COPY install/ubuntu_install_tensorflow.sh /install/ubuntu_install_tensorflow.sh
7373
RUN bash /install/ubuntu_install_tensorflow.sh
7474

75-
COPY install/ubuntu_install_keras.sh /install/ubuntu_install_keras.sh
76-
RUN bash /install/ubuntu_install_keras.sh
7775

7876
COPY install/ubuntu_install_darknet.sh /install/ubuntu_install_darknet.sh
7977
RUN bash /install/ubuntu_install_darknet.sh

‎docker/Dockerfile.demo_android‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RUN bash /install/ubuntu_install_python.sh
2929
COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh
3030
RUN bash /install/ubuntu_install_python_package.sh
3131

32-
COPY install/ubuntu_install_keras.sh /install/ubuntu_install_keras.sh
33-
RUN bash /install/ubuntu_install_keras.sh
32+
COPY install/ubuntu_install_tensorflow.sh /install/ubuntu_install_tensorflow.sh
33+
RUN bash /install/ubuntu_install_tensorflow.sh
3434

3535
COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh
3636
RUN bash /install/ubuntu_install_java.sh

‎docker/install/ubuntu_install_keras.sh‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎docker/install/ubuntu_install_llvm.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# to you under the Apache License, Version 2.0 (the
77
# "License"); you may not use this file except in compliance
88
# with the License. You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing,
1313
# software distributed under the License is distributed on an
1414
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,14 +25,14 @@ echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main\
2525
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main\
2626
>> /etc/apt/sources.list.d/llvm.list
2727

28-
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main\
28+
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main\
2929
>> /etc/apt/sources.list.d/llvm.list
30-
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main\
30+
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main\
3131
>> /etc/apt/sources.list.d/llvm.list
3232

33-
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main\
33+
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main\
3434
>> /etc/apt/sources.list.d/llvm.list
35-
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main\
35+
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main\
3636
>> /etc/apt/sources.list.d/llvm.list
3737

3838
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main\
@@ -41,4 +41,4 @@ echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main\
4141
>> /etc/apt/sources.list.d/llvm.list
4242

4343
wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
44-
apt-get update && apt-get install -y llvm-4.0 llvm-5.0 llvm-6.0 clang-6.0
44+
apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 clang-8 clang-7

‎docker/install/ubuntu_install_mxnet.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# to you under the Apache License, Version 2.0 (the
77
# "License"); you may not use this file except in compliance
88
# with the License. You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing,
1313
# software distributed under the License is distributed on an
1414
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,4 +20,4 @@ set -e
2020
set -u
2121
set -o pipefail
2222

23-
pip3 install mxnet
23+
pip3 install mxnet==1.5.0

‎docker/install/ubuntu_install_onnx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -u
2121
set -o pipefail
2222

2323
# fix to certain version for now
24-
pip3 install onnx>=1.4.1
24+
pip3 install onnx==1.5.0
2525

2626
pip3 install https://download.pytorch.org/whl/cu80/torch-1.0.1.post2-cp36-cp36m-linux_x86_64.whl
2727
pip3 install torchvision

‎docker/install/ubuntu_install_tensorflow.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# to you under the Apache License, Version 2.0 (the
77
# "License"); you may not use this file except in compliance
88
# with the License. You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing,
1313
# software distributed under the License is distributed on an
1414
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,4 +20,4 @@ set -e
2020
set -u
2121
set -o pipefail
2222

23-
pip3 install tensorflow
23+
pip3 install tensorflow==1.13.1 keras h5py

‎python/tvm/contrib/clang.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ def find_clang(required=True):
4545
"""
4646
cc_list = []
4747
if hasattr(codegen, "llvm_version_major"):
48-
cc_list += ["clang-%d.0" % codegen.llvm_version_major()]
48+
major = codegen.llvm_version_major()
49+
cc_list += ["clang-%d.0" % major]
50+
cc_list += ["clang-%d" % major]
4951
cc_list += ["clang"]
5052
cc_list += ["clang.exe"]
5153
valid_list = [util.which(x) for x in cc_list]

‎python/tvm/relay/grammar/py3/RelayLexer.py‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)