public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/groonga] rawhide: Add support for xsimd 14.0.0
@ 2026-09-22 1:25
0 siblings, 0 replies; only message in thread
From: @ 2026-09-22 1:25 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/groonga
Branch : rawhide
Commit : bd14a6c0aba007eaec6a18267dfd3f5729971cd7
Author : Miro Hrončok <miro@hroncok.cz>
Date : 2026-09-22T01:24:55+00:00
Stats : +160/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/groonga/c/bd14a6c0aba007eaec6a18267dfd3f5729971cd7?branch=rawhide
Log:
Add support for xsimd 14.0.0
---
diff --git a/2706.patch b/2706.patch
new file mode 100644
index 0000000..b4ff820
--- /dev/null
+++ b/2706.patch
@@ -0,0 +1,156 @@
+From c473071bbfa4fb009c8c1f28987187464998d870 Mon Sep 17 00:00:00 2001
+From: Sutou Kouhei <kou@clear-code.com>
+Date: Wed, 24 Dec 2025 10:34:45 +0900
+Subject: [PATCH] xsimd: add support for 14.0.0
+
+It renamed `xsimd::generic` to `xsimd::common`.
+---
+ CMakeLists.txt | 4 ++--
+ lib/CMakeLists.txt | 4 ++--
+ lib/Makefile.am | 2 +-
+ ...stance_generic.cpp => distance_common.cpp} | 2 +-
+ lib/grn_distance.hpp | 20 ++++++++++++-------
+ 5 files changed, 19 insertions(+), 13 deletions(-)
+ rename lib/{distance_generic.cpp => distance_common.cpp} (98%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b878e9b292..c25a4d1aca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1510,9 +1510,9 @@ else()
+ set(GRN_WITH_BLOSC FALSE)
+ endif()
+
+-set(GRN_XSIMD_BUNDLED_VERSION "13.2.0")
++set(GRN_XSIMD_BUNDLED_VERSION "14.0.0")
+ set(GRN_XSIMD_BUNDLED_SHA256
+- "edd8cd3d548c185adc70321c53c36df41abe64c1fe2c67bc6d93c3ecda82447a")
++ "17de0236954955c10c09d6938d4c5f3a3b92d31be5dadd1d5d09fc1b15490dce")
+ set(GRN_WITH_XSIMD
+ "auto"
+ CACHE STRING "Support SIMD by xsimd.")
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index e96f708820..2ef1d86526 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -92,10 +92,10 @@ if(GRN_WITH_XSIMD)
+ APPEND_STRING
+ PROPERTY COMPILE_FLAGS " ${GRN_C_FLAGS_NEON64}")
+ endif()
+- list(APPEND LIBGROONGA_CPP_SOURCES distance_generic.cpp)
++ list(APPEND LIBGROONGA_CPP_SOURCES distance_common.cpp)
+ if(GRN_C_COMPILER_GNU_LIKE)
+ set_property(
+- SOURCE distance_generic.cpp
++ SOURCE distance_common.cpp
+ APPEND_STRING
+ PROPERTY COMPILE_FLAGS " -Wno-float-equal")
+ endif()
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 076fa30d04..862b1eed12 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -128,8 +128,8 @@ EXTRA_DIST = \
+ distance_avx.cpp \
+ distance_avx2.cpp \
+ distance_avx512.cpp \
++ distance_common.cpp \
+ distance_neon64.cpp \
+- distance_generic.cpp \
+ grn_ecmascript.c \
+ grn_ecmascript.h \
+ grn_ecmascript.lemon \
+diff --git a/lib/distance_generic.cpp b/lib/distance_common.cpp
+similarity index 98%
+rename from lib/distance_generic.cpp
+rename to lib/distance_common.cpp
+index 432c6e6f59..6971b82d71 100644
+--- a/lib/distance_generic.cpp
++++ b/lib/distance_common.cpp
+@@ -103,7 +103,7 @@ namespace grn {
+ } // namespace grn
+
+ #define GRN_INSTANTIATION_SIMSIMD_ARCH serial
+-#define GRN_INSTANTIATION_XSIMD_ARCH xsimd::generic
++#define GRN_INSTANTIATION_XSIMD_ARCH xsimd::common
+ #include "grn_distance_instantiation.hpp"
+ #undef GRN_INSTANTIATION_SIMSIMD_ARCH
+ #undef GRN_INSTANTIATION_XSIMD_ARCH
+diff --git a/lib/grn_distance.hpp b/lib/grn_distance.hpp
+index 2dfbdcd30f..3231cf00e6 100644
+--- a/lib/grn_distance.hpp
++++ b/lib/grn_distance.hpp
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (C) 2024 Sutou Kouhei <kou@clear-code.com>
++ Copyright (C) 2024-2025 Sutou Kouhei <kou@clear-code.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+@@ -32,6 +32,12 @@
+ # include <xsimd/xsimd.hpp>
+ #endif
+
++#if defined(GRN_WITH_XSIMD) && XSIMD_VERSION_MAJOR < 14
++namespace xsimd {
++ using common = generic;
++}
++#endif
++
+ namespace grn {
+ namespace distance {
+ extern bool use_simsimd;
+@@ -114,7 +120,7 @@ namespace grn {
+ # undef GRN_INSTANTIATION_XSIMD_ARCH
+
+ # define GRN_INSTANTIATION_SIMSIMD_ARCH serial
+-# define GRN_INSTANTIATION_XSIMD_ARCH xsimd::generic
++# define GRN_INSTANTIATION_XSIMD_ARCH xsimd::common
+ # include "grn_distance_instantiation.hpp"
+ # undef GRN_INSTANTIATION_SIMSIMD_ARCH
+ # undef GRN_INSTANTIATION_XSIMD_ARCH
+@@ -148,7 +154,7 @@ namespace grn {
+ # ifdef GRN_WITH_SIMD_NEON64
+ xsimd::neon64,
+ # endif
+- xsimd::generic>>(l2_norm{});
++ xsimd::common>>(l2_norm{});
+ return dispatched(vector_raw, n_elements);
+ }
+ # endif
+@@ -186,7 +192,7 @@ namespace grn {
+ # ifdef GRN_WITH_SIMD_NEON64
+ xsimd::neon64,
+ # endif
+- xsimd::generic>>(difference_l1_norm{});
++ xsimd::common>>(difference_l1_norm{});
+ return dispatched(vector_raw1, vector_raw2, n_elements);
+ }
+ # endif
+@@ -247,7 +253,7 @@ namespace grn {
+ # ifdef GRN_WITH_SIMD_NEON64
+ xsimd::neon64,
+ # endif
+- xsimd::generic>>(difference_l2_norm_squared{});
++ xsimd::common>>(difference_l2_norm_squared{});
+ return dispatched(vector_raw1, vector_raw2, n_elements);
+ }
+ # endif
+@@ -308,7 +314,7 @@ namespace grn {
+ # ifdef GRN_WITH_SIMD_NEON64
+ xsimd::neon64,
+ # endif
+- xsimd::generic>>(inner_product{});
++ xsimd::common>>(inner_product{});
+ return dispatched(vector_raw1, vector_raw2, n_elements);
+ }
+ # endif
+@@ -368,7 +374,7 @@ namespace grn {
+ # ifdef GRN_WITH_SIMD_NEON64
+ xsimd::neon64,
+ # endif
+- xsimd::generic>>(cosine{});
++ xsimd::common>>(cosine{});
+ return dispatched(vector_raw1, vector_raw2, n_elements);
+ }
+ # endif
diff --git a/groonga.spec b/groonga.spec
index 299de26..ac1ca88 100644
--- a/groonga.spec
+++ b/groonga.spec
@@ -6,6 +6,10 @@ License: LGPL-2.1-only
URL: https://github.com/groonga/groonga
Source0: %{url}/releases/download/v%{version}/groonga-%{version}.tar.gz
Patch: 0001-lib-grn_arrow.hpp.patch
+# Add support for xsimd 14.0.0
+# https://github.com/groonga/groonga/pull/2706
+# removed .pre-commit-config.yaml changes (file not in the Source tarball)
+Patch: 2706.patch
BuildRequires: gcc-c++
BuildRequires: cmake
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 1:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 1:25 [rpms/groonga] rawhide: Add support for xsimd 14.0.0
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox