diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py index 7dab8c82f69..b9999e50050 100644 --- a/ci/conan/all/conanfile.py +++ b/ci/conan/all/conanfile.py @@ -207,9 +207,9 @@ def requirements(self): self.requires("lz4/1.9.4") if self.options.with_snappy: self.requires("snappy/1.1.9") - if self.options.get_safe("simd_level") != None or \ - self.options.get_safe("runtime_simd_level") != None: - self.requires("xsimd/13.0.0") + if self.options.get_safe("simd_level") is not None or \ + self.options.get_safe("runtime_simd_level") is not None: + self.requires("xsimd/14.0.0") if self.options.with_zlib: self.requires("zlib/[>=1.2.11 <2]") if self.options.with_zstd: diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index 18d58f7bb2d..1d595adf649 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -47,6 +47,6 @@ rapidjson re2 snappy thrift-cpp>=0.11.0 -xsimd +xsimd>=14.0 zlib zstd diff --git a/ci/docker/alpine-linux-3.22-cpp.dockerfile b/ci/docker/alpine-linux-3.22-cpp.dockerfile index 48907e61a4a..c3a2a58ef95 100644 --- a/ci/docker/alpine-linux-3.22-cpp.dockerfile +++ b/ci/docker/alpine-linux-3.22-cpp.dockerfile @@ -64,7 +64,6 @@ RUN apk add \ thrift-dev \ tzdata \ utf8proc-dev \ - xsimd-dev \ zlib-dev \ zstd-dev && \ rm -rf /var/cache/apk/* && \ @@ -103,4 +102,5 @@ ENV ARROW_ACERO=ON \ AWSSDK_SOURCE=BUNDLED \ google_cloud_cpp_storage_SOURCE=BUNDLED \ MUSL_LOCPATH=/usr/share/i18n/locales/musl \ - PATH=/usr/lib/ccache/bin:$PATH + PATH=/usr/lib/ccache/bin:$PATH \ + xsimd_SOURCE=BUNDLED diff --git a/ci/docker/debian-13-cpp.dockerfile b/ci/docker/debian-13-cpp.dockerfile index ca96b4177ff..7a4d3042d70 100644 --- a/ci/docker/debian-13-cpp.dockerfile +++ b/ci/docker/debian-13-cpp.dockerfile @@ -79,7 +79,6 @@ RUN apt-get update -y -q && \ libthrift-dev \ libutf8proc-dev \ libxml2-dev \ - libxsimd-dev \ libzstd-dev \ llvm-${llvm}-dev \ make \ @@ -142,4 +141,5 @@ ENV ARROW_ACERO=ON \ google_cloud_cpp_storage_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ PATH=/usr/lib/ccache/:$PATH \ - PYTHON=python3 + PYTHON=python3 \ + xsimd_SOURCE=BUNDLED diff --git a/ci/docker/debian-experimental-cpp.dockerfile b/ci/docker/debian-experimental-cpp.dockerfile index d37b58e2307..58b49eb70c9 100644 --- a/ci/docker/debian-experimental-cpp.dockerfile +++ b/ci/docker/debian-experimental-cpp.dockerfile @@ -73,7 +73,6 @@ RUN if [ -n "${gcc}" ]; then \ libthrift-dev \ libutf8proc-dev \ libxml2-dev \ - libxsimd-dev \ libzstd-dev \ make \ ninja-build \ @@ -143,4 +142,5 @@ ENV ARROW_ACERO=ON \ google_cloud_cpp_storage_SOURCE=BUNDLED \ ORC_SOURCE=BUNDLED \ PATH=/usr/lib/ccache/:$PATH \ - PYTHON=python3 + PYTHON=python3 \ + xsimd_SOURCE=BUNDLED diff --git a/ci/docker/fedora-42-cpp.dockerfile b/ci/docker/fedora-42-cpp.dockerfile index cabb066fec3..b5235f2616b 100644 --- a/ci/docker/fedora-42-cpp.dockerfile +++ b/ci/docker/fedora-42-cpp.dockerfile @@ -65,7 +65,6 @@ RUN dnf update -y && \ utf8proc-devel \ wget \ which \ - xsimd-devel \ zlib-devel COPY ci/scripts/install_minio.sh /arrow/ci/scripts/ @@ -109,4 +108,5 @@ ENV ARROW_ACERO=ON \ PARQUET_BUILD_EXAMPLES=ON \ PARQUET_BUILD_EXECUTABLES=ON \ PATH=/usr/lib/ccache/:$PATH \ - PYARROW_TEST_GANDIVA=OFF + PYARROW_TEST_GANDIVA=OFF \ + xsimd_SOURCE=BUNDLED diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index b95d6491457..10ee7e4685b 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2650,7 +2650,7 @@ if(ARROW_USE_XSIMD) IS_RUNTIME_DEPENDENCY FALSE REQUIRED_VERSION - "13.0.0") + "14.0.0") if(xsimd_SOURCE STREQUAL "BUNDLED") set(ARROW_XSIMD arrow::xsimd) diff --git a/dev/release/setup-ubuntu.sh b/dev/release/setup-ubuntu.sh index 6951226bd76..ac274694d58 100755 --- a/dev/release/setup-ubuntu.sh +++ b/dev/release/setup-ubuntu.sh @@ -45,7 +45,6 @@ apt-get install -y -q --no-install-recommends \ libglib2.0-dev \ libsqlite3-dev \ libssl-dev \ - libxsimd-dev \ llvm-dev \ ninja-build \ nlohmann-json3-dev \ diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile index bfb3728b57b..1f052447139 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile @@ -66,7 +66,6 @@ RUN \ libssl-dev \ libthrift-dev \ libutf8proc-dev \ - libxsimd-dev \ libxxhash-dev \ libzstd-dev \ llvm-dev \ diff --git a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-10/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-10/Dockerfile index 78134ab8166..43550cee354 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/almalinux-10/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/almalinux-10/Dockerfile @@ -62,6 +62,5 @@ RUN \ utf8proc-devel \ vala \ which \ - xsimd-devel \ zlib-devel && \ dnf clean ${quiet} all