From 9f38fbbfed68540bea428130f21068c80a91f186 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Tue, 30 Mar 2021 13:53:21 -0700 Subject: [PATCH 1/5] Tweak CI --- docker/install/ubuntu_install_core.sh | 6 +++--- docker/install/ubuntu_install_llvm.sh | 2 +- rust/tvm-sys/Cargo.toml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/install/ubuntu_install_core.sh b/docker/install/ubuntu_install_core.sh index bb40b052ded3..e7104eb987e2 100755 --- a/docker/install/ubuntu_install_core.sh +++ b/docker/install/ubuntu_install_core.sh @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +23,7 @@ set -o pipefail # install libraries for building c++ core on ubuntu apt-get update && apt-get install -y --no-install-recommends \ git make libgtest-dev cmake wget unzip libtinfo-dev libz-dev\ - libcurl4-openssl-dev libopenblas-dev g++ sudo \ + libcurl4-openssl-dev libssl-dev libopenblas-dev g++ sudo \ apt-transport-https graphviz diff --git a/docker/install/ubuntu_install_llvm.sh b/docker/install/ubuntu_install_llvm.sh index 46607b09d3da..09908ba2b847 100755 --- a/docker/install/ubuntu_install_llvm.sh +++ b/docker/install/ubuntu_install_llvm.sh @@ -46,4 +46,4 @@ echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 clang-8 clang-7 +apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev libclang-7-dev diff --git a/rust/tvm-sys/Cargo.toml b/rust/tvm-sys/Cargo.toml index 2952aa4938d7..ecdfaaa0e17f 100644 --- a/rust/tvm-sys/Cargo.toml +++ b/rust/tvm-sys/Cargo.toml @@ -33,5 +33,9 @@ ndarray = "0.12" enumn = "^0.1" [build-dependencies] +<<<<<<< HEAD bindgen = { version="0.51", default-features=false } +======= +bindgen = { version="0.57", default-features = false, features = ["runtime"] } +>>>>>>> 8f8333f94... Tweak CI anyhow = "^1.0" From 6d62ee426d9bc95e85892edbdc56f6658c5fd6c4 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Tue, 30 Mar 2021 20:28:09 -0700 Subject: [PATCH 2/5] WIP --- docker/install/ubuntu1804_install_llvm.sh | 2 +- docker/install/ubuntu_install_core.sh | 2 +- tests/scripts/test.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 tests/scripts/test.sh diff --git a/docker/install/ubuntu1804_install_llvm.sh b/docker/install/ubuntu1804_install_llvm.sh index 292fdde0444e..06b980544c5b 100755 --- a/docker/install/ubuntu1804_install_llvm.sh +++ b/docker/install/ubuntu1804_install_llvm.sh @@ -42,4 +42,4 @@ echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-9 llvm-10 llvm-11 clang-9 clang-10 clang-11 +apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev libclang-7-dev diff --git a/docker/install/ubuntu_install_core.sh b/docker/install/ubuntu_install_core.sh index e7104eb987e2..6f9d791a650d 100755 --- a/docker/install/ubuntu_install_core.sh +++ b/docker/install/ubuntu_install_core.sh @@ -24,7 +24,7 @@ set -o pipefail apt-get update && apt-get install -y --no-install-recommends \ git make libgtest-dev cmake wget unzip libtinfo-dev libz-dev\ libcurl4-openssl-dev libssl-dev libopenblas-dev g++ sudo \ - apt-transport-https graphviz + apt-transport-https graphviz pkg-config cd /usr/src/gtest && cmake CMakeLists.txt && make && cp *.a /usr/lib diff --git a/tests/scripts/test.sh b/tests/scripts/test.sh new file mode 100644 index 000000000000..1f1dc9975cdc --- /dev/null +++ b/tests/scripts/test.sh @@ -0,0 +1,4 @@ +cd build +cmake .. +cd .. +make -j From 9962d7a7f11b2230ef43be5bbde15e4fbcd35db5 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Tue, 30 Mar 2021 21:48:41 -0700 Subject: [PATCH 3/5] CI Tweaks for Rust CI --- rust/tvm-sys/Cargo.toml | 4 ---- tests/scripts/test.sh | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 tests/scripts/test.sh diff --git a/rust/tvm-sys/Cargo.toml b/rust/tvm-sys/Cargo.toml index ecdfaaa0e17f..2952aa4938d7 100644 --- a/rust/tvm-sys/Cargo.toml +++ b/rust/tvm-sys/Cargo.toml @@ -33,9 +33,5 @@ ndarray = "0.12" enumn = "^0.1" [build-dependencies] -<<<<<<< HEAD bindgen = { version="0.51", default-features=false } -======= -bindgen = { version="0.57", default-features = false, features = ["runtime"] } ->>>>>>> 8f8333f94... Tweak CI anyhow = "^1.0" diff --git a/tests/scripts/test.sh b/tests/scripts/test.sh deleted file mode 100644 index 1f1dc9975cdc..000000000000 --- a/tests/scripts/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd build -cmake .. -cd .. -make -j From 01ae69f3e2752a7eac35ec47eb75ac58b1c1c897 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Tue, 30 Mar 2021 21:55:28 -0700 Subject: [PATCH 4/5] Fix --- docker/install/ubuntu1804_install_llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu1804_install_llvm.sh b/docker/install/ubuntu1804_install_llvm.sh index 06b980544c5b..e1b9a1c59629 100755 --- a/docker/install/ubuntu1804_install_llvm.sh +++ b/docker/install/ubuntu1804_install_llvm.sh @@ -42,4 +42,4 @@ echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev libclang-7-dev +apt-get update && apt-get install -y llvm-9 llvm-10 llvm-11 clang-9 libclang-9-dev clang-10 libclang-10-dev clang-11 libclang-11-dev From aa7e8b6bb20a3546854f2aa385972eea8e18a163 Mon Sep 17 00:00:00 2001 From: Jared Roesch Date: Wed, 31 Mar 2021 03:24:16 -0700 Subject: [PATCH 5/5] Fix LLVM issue --- docker/install/ubuntu_install_llvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/install/ubuntu_install_llvm.sh b/docker/install/ubuntu_install_llvm.sh index 09908ba2b847..1f4eec6ee6ef 100755 --- a/docker/install/ubuntu_install_llvm.sh +++ b/docker/install/ubuntu_install_llvm.sh @@ -46,4 +46,4 @@ echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial main\ >> /etc/apt/sources.list.d/llvm.list wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - -apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev libclang-7-dev +apt-get update && apt-get install -y llvm-4.0 llvm-9 llvm-8 llvm-7 clang-9 libclang-9-dev clang-8 libclang-8-dev clang-7 libclang-7-dev