Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/conan/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/conda_env_cpp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ rapidjson
re2
snappy
thrift-cpp>=0.11.0
xsimd
xsimd>=14.0
zlib
zstd
4 changes: 2 additions & 2 deletions ci/docker/alpine-linux-3.22-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ RUN apk add \
thrift-dev \
tzdata \
utf8proc-dev \
xsimd-dev \
zlib-dev \
zstd-dev && \
rm -rf /var/cache/apk/* && \
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ci/docker/debian-13-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ RUN apt-get update -y -q && \
libthrift-dev \
libutf8proc-dev \
libxml2-dev \
libxsimd-dev \
libzstd-dev \
llvm-${llvm}-dev \
make \
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ci/docker/debian-experimental-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ RUN if [ -n "${gcc}" ]; then \
libthrift-dev \
libutf8proc-dev \
libxml2-dev \
libxsimd-dev \
libzstd-dev \
make \
ninja-build \
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ci/docker/fedora-42-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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
1 change: 0 additions & 1 deletion dev/release/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ RUN \
libssl-dev \
libthrift-dev \
libutf8proc-dev \
libxsimd-dev \
libxxhash-dev \
libzstd-dev \
llvm-dev \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,5 @@ RUN \
utf8proc-devel \
vala \
which \
xsimd-devel \
zlib-devel && \
dnf clean ${quiet} all
Loading