From 69eba855a9bf6e6393a4c7f4ae989061b4c57e50 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Fri, 20 Mar 2026 21:50:23 -0300 Subject: [PATCH 1/6] feat: add xsimd wrap --- releases.json | 8 ++++++ subprojects/packagefiles/xsimd/meson.build | 28 +++++++++++++++++++ .../packagefiles/xsimd/meson_options.txt | 6 ++++ subprojects/xsimd.wrap | 9 ++++++ 4 files changed, 51 insertions(+) create mode 100644 subprojects/packagefiles/xsimd/meson.build create mode 100644 subprojects/packagefiles/xsimd/meson_options.txt create mode 100644 subprojects/xsimd.wrap diff --git a/releases.json b/releases.json index b493f3a539..1237f5d8a7 100644 --- a/releases.json +++ b/releases.json @@ -4965,6 +4965,14 @@ "3.1.0-1" ] }, + "xsimd": { + "dependency_names": [ + "xsimd" + ], + "versions": [ + "14.1.0-1" + ] + }, "xtensor": { "dependency_names": [ "xtensor" diff --git a/subprojects/packagefiles/xsimd/meson.build b/subprojects/packagefiles/xsimd/meson.build new file mode 100644 index 0000000000..8764f05a24 --- /dev/null +++ b/subprojects/packagefiles/xsimd/meson.build @@ -0,0 +1,28 @@ +project( + 'xsimd', + 'cpp', + license: 'BSD-3-Clause', + meson_version: '>=0.56.0', + version: '14.1.0', +) + +xsimd_inc = include_directories('include') +xtl_dep = dependency( + 'xtl', + version: '>=0.7.0', + required: get_option('xtl_complex'), +) + +if xtl_dep.found() + complex_args = ['-DXSIMD_ENABLE_XTL_COMPLEX=1'] +else + complex_args = [] +endif + +xsimd_dep = declare_dependency( + include_directories: xsimd_inc, + dependencies: xtl_dep, + compile_args: complex_args, +) + +meson.override_dependency('xsimd', xsimd_dep) diff --git a/subprojects/packagefiles/xsimd/meson_options.txt b/subprojects/packagefiles/xsimd/meson_options.txt new file mode 100644 index 0000000000..ee8aa298ad --- /dev/null +++ b/subprojects/packagefiles/xsimd/meson_options.txt @@ -0,0 +1,6 @@ +option( + 'xtl_complex', + type: 'feature', + value: 'disabled', + description: 'Support for complex numbers from xtl', +) diff --git a/subprojects/xsimd.wrap b/subprojects/xsimd.wrap new file mode 100644 index 0000000000..652c0e7c93 --- /dev/null +++ b/subprojects/xsimd.wrap @@ -0,0 +1,9 @@ +[wrap-file] +directory = xsimd-14.1.0 +source_url = https://github.com/xtensor-stack/xsimd/archive/refs/tags/14.1.0.tar.gz +source_filename = xsimd-14.1.0.tar.gz +source_hash = 8da77b66214e73565f6111ba494322c853552b7b40cff69779b42e2100eed16f +patch_directory = xsimd + +[provide] +dependency_names = xsimd From 619f8cdf6d87e4b34676099336bca827724310e9 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Sun, 22 Mar 2026 18:12:07 -0300 Subject: [PATCH 2/6] fix: default `xtl_complex` to auto --- subprojects/packagefiles/xsimd/meson_options.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/subprojects/packagefiles/xsimd/meson_options.txt b/subprojects/packagefiles/xsimd/meson_options.txt index ee8aa298ad..e47f1ff846 100644 --- a/subprojects/packagefiles/xsimd/meson_options.txt +++ b/subprojects/packagefiles/xsimd/meson_options.txt @@ -1,6 +1,5 @@ option( 'xtl_complex', type: 'feature', - value: 'disabled', description: 'Support for complex numbers from xtl', ) From 8a4981d1f6c082f85b57027c0ed0e26683892f6e Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Sun, 22 Mar 2026 18:13:15 -0300 Subject: [PATCH 3/6] fix: use c++ standard --- subprojects/packagefiles/xsimd/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/subprojects/packagefiles/xsimd/meson.build b/subprojects/packagefiles/xsimd/meson.build index 8764f05a24..f5a1e90ce8 100644 --- a/subprojects/packagefiles/xsimd/meson.build +++ b/subprojects/packagefiles/xsimd/meson.build @@ -4,6 +4,7 @@ project( license: 'BSD-3-Clause', meson_version: '>=0.56.0', version: '14.1.0', + default_options: ['cpp_std=c++14'], ) xsimd_inc = include_directories('include') From b8f534dcbf0aee907b62ea32504f8837721c2c73 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Sun, 22 Mar 2026 19:07:39 -0300 Subject: [PATCH 4/6] fix: update meson minimum version for cpp_std --- subprojects/packagefiles/xsimd/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/xsimd/meson.build b/subprojects/packagefiles/xsimd/meson.build index f5a1e90ce8..82a4a7fbe6 100644 --- a/subprojects/packagefiles/xsimd/meson.build +++ b/subprojects/packagefiles/xsimd/meson.build @@ -2,7 +2,7 @@ project( 'xsimd', 'cpp', license: 'BSD-3-Clause', - meson_version: '>=0.56.0', + meson_version: '>=0.63.0', version: '14.1.0', default_options: ['cpp_std=c++14'], ) From 1142ecca03ef524718da4980ba84cc0a3ffd3748 Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Tue, 5 May 2026 18:36:33 -0300 Subject: [PATCH 5/6] fix: add install subdir and downgrade minimum meson version --- subprojects/packagefiles/xsimd/meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/subprojects/packagefiles/xsimd/meson.build b/subprojects/packagefiles/xsimd/meson.build index 82a4a7fbe6..7442782075 100644 --- a/subprojects/packagefiles/xsimd/meson.build +++ b/subprojects/packagefiles/xsimd/meson.build @@ -2,9 +2,8 @@ project( 'xsimd', 'cpp', license: 'BSD-3-Clause', - meson_version: '>=0.63.0', - version: '14.1.0', - default_options: ['cpp_std=c++14'], + meson_version: '>=0.56.0', + version: '14.2.0', ) xsimd_inc = include_directories('include') @@ -26,4 +25,9 @@ xsimd_dep = declare_dependency( compile_args: complex_args, ) +install_subdir( + 'include/xsimd', + install_dir: get_option('includedir'), +) + meson.override_dependency('xsimd', xsimd_dep) From fdf8acdd99eefe8903fb4cd628618302bf26ddbe Mon Sep 17 00:00:00 2001 From: Alvaro-Kothe Date: Tue, 5 May 2026 18:40:51 -0300 Subject: [PATCH 6/6] chore: bump xsimd version --- releases.json | 2 +- subprojects/xsimd.wrap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/releases.json b/releases.json index 1237f5d8a7..da557a987b 100644 --- a/releases.json +++ b/releases.json @@ -4970,7 +4970,7 @@ "xsimd" ], "versions": [ - "14.1.0-1" + "14.2.0-1" ] }, "xtensor": { diff --git a/subprojects/xsimd.wrap b/subprojects/xsimd.wrap index 652c0e7c93..39706456be 100644 --- a/subprojects/xsimd.wrap +++ b/subprojects/xsimd.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = xsimd-14.1.0 -source_url = https://github.com/xtensor-stack/xsimd/archive/refs/tags/14.1.0.tar.gz -source_filename = xsimd-14.1.0.tar.gz -source_hash = 8da77b66214e73565f6111ba494322c853552b7b40cff69779b42e2100eed16f +directory = xsimd-14.2.0 +source_url = https://github.com/xtensor-stack/xsimd/archive/refs/tags/14.2.0.tar.gz +source_filename = xsimd-14.2.0.tar.gz +source_hash = 21e841ab684b05331e81e7f782431753a029ef7b7d9d6d3ddab837e7782a40ee patch_directory = xsimd [provide]