From 26bd6d14636a02a85ed7870f8aa8fece9672d560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Tue, 20 Apr 2021 15:54:44 +0200 Subject: [PATCH 1/3] Support LLVM 12 --- cpp/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1705e854fb1..4e88c32dcd6 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -109,6 +109,7 @@ set(ARROW_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}") set(ARROW_LLVM_VERSIONS + "12.0" "11.1" "11.0" "10" From 248ebcff941cf679150c1afe3d013ddda3db59e5 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 21 Apr 2021 05:34:01 +0900 Subject: [PATCH 2/3] Use LLVM 12 by default --- .env | 2 +- .travis.yml | 5 +---- ci/conda_env_gandiva.yml | 4 ++-- .../apache-arrow/apt/debian-bullseye/Dockerfile | 4 ++-- .../linux-packages/apache-arrow/apt/debian-buster/Dockerfile | 4 ++-- .../linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile | 4 ++-- .../linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile | 4 ++-- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 4fb24bed40a..587430579f9 100644 --- a/.env +++ b/.env @@ -45,7 +45,7 @@ DEBIAN=10 UBUNTU=20.04 FEDORA=33 PYTHON=3.6 -LLVM=11 +LLVM=12 CLANG_TOOLS=8 RUST=nightly-2021-03-24 GO=1.15 diff --git a/.travis.yml b/.travis.yml index 2cf70cca982..26b4d78fd2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: -e CMAKE_UNITY_BUILD=ON -e CPP_MAKE_PARALLELISM=4 " - # The LLVM's APT repository provides only arm64 binaries. + # The LLVM's APT repository doesn't provide arm64 binaries. # We should use LLVM provided by Ubuntu. LLVM: "10" UBUNTU: "20.04" @@ -100,9 +100,6 @@ jobs: -e cares_SOURCE=BUNDLED -e gRPC_SOURCE=BUNDLED " - # The LLVM's APT repository provides only arm64 binaries. - # We should use LLVM provided by Ubuntu. - LLVM: "10" UBUNTU: "20.04" - name: "Go on s390x" diff --git a/ci/conda_env_gandiva.yml b/ci/conda_env_gandiva.yml index 024b9fe74c1..6dab1848820 100644 --- a/ci/conda_env_gandiva.yml +++ b/ci/conda_env_gandiva.yml @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -clang=11 -llvmdev=11 +clang=12 +llvmdev=12 diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile index fa4961bc97e..761c44406e6 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile @@ -37,7 +37,7 @@ RUN \ apt install -y -V ${quiet} \ build-essential \ ccache \ - clang-11 \ + clang \ cmake \ debhelper \ devscripts \ @@ -62,7 +62,7 @@ RUN \ libthrift-dev \ libutf8proc-dev \ libzstd-dev \ - llvm-11-dev \ + llvm-dev \ lsb-release \ ninja-build \ pkg-config \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile index 5dcc1b46b2d..a5c8456e87e 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-buster/Dockerfile @@ -74,8 +74,8 @@ RUN \ tzdata \ zlib1g-dev && \ apt install -y -V -t buster-backports ${quiet} \ - clang-8 \ - llvm-8-dev && \ + clang-11 \ + llvm-11-dev && \ if apt list | grep '^nvidia-cuda-toolkit/'; then \ apt install -y -V ${quiet} nvidia-cuda-toolkit; \ fi && \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile index ad83bfa9002..8fe70edb6ad 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile @@ -35,7 +35,7 @@ RUN \ apt install -y -V ${quiet} \ build-essential \ ccache \ - clang-10 \ + clang \ cmake \ debhelper \ devscripts \ @@ -58,7 +58,7 @@ RUN \ libthrift-dev \ libutf8proc-dev \ libzstd-dev \ - llvm-10-dev \ + llvm-dev \ lsb-release \ ninja-build \ pkg-config \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile index d60e6320e36..5209be29fb5 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-groovy/Dockerfile @@ -35,7 +35,7 @@ RUN \ apt install -y -V ${quiet} \ build-essential \ ccache \ - clang-11 \ + clang \ cmake \ debhelper \ devscripts \ @@ -59,7 +59,7 @@ RUN \ libthrift-dev \ libutf8proc-dev \ libzstd-dev \ - llvm-11-dev \ + llvm-dev \ lsb-release \ ninja-build \ pkg-config \ From 1963e0bb47563016b7e01069c1d8c2b83afe5532 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 21 Apr 2021 06:01:49 +0900 Subject: [PATCH 3/3] LLVM 12 isn't ready on conda yet --- ci/conda_env_gandiva.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/conda_env_gandiva.yml b/ci/conda_env_gandiva.yml index 6dab1848820..024b9fe74c1 100644 --- a/ci/conda_env_gandiva.yml +++ b/ci/conda_env_gandiva.yml @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -clang=12 -llvmdev=12 +clang=11 +llvmdev=11