Skip to content

Commit f33f386

Browse files
committed
Update xsimd to 14.0
1 parent 28855e0 commit f33f386

File tree

9 files changed

+12
-15
lines changed

9 files changed

+12
-15
lines changed

ci/conan/all/conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ def requirements(self):
207207
self.requires("lz4/1.9.4")
208208
if self.options.with_snappy:
209209
self.requires("snappy/1.1.9")
210-
if self.options.get_safe("simd_level") != None or \
211-
self.options.get_safe("runtime_simd_level") != None:
212-
self.requires("xsimd/13.0.0")
210+
if self.options.get_safe("simd_level") is not None or \
211+
self.options.get_safe("runtime_simd_level") is not None:
212+
self.requires("xsimd/14.0.0")
213213
if self.options.with_zlib:
214214
self.requires("zlib/[>=1.2.11 <2]")
215215
if self.options.with_zstd:

ci/conda_env_cpp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ rapidjson
4747
re2
4848
snappy
4949
thrift-cpp>=0.11.0
50-
xsimd
50+
xsimd>=14.0
5151
zlib
5252
zstd

ci/docker/alpine-linux-3.22-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ RUN apk add \
6464
thrift-dev \
6565
tzdata \
6666
utf8proc-dev \
67-
xsimd-dev \
6867
zlib-dev \
6968
zstd-dev && \
7069
rm -rf /var/cache/apk/* && \
@@ -103,4 +102,5 @@ ENV ARROW_ACERO=ON \
103102
AWSSDK_SOURCE=BUNDLED \
104103
google_cloud_cpp_storage_SOURCE=BUNDLED \
105104
MUSL_LOCPATH=/usr/share/i18n/locales/musl \
106-
PATH=/usr/lib/ccache/bin:$PATH
105+
PATH=/usr/lib/ccache/bin:$PATH \
106+
xsimd_SOURCE=BUNDLED

ci/docker/debian-13-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ RUN apt-get update -y -q && \
7979
libthrift-dev \
8080
libutf8proc-dev \
8181
libxml2-dev \
82-
libxsimd-dev \
8382
libzstd-dev \
8483
llvm-${llvm}-dev \
8584
make \
@@ -142,4 +141,5 @@ ENV ARROW_ACERO=ON \
142141
google_cloud_cpp_storage_SOURCE=BUNDLED \
143142
ORC_SOURCE=BUNDLED \
144143
PATH=/usr/lib/ccache/:$PATH \
145-
PYTHON=python3
144+
PYTHON=python3 \
145+
xsimd_SOURCE=BUNDLED

ci/docker/debian-experimental-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ RUN if [ -n "${gcc}" ]; then \
7373
libthrift-dev \
7474
libutf8proc-dev \
7575
libxml2-dev \
76-
libxsimd-dev \
7776
libzstd-dev \
7877
make \
7978
ninja-build \
@@ -143,4 +142,5 @@ ENV ARROW_ACERO=ON \
143142
google_cloud_cpp_storage_SOURCE=BUNDLED \
144143
ORC_SOURCE=BUNDLED \
145144
PATH=/usr/lib/ccache/:$PATH \
146-
PYTHON=python3
145+
PYTHON=python3 \
146+
xsimd_SOURCE=BUNDLED

ci/docker/fedora-42-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ RUN dnf update -y && \
6565
utf8proc-devel \
6666
wget \
6767
which \
68-
xsimd-devel \
6968
zlib-devel
7069

7170
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
@@ -109,4 +108,5 @@ ENV ARROW_ACERO=ON \
109108
PARQUET_BUILD_EXAMPLES=ON \
110109
PARQUET_BUILD_EXECUTABLES=ON \
111110
PATH=/usr/lib/ccache/:$PATH \
112-
PYARROW_TEST_GANDIVA=OFF
111+
PYARROW_TEST_GANDIVA=OFF \
112+
xsimd_SOURCE=BUNDLED

dev/release/setup-ubuntu.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ apt-get install -y -q --no-install-recommends \
4545
libglib2.0-dev \
4646
libsqlite3-dev \
4747
libssl-dev \
48-
libxsimd-dev \
4948
llvm-dev \
5049
ninja-build \
5150
nlohmann-json3-dev \

dev/tasks/linux-packages/apache-arrow/apt/debian-forky/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ RUN \
6666
libssl-dev \
6767
libthrift-dev \
6868
libutf8proc-dev \
69-
libxsimd-dev \
7069
libxxhash-dev \
7170
libzstd-dev \
7271
llvm-dev \

dev/tasks/linux-packages/apache-arrow/yum/almalinux-10/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,5 @@ RUN \
6262
utf8proc-devel \
6363
vala \
6464
which \
65-
xsimd-devel \
6665
zlib-devel && \
6766
dnf clean ${quiet} all

0 commit comments

Comments
 (0)