From b5c8075b61029f829f5d169187840427d6a8d8bb Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 4 Sep 2019 17:50:01 +0000 Subject: [PATCH 01/28] Initial push --- .gitignore | 1 + ...79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch | 26 +++++++ README.md | 3 - sources | 1 + xtensor.spec | 72 +++++++++++++++++++ 5 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch delete mode 100644 README.md create mode 100644 sources create mode 100644 xtensor.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6251717 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xtensor-0.20.8.tar.gz diff --git a/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch b/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch new file mode 100644 index 0000000..f0e1d17 --- /dev/null +++ b/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch @@ -0,0 +1,26 @@ +From 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624 Mon Sep 17 00:00:00 2001 +From: Zhihao Yuan +Date: Sat, 27 Jul 2019 21:08:09 -0500 +Subject: [PATCH] Fix UB when parsing 1-dimension npy + +--- + include/xtensor/xnpy.hpp | 2 -- + test/CMakeLists.txt | 1 + + test/files/xnpy_files/int.npy | Bin 0 -> 148 bytes + test/test_xnpy.cpp | 5 +++++ + 4 files changed, 6 insertions(+), 2 deletions(-) + create mode 100644 test/files/xnpy_files/int.npy + +diff --git a/include/xtensor/xnpy.hpp b/include/xtensor/xnpy.hpp +index a3479a62..20b3c63c 100644 +--- a/include/xtensor/xnpy.hpp ++++ b/include/xtensor/xnpy.hpp +@@ -317,8 +317,6 @@ namespace xt + dim_s = shape_s.substr(pos); + } + +- pop_char(dim_s, ','); +- + if (dim_s.length() == 0) + { + if (pos_next != std::string::npos) diff --git a/README.md b/README.md deleted file mode 100644 index 8fe8816..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# xtensor - -The xtensor package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..2a4a8b4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xtensor-0.20.8.tar.gz) = a014914206a8a0e74056b41f7a059654ff7873a16dc42588146f6e6138df13ff97fc878c11360c36c83511361793fffebd6b02f2c141a68b5fdb040e0aa82324 diff --git a/xtensor.spec b/xtensor.spec new file mode 100644 index 0000000..b423473 --- /dev/null +++ b/xtensor.spec @@ -0,0 +1,72 @@ +Name: xtensor +Version: 0.20.8 +Release: 0%{?dist} +Summary: C++ tensors with broadcasting and lazy computing +License: BSD +URL: http://xtensor.readthedocs.io/ + +%global github https://github.com/QuantStack/xtensor +Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz + +#see https://github.com/QuantStack/xtensor/commit/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624 +Patch1: 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch + +# because xtl does so for armv7hl && ppc64le +# because tests fail for s390x +ExcludeArch: armv7hl ppc64le s390x + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: gtest-devel +BuildRequires: xtl-devel +BuildRequires: xsimd-devel + + +# there is no actual arched content - this is a header only library +%global debug_package %{nil} + +%global _description %{expand: +xtensor is a C++ library meant for numerical analysis with multi-dimensional +array expressions. + +xtensor provides: +- an extensible expression system enabling lazy broadcasting. +- an API following the idioms of the C++ standard library. +- tools to manipulate array expressions and build upon xtensor.} + + +%description %_description + +%package devel +Summary: %{summary} +Provides: %{name} = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} +Requires: xtl-devel +Requires: xsimd-devel + +%description devel %_description + + +%prep +%autosetup -p1 + +%build +%cmake -DBUILD_TESTS=ON . +%make_build + +%install +%make_install + +%check +%make_build xtest + +%files devel +%doc README.md +%license LICENSE +%{_includedir}/%{name}/ +%{_libdir}/cmake/%{name}/ +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Tue Sep 3 2019 sguelton@redhat.com - 0.20.8-1 +- Initial package From 673377ac8593c2eec4bc3aeada950e4779b3e8be Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Fri, 17 Jan 2020 14:10:15 +0000 Subject: [PATCH 02/28] Upstream version bump --- .gitignore | 1 + ...79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch | 26 ------------------- sources | 2 +- xtensor.spec | 10 +++---- 4 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch diff --git a/.gitignore b/.gitignore index 6251717..899f3d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xtensor-0.20.8.tar.gz +/xtensor-0.21.2.tar.gz diff --git a/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch b/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch deleted file mode 100644 index f0e1d17..0000000 --- a/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624 Mon Sep 17 00:00:00 2001 -From: Zhihao Yuan -Date: Sat, 27 Jul 2019 21:08:09 -0500 -Subject: [PATCH] Fix UB when parsing 1-dimension npy - ---- - include/xtensor/xnpy.hpp | 2 -- - test/CMakeLists.txt | 1 + - test/files/xnpy_files/int.npy | Bin 0 -> 148 bytes - test/test_xnpy.cpp | 5 +++++ - 4 files changed, 6 insertions(+), 2 deletions(-) - create mode 100644 test/files/xnpy_files/int.npy - -diff --git a/include/xtensor/xnpy.hpp b/include/xtensor/xnpy.hpp -index a3479a62..20b3c63c 100644 ---- a/include/xtensor/xnpy.hpp -+++ b/include/xtensor/xnpy.hpp -@@ -317,8 +317,6 @@ namespace xt - dim_s = shape_s.substr(pos); - } - -- pop_char(dim_s, ','); -- - if (dim_s.length() == 0) - { - if (pos_next != std::string::npos) diff --git a/sources b/sources index 2a4a8b4..8480683 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.20.8.tar.gz) = a014914206a8a0e74056b41f7a059654ff7873a16dc42588146f6e6138df13ff97fc878c11360c36c83511361793fffebd6b02f2c141a68b5fdb040e0aa82324 +SHA512 (xtensor-0.21.2.tar.gz) = c7166bdf3e6d5b8278ef5d3280acb25f44b7ade78d4e3837a1498e9d26175297f8e7611e5748f74d55e3c58674f84a3b4251d56389bb6b04cff8ba71958b0c24 diff --git a/xtensor.spec b/xtensor.spec index b423473..fb74b7b 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,6 +1,6 @@ Name: xtensor -Version: 0.20.8 -Release: 0%{?dist} +Version: 0.21.2 +Release: 1%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -8,9 +8,6 @@ URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz -#see https://github.com/QuantStack/xtensor/commit/842d79cc7aea882ad69dfe5ebcd6ad8a7be24624 -Patch1: 842d79cc7aea882ad69dfe5ebcd6ad8a7be24624.patch - # because xtl does so for armv7hl && ppc64le # because tests fail for s390x ExcludeArch: armv7hl ppc64le s390x @@ -68,5 +65,8 @@ Requires: xsimd-devel %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 16 2020 sguelton@redhat.com - 0.21.2-1 +- Upstream version bump + * Tue Sep 3 2019 sguelton@redhat.com - 0.20.8-1 - Initial package From 613bcdc25064d01d41b7adbf96127891085c6cd9 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 20:29:17 +0200 Subject: [PATCH 03/28] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- xtensor.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xtensor.spec b/xtensor.spec index fb74b7b..135c267 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: xtensor Version: 0.21.2 Release: 1%{?dist} @@ -48,14 +50,14 @@ Requires: xsimd-devel %autosetup -p1 %build -%cmake -DBUILD_TESTS=ON . -%make_build +%cmake -DBUILD_TESTS=ON +%cmake_build %install -%make_install +%cmake_install %check -%make_build xtest +%make_build -C %{_vpath_builddir} xtest %files devel %doc README.md From 1c9e54ab04838cb0ab78dc6d165a68c6fb8a1b1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:07:50 +0000 Subject: [PATCH 04/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index 135c267..132fea8 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.21.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -67,6 +67,9 @@ Requires: xsimd-devel %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.21.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jan 16 2020 sguelton@redhat.com - 0.21.2-1 - Upstream version bump From 1ec970d8224de71a14a33614fc92c74146858599 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Sat, 3 Oct 2020 19:57:40 +0000 Subject: [PATCH 05/28] Upstream version bump --- .gitignore | 1 + sources | 2 +- xtensor.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 899f3d2..982cc13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xtensor-0.20.8.tar.gz /xtensor-0.21.2.tar.gz +/xtensor-0.21.7.tar.gz diff --git a/sources b/sources index 8480683..c12913a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.21.2.tar.gz) = c7166bdf3e6d5b8278ef5d3280acb25f44b7ade78d4e3837a1498e9d26175297f8e7611e5748f74d55e3c58674f84a3b4251d56389bb6b04cff8ba71958b0c24 +SHA512 (xtensor-0.21.7.tar.gz) = d042d1ffaa3b7057811148000b303d2b2da036d44d38bc27a08bcfc06424280ee270f37440e1d361d4dc16bee0c630048c4c9a24b7915c96825b4b9a584a9303 diff --git a/xtensor.spec b/xtensor.spec index 132fea8..5697f87 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.21.2 -Release: 2%{?dist} +Version: 0.21.7 +Release: 1%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -10,8 +10,7 @@ URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz -# because xtl does so for armv7hl && ppc64le -# because tests fail for s390x +# because tests fail for these archs ExcludeArch: armv7hl ppc64le s390x BuildRequires: cmake @@ -62,11 +61,15 @@ Requires: xsimd-devel %files devel %doc README.md %license LICENSE +%{_includedir}/%{name}.hpp %{_includedir}/%{name}/ %{_libdir}/cmake/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Oct 3 2020 sguelton@redhat.com - 0.21.7-1 +- Upstream version bump + * Wed Jul 29 2020 Fedora Release Engineering - 0.21.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2564d7d930119fc82a716379659267012518e5bc Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mon, 5 Oct 2020 09:46:47 +0000 Subject: [PATCH 06/28] Fix UB in upstream testsuite, see https://github.com/xtensor-stack/xtensor/pull/2175 Activates armv7hl --- test_portability.patch | 47 ++++++++++++++++++++++++++++++++++++++++++ xtensor.spec | 10 +++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 test_portability.patch diff --git a/test_portability.patch b/test_portability.patch new file mode 100644 index 0000000..0591eae --- /dev/null +++ b/test_portability.patch @@ -0,0 +1,47 @@ +diff -Naur xtensor-0.21.7.orig/test/test_xoperation.cpp xtensor-0.21.7/test/test_xoperation.cpp +--- xtensor-0.21.7.orig/test/test_xoperation.cpp 2020-10-05 07:58:59.903264307 +0000 ++++ xtensor-0.21.7/test/test_xoperation.cpp 2020-10-05 08:41:21.127559227 +0000 +@@ -807,17 +807,18 @@ + TEST(operation, left_shift) + { + xarray arr({5,1, 1000}); ++ xarray arr2({2,1, 3}); + xarray res1 = left_shift(arr, 4); +- xarray res2 = left_shift(arr, arr); ++ xarray res2 = left_shift(arr, arr2); + EXPECT_EQ(left_shift(arr, 4)(1), 16); + xarray expected1 = {80, 16, 16000}; +- xarray expected2 = {160, 2, 256000}; ++ xarray expected2 = {20, 2, 8000}; + + EXPECT_EQ(expected1, res1); + EXPECT_EQ(expected2, res2); + + xarray res3 = arr << 4; +- xarray res4 = arr << arr; ++ xarray res4 = arr << arr2; + EXPECT_EQ(expected1, res3); + EXPECT_EQ(expected2, res4); + } +@@ -825,17 +826,18 @@ + TEST(operation, right_shift) + { + xarray arr({5,1, 1000}); ++ xarray arr2({2,1, 3}); + xarray res1 = right_shift(arr, 4); +- xarray res2 = right_shift(arr, arr); ++ xarray res2 = right_shift(arr, arr2); + EXPECT_EQ(right_shift(arr, 4)(1), 0); + xarray expected1 = {0, 0, 62}; +- xarray expected2 = {0, 0, 3}; ++ xarray expected2 = {1, 0, 125}; + + EXPECT_EQ(expected1, res1); + EXPECT_EQ(expected2, res2); + + xarray res3 = arr >> 4; +- xarray res4 = arr >> arr; ++ xarray res4 = arr >> arr2; + EXPECT_EQ(expected1, res3); + EXPECT_EQ(expected2, res4); + } diff --git a/xtensor.spec b/xtensor.spec index 5697f87..871498b 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.21.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -11,7 +11,7 @@ URL: http://xtensor.readthedocs.io/ Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz # because tests fail for these archs -ExcludeArch: armv7hl ppc64le s390x +ExcludeArch: ppc64le s390x BuildRequires: cmake BuildRequires: gcc-c++ @@ -19,6 +19,8 @@ BuildRequires: gtest-devel BuildRequires: xtl-devel BuildRequires: xsimd-devel +Patch0: test_portability.patch + # there is no actual arched content - this is a header only library %global debug_package %{nil} @@ -67,6 +69,10 @@ Requires: xsimd-devel %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Oct 05 2020 sguelton@redhat.com - 0.21.7-2 +- Fix UB in upstream testsuite, see https://github.com/xtensor-stack/xtensor/pull/2175 +- Activates armv7hl + * Sat Oct 3 2020 sguelton@redhat.com - 0.21.7-1 - Upstream version bump From e9a3c926c8fa65b70d10f74d7da4544d4ecf9092 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 7 Oct 2020 07:58:53 +0000 Subject: [PATCH 07/28] Activate all architectures, fixing the remaining issues in the test suite --- 0001-Fix-xnpy-save-padding-computation.patch | Bin 0 -> 5609 bytes disable_arch_native.patch | 21 +++++++++++++++++++ xtensor.spec | 16 +++++++++----- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 0001-Fix-xnpy-save-padding-computation.patch create mode 100644 disable_arch_native.patch diff --git a/0001-Fix-xnpy-save-padding-computation.patch b/0001-Fix-xnpy-save-padding-computation.patch new file mode 100644 index 0000000000000000000000000000000000000000..3c3921c9ebe3f1a5b35f8de68df7358d713b2698 GIT binary patch literal 5609 zcmeH}U5F%C6~}vsA#e#n0{ali!+Fs34Bb^-)!kFw(>pUY>t@DXan_AHQR2)x+^Ra& zeYNUVQTKLlPcj<)*V@+%B*(H<<9}{hryOGjwLDON9kYlbJC8t>Ur6P#QG$%Agi6%@$93r1A0}Ui5oJ!V1QC4~NP`C+m z&;!QPrCxpFJ3QXeGGAAp_%57UJza)QbPju%fQOQ@KtPA~R5Gy_1-(4$l7*PMl^rEK zfJr$CqXfb2CJAz>6SAS6$5gr<6yUQyimV7&7zelqprR^49~0y*fkWF(> z%8Oi~3zrS)rRtign{~Zf;TVg`-kxOwnx>IKqOj7J$VHS?RH^HoIEI^#T>w=98c7#h z@mYW(owJ?&bfPFoLD)Zb;bV-0X*57v26KKMoE^o^1et9=N@PO$h}^+syr}C0I3kdZ zOs2YEsc35T`s8RbnVZCOFqtkFtj*C2BHkW}X|SlOk?xJvoE*)t%t%b*WEzm>M)h9a zR^8tO#swy-dC!*S)PD~HO#f?6XshkaP^o0eE1_4B)thkwU~QSD~c7R#u4i^-~Y8pMGSfuvU1im>wp@78G|K zvsi}Wpvi1UiHGX`8Vv-Np(r{u#$pR*Yh_TMxiXv|WRjF}!QSl=Jm?@$D9p^v6lT)z z!c6*6zh?@C0@;F7(e-y9Dgn8t-Vsy}m^PmyZDmqkhYbh$oj0teQ>*DZwHlV?Thr!u zL@H|ndU-^sh?!;qyIoMvlw$p2;A`IFG*B zFm&Ciqhl`6X>vRyGAX-5W?5cqs*Y>p>v+*`-rhR?;DQGo1b*_^4_{rr>s9;dhpt|l z4WF@%)i(*e{Lnl0Q;%P}|Bd=v_Rf*ZFMR&JEB58uUzfI?e$GB}{?65JUHY5-_ygaJ z-j4rlzjCbi{2zATw4JBE{lI@Oyk)=i+k5&;7yn}a>-m3t^^NFH_Qm2e$L~6G+5XD! z|M~vU%kSESUwy7{@#SCJg`d6fpG)^XXFvJnx37izHGAdm+SZXDJ!yac(f;`_U3kg9 zfAziJ?Ed0K`aAc(sLj-1h=<^X77+ z-zjJv@qH+2r)VByPMEu}5tVT@FnSZ4O-yO%81iT@Fo7eGY97T@HN?Z4O-y zeGY97-Sw);sn4m+t0t#Dr#7#eoch~E?eMF4`i4KQqwY5x5bM{in$?`w^}1^{t(reg zU%f$UQg^+tshwMpo75Og>2k2xPEwWy?1c^+H2Xb!?vv9 ly&didQ$a91;WoiAA~`J-Ba{9Q$8>OL8W2-&>NVXY Date: Sat, 9 Jan 2021 01:40:32 +0000 Subject: [PATCH 08/28] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xtensor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtensor.spec b/xtensor.spec index d47d845..c366ec1 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -10,6 +10,7 @@ URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gtest-devel From 5120497686c83523fae4f1a2bd734bc0068eaf9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:26:21 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index c366ec1..2646ee3 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.21.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -73,6 +73,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.21.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Oct 06 2020 sguelton@redhat.com - 0.21.7-3 - Activate all architectures, fixing the remaining issues in the test suite From bce4b98f9c04c9833a7b5eb4404bc688bc07a146 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mon, 15 Feb 2021 14:12:28 +0100 Subject: [PATCH 10/28] Upstream version bump More generic use of %cmake_build --- .gitignore | 1 + 0001-Fix-xnpy-save-padding-computation.patch | Bin 5609 -> 0 bytes disable_arch_native.patch | 21 --------- sources | 2 +- test_portability.patch | 47 ------------------- xtensor.spec | 15 +++--- 6 files changed, 9 insertions(+), 77 deletions(-) delete mode 100644 0001-Fix-xnpy-save-padding-computation.patch delete mode 100644 disable_arch_native.patch delete mode 100644 test_portability.patch diff --git a/.gitignore b/.gitignore index 982cc13..b6b5914 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xtensor-0.20.8.tar.gz /xtensor-0.21.2.tar.gz /xtensor-0.21.7.tar.gz +/xtensor-0.23.1.tar.gz diff --git a/0001-Fix-xnpy-save-padding-computation.patch b/0001-Fix-xnpy-save-padding-computation.patch deleted file mode 100644 index 3c3921c9ebe3f1a5b35f8de68df7358d713b2698..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5609 zcmeH}U5F%C6~}vsA#e#n0{ali!+Fs34Bb^-)!kFw(>pUY>t@DXan_AHQR2)x+^Ra& zeYNUVQTKLlPcj<)*V@+%B*(H<<9}{hryOGjwLDON9kYlbJC8t>Ur6P#QG$%Agi6%@$93r1A0}Ui5oJ!V1QC4~NP`C+m z&;!QPrCxpFJ3QXeGGAAp_%57UJza)QbPju%fQOQ@KtPA~R5Gy_1-(4$l7*PMl^rEK zfJr$CqXfb2CJAz>6SAS6$5gr<6yUQyimV7&7zelqprR^49~0y*fkWF(> z%8Oi~3zrS)rRtign{~Zf;TVg`-kxOwnx>IKqOj7J$VHS?RH^HoIEI^#T>w=98c7#h z@mYW(owJ?&bfPFoLD)Zb;bV-0X*57v26KKMoE^o^1et9=N@PO$h}^+syr}C0I3kdZ zOs2YEsc35T`s8RbnVZCOFqtkFtj*C2BHkW}X|SlOk?xJvoE*)t%t%b*WEzm>M)h9a zR^8tO#swy-dC!*S)PD~HO#f?6XshkaP^o0eE1_4B)thkwU~QSD~c7R#u4i^-~Y8pMGSfuvU1im>wp@78G|K zvsi}Wpvi1UiHGX`8Vv-Np(r{u#$pR*Yh_TMxiXv|WRjF}!QSl=Jm?@$D9p^v6lT)z z!c6*6zh?@C0@;F7(e-y9Dgn8t-Vsy}m^PmyZDmqkhYbh$oj0teQ>*DZwHlV?Thr!u zL@H|ndU-^sh?!;qyIoMvlw$p2;A`IFG*B zFm&Ciqhl`6X>vRyGAX-5W?5cqs*Y>p>v+*`-rhR?;DQGo1b*_^4_{rr>s9;dhpt|l z4WF@%)i(*e{Lnl0Q;%P}|Bd=v_Rf*ZFMR&JEB58uUzfI?e$GB}{?65JUHY5-_ygaJ z-j4rlzjCbi{2zATw4JBE{lI@Oyk)=i+k5&;7yn}a>-m3t^^NFH_Qm2e$L~6G+5XD! z|M~vU%kSESUwy7{@#SCJg`d6fpG)^XXFvJnx37izHGAdm+SZXDJ!yac(f;`_U3kg9 zfAziJ?Ed0K`aAc(sLj-1h=<^X77+ z-zjJv@qH+2r)VByPMEu}5tVT@FnSZ4O-yO%81iT@Fo7eGY97T@HN?Z4O-y zeGY97-Sw);sn4m+t0t#Dr#7#eoch~E?eMF4`i4KQqwY5x5bM{in$?`w^}1^{t(reg zU%f$UQg^+tshwMpo75Og>2k2xPEwWy?1c^+H2Xb!?vv9 ly&didQ$a91;WoiAA~`J-Ba{9Q$8>OL8W2-&>NVXY arr({5,1, 1000}); -+ xarray arr2({2,1, 3}); - xarray res1 = left_shift(arr, 4); -- xarray res2 = left_shift(arr, arr); -+ xarray res2 = left_shift(arr, arr2); - EXPECT_EQ(left_shift(arr, 4)(1), 16); - xarray expected1 = {80, 16, 16000}; -- xarray expected2 = {160, 2, 256000}; -+ xarray expected2 = {20, 2, 8000}; - - EXPECT_EQ(expected1, res1); - EXPECT_EQ(expected2, res2); - - xarray res3 = arr << 4; -- xarray res4 = arr << arr; -+ xarray res4 = arr << arr2; - EXPECT_EQ(expected1, res3); - EXPECT_EQ(expected2, res4); - } -@@ -825,17 +826,18 @@ - TEST(operation, right_shift) - { - xarray arr({5,1, 1000}); -+ xarray arr2({2,1, 3}); - xarray res1 = right_shift(arr, 4); -- xarray res2 = right_shift(arr, arr); -+ xarray res2 = right_shift(arr, arr2); - EXPECT_EQ(right_shift(arr, 4)(1), 0); - xarray expected1 = {0, 0, 62}; -- xarray expected2 = {0, 0, 3}; -+ xarray expected2 = {1, 0, 125}; - - EXPECT_EQ(expected1, res1); - EXPECT_EQ(expected2, res2); - - xarray res3 = arr >> 4; -- xarray res4 = arr >> arr; -+ xarray res4 = arr >> arr2; - EXPECT_EQ(expected1, res3); - EXPECT_EQ(expected2, res4); - } diff --git a/xtensor.spec b/xtensor.spec index 2646ee3..46144c3 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.21.7 -Release: 4%{?dist} +Version: 0.23.1 +Release: 1%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -10,7 +10,6 @@ URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: make BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gtest-devel @@ -18,10 +17,6 @@ BuildRequires: xtl-devel BuildRequires: xsimd-devel BuildRequires: python3-numpy -Patch0: test_portability.patch -Patch1: 0001-Fix-xnpy-save-padding-computation.patch -Patch2: disable_arch_native.patch - # there is no actual arched content - this is a header only library %global debug_package %{nil} @@ -62,7 +57,7 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %cmake_install %check -%make_build -C %{_vpath_builddir} xtest +%cmake_build --target xtest %files devel %doc README.md @@ -73,6 +68,10 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Feb 15 2021 sguelton@redhat.com - 0.25.1-1 +- Upstream version bump +- More generic use of %cmake_build + * Thu Jan 28 2021 Fedora Release Engineering - 0.21.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d1b3e670a088ff03619eb60db212672d618fdd71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:00:33 +0000 Subject: [PATCH 11/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index 46144c3..e8ebb2c 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.23.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -68,6 +68,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.23.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 15 2021 sguelton@redhat.com - 0.25.1-1 - Upstream version bump - More generic use of %cmake_build From 869c03821fe28482f9bf7127135ae37da2f45360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:34:10 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index e8ebb2c..f2bf049 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.23.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -68,6 +68,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.23.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.23.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e4fabfff3c8c2e3a9708312dc5f8888179df1d2d Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Wed, 11 May 2022 09:46:32 +0200 Subject: [PATCH 13/28] Upstream version bump --- .gitignore | 1 + sources | 2 +- xtensor.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b6b5914..4cb3e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xtensor-0.21.2.tar.gz /xtensor-0.21.7.tar.gz /xtensor-0.23.1.tar.gz +/xtensor-0.24.2.tar.gz diff --git a/sources b/sources index 113cdd1..972b9d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.23.1.tar.gz) = 6b9aaa0afc8e602e389d33dae1a2204b5beca499f6499adde9418b7d8bf6c62631142b7c774e12203e20769949e004abd4080f84131dd95d5bcef734b33ef15b +SHA512 (xtensor-0.24.2.tar.gz) = ca3682c33e106ba1391c7fb9135cde846cd13de5aab8923b25792ba0103848e904146dbf83c1ba6f030e85f187ec922e083d84a6c248a21e410fdd8785a86398 diff --git a/xtensor.spec b/xtensor.spec index f2bf049..971a33b 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.23.1 -Release: 3%{?dist} +Version: 0.24.2 +Release: 1%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -68,13 +68,16 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed May 11 2022 sguelton@redhat.com - 0.24.2-1 +- Upstream version bump + * Sat Jan 22 2022 Fedora Release Engineering - 0.23.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Fri Jul 23 2021 Fedora Release Engineering - 0.23.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Mon Feb 15 2021 sguelton@redhat.com - 0.25.1-1 +* Mon Feb 15 2021 sguelton@redhat.com - 0.23.1-1 - Upstream version bump - More generic use of %cmake_build From 7aa196872e55c380864a44a3c2ddeca343e88779 Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Fri, 13 May 2022 14:34:26 +0200 Subject: [PATCH 14/28] Add missing dependency --- xtensor.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xtensor.spec b/xtensor.spec index 971a33b..b94682c 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -16,6 +16,7 @@ BuildRequires: gtest-devel BuildRequires: xtl-devel BuildRequires: xsimd-devel BuildRequires: python3-numpy +BuildRequires: doctest # there is no actual arched content - this is a header only library %global debug_package %{nil} From d8b9007467f8f72c9545256676e44d41de6ee1a7 Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Fri, 13 May 2022 17:09:00 +0200 Subject: [PATCH 15/28] Use correct package spec --- xtensor.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index b94682c..72f8d4a 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -16,7 +16,7 @@ BuildRequires: gtest-devel BuildRequires: xtl-devel BuildRequires: xsimd-devel BuildRequires: python3-numpy -BuildRequires: doctest +BuildRequires: doctest-devel # there is no actual arched content - this is a header only library %global debug_package %{nil} From 8b79462a88b20743706d0a063c0cd4da9550d5f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:35:54 +0000 Subject: [PATCH 16/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index 72f8d4a..e54ec7a 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -69,6 +69,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 11 2022 sguelton@redhat.com - 0.24.2-1 - Upstream version bump From be2d8fa6c095109bd89c1db307f69c5dfa9977c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:55:52 +0000 Subject: [PATCH 17/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index e54ec7a..abb7f5c 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.24.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -69,6 +69,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.24.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7e72ec555dca78e32ffa7b87f7c6f44830c92a68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:21:10 +0000 Subject: [PATCH 18/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index abb7f5c..0bebe91 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.24.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -69,6 +69,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.24.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.24.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 020cb361d721f779f0b21ddff57e79e897f600b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 11:19:33 +0000 Subject: [PATCH 19/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xtensor.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index 0bebe91..f05e3d4 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -2,7 +2,7 @@ Name: xtensor Version: 0.24.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -69,6 +69,9 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jan 29 2024 Fedora Release Engineering - 0.24.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.24.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9bde6f3495e8f2d33f49dd5d8890dc4af7bca12e Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Wed, 17 Apr 2024 23:04:13 +0200 Subject: [PATCH 20/28] Upstream release Also modernize packaging to use %autochangelog and %autorelease --- .gitignore | 1 + changelog | 46 ++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- xtensor.spec | 56 ++++++---------------------------------------------- 4 files changed, 54 insertions(+), 51 deletions(-) create mode 100644 changelog diff --git a/.gitignore b/.gitignore index 4cb3e1c..0721bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xtensor-0.21.7.tar.gz /xtensor-0.23.1.tar.gz /xtensor-0.24.2.tar.gz +/xtensor-0.25.0.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..a37ec8c --- /dev/null +++ b/changelog @@ -0,0 +1,46 @@ +* Mon Jan 29 2024 Fedora Release Engineering - 0.24.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.24.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.24.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed May 11 2022 sguelton@redhat.com - 0.24.2-1 +- Upstream version bump + +* Sat Jan 22 2022 Fedora Release Engineering - 0.23.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.23.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Feb 15 2021 sguelton@redhat.com - 0.23.1-1 +- Upstream version bump +- More generic use of %cmake_build + +* Thu Jan 28 2021 Fedora Release Engineering - 0.21.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Oct 06 2020 sguelton@redhat.com - 0.21.7-3 +- Activate all architectures, fixing the remaining issues in the test suite + +* Mon Oct 05 2020 sguelton@redhat.com - 0.21.7-2 +- Fix UB in upstream testsuite, see https://github.com/xtensor-stack/xtensor/pull/2175 +- Activates armv7hl + +* Sat Oct 3 2020 sguelton@redhat.com - 0.21.7-1 +- Upstream version bump + +* Wed Jul 29 2020 Fedora Release Engineering - 0.21.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 16 2020 sguelton@redhat.com - 0.21.2-1 +- Upstream version bump + +* Tue Sep 3 2019 sguelton@redhat.com - 0.20.8-1 +- Initial package diff --git a/sources b/sources index 972b9d0..0dd4631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.24.2.tar.gz) = ca3682c33e106ba1391c7fb9135cde846cd13de5aab8923b25792ba0103848e904146dbf83c1ba6f030e85f187ec922e083d84a6c248a21e410fdd8785a86398 +SHA512 (xtensor-0.25.0.tar.gz) = d8ff5bdb2af66db5ba84cceb2e5138728b7e689b81d5aab904c4f5dfbebdcde67b8ecf38e69750edb85e30a6f45ce70ff618ca3d1a76f38a2b4013a6a6320de6 diff --git a/xtensor.spec b/xtensor.spec index f05e3d4..4a006e1 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.24.2 -Release: 5%{?dist} +Version: 0.25.0 +Release: %autorelease Summary: C++ tensors with broadcasting and lazy computing License: BSD URL: http://xtensor.readthedocs.io/ @@ -17,6 +17,7 @@ BuildRequires: xtl-devel BuildRequires: xsimd-devel BuildRequires: python3-numpy BuildRequires: doctest-devel +BuildRequires: json-devel # there is no actual arched content - this is a header only library %global debug_package %{nil} @@ -65,53 +66,8 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.l %license LICENSE %{_includedir}/%{name}.hpp %{_includedir}/%{name}/ -%{_libdir}/cmake/%{name}/ -%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/cmake/%{name}/ +%{_datadir}/pkgconfig/%{name}.pc %changelog -* Mon Jan 29 2024 Fedora Release Engineering - 0.24.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.24.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.24.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.24.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed May 11 2022 sguelton@redhat.com - 0.24.2-1 -- Upstream version bump - -* Sat Jan 22 2022 Fedora Release Engineering - 0.23.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.23.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Feb 15 2021 sguelton@redhat.com - 0.23.1-1 -- Upstream version bump -- More generic use of %cmake_build - -* Thu Jan 28 2021 Fedora Release Engineering - 0.21.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Oct 06 2020 sguelton@redhat.com - 0.21.7-3 -- Activate all architectures, fixing the remaining issues in the test suite - -* Mon Oct 05 2020 sguelton@redhat.com - 0.21.7-2 -- Fix UB in upstream testsuite, see https://github.com/xtensor-stack/xtensor/pull/2175 -- Activates armv7hl - -* Sat Oct 3 2020 sguelton@redhat.com - 0.21.7-1 -- Upstream version bump - -* Wed Jul 29 2020 Fedora Release Engineering - 0.21.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 16 2020 sguelton@redhat.com - 0.21.2-1 -- Upstream version bump - -* Tue Sep 3 2019 sguelton@redhat.com - 0.20.8-1 -- Initial package +%autochangelog From 73f4649d32b9060519cf93a573ad45c96ffb40c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:31:54 +0000 Subject: [PATCH 21/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From bab50a37b97884790e993174f371e72f9d54decf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:58:52 +0200 Subject: [PATCH 22/28] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xtensor.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xtensor.spec b/xtensor.spec index 4a006e1..34d8966 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -4,7 +4,8 @@ Name: xtensor Version: 0.25.0 Release: %autorelease Summary: C++ tensors with broadcasting and lazy computing -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor From ac394bb0de2065eb6caba60e32b604eab53f3f0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:22:33 +0000 Subject: [PATCH 23/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0e50d78f9965cb31d9decda4d47b21643cd870c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:06:48 +0000 Subject: [PATCH 24/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e3e51b8b4823a1fbe2bba00ba664450861c41750 Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Fri, 1 Aug 2025 09:37:31 +0200 Subject: [PATCH 25/28] Upstream release --- .gitignore | 1 + sources | 2 +- xtensor.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0721bb6..1a8012a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xtensor-0.23.1.tar.gz /xtensor-0.24.2.tar.gz /xtensor-0.25.0.tar.gz +/xtensor-0.27.0.tar.gz diff --git a/sources b/sources index 0dd4631..c719246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.25.0.tar.gz) = d8ff5bdb2af66db5ba84cceb2e5138728b7e689b81d5aab904c4f5dfbebdcde67b8ecf38e69750edb85e30a6f45ce70ff618ca3d1a76f38a2b4013a6a6320de6 +SHA512 (xtensor-0.27.0.tar.gz) = 52616a61f9c74c9a37daea5615edb210ff9ef636620266c04ef3e145a067ed685c36febdee4d225ff7c4865e45384e92034a0e7bf9d255727aca7100bc45143c diff --git a/xtensor.spec b/xtensor.spec index 34d8966..7e422ee 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,7 +1,7 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.25.0 +Version: 0.27.0 Release: %autorelease Summary: C++ tensors with broadcasting and lazy computing # Automatically converted from old format: BSD - review is highly recommended. @@ -49,7 +49,7 @@ Requires: xsimd-devel %autosetup -p1 %ifarch s390x -find -name '*.npy' -exec %{__python3} -c "import numpy as np; np.save('{}', np.load('{}').byteswap().newbyteorder())" \; +find -name '*.npy' -exec %{__python3} -c "import numpy as np; arr = np.load('{}').byteswap() ; np.save('{}', arr.view(arr.dtype.newbyteorder()))" \; %endif %build From 32593274ab983ac94348d62536dc5769a1517389 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:56:12 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 0ac1d488c438c98a26ab2cdd3e3dde12ead4199e Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Tue, 24 Feb 2026 11:30:46 +0100 Subject: [PATCH 27/28] Upstream release --- .gitignore | 1 + sources | 2 +- xtensor.spec | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1a8012a..aca3ef8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xtensor-0.24.2.tar.gz /xtensor-0.25.0.tar.gz /xtensor-0.27.0.tar.gz +/xtensor-0.27.1.tar.gz diff --git a/sources b/sources index c719246..2f4f959 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtensor-0.27.0.tar.gz) = 52616a61f9c74c9a37daea5615edb210ff9ef636620266c04ef3e145a067ed685c36febdee4d225ff7c4865e45384e92034a0e7bf9d255727aca7100bc45143c +SHA512 (xtensor-0.27.1.tar.gz) = 3f3fe2391df91518cfef4983ff66bf3b79940136582bb99c6270f87481bf9d2cc15605b13f9b70b6ee9a7a89b389037dd2b26362fcae0fdc49f5204872ee5291 diff --git a/xtensor.spec b/xtensor.spec index 7e422ee..d9bf989 100644 --- a/xtensor.spec +++ b/xtensor.spec @@ -1,11 +1,10 @@ %undefine __cmake_in_source_build Name: xtensor -Version: 0.27.0 +Version: 0.27.1 Release: %autorelease Summary: C++ tensors with broadcasting and lazy computing -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause URL: http://xtensor.readthedocs.io/ %global github https://github.com/QuantStack/xtensor @@ -58,6 +57,8 @@ find -name '*.npy' -exec %{__python3} -c "import numpy as np; arr = np.load('{}' %install %cmake_install +rm %{buildroot}%{_prefix}/etc/xeus-cpp/tags.d/xtensor.json +rm %{buildroot}%{_datadir}/xeus-cpp/tagfiles/xtensor.tag %check %cmake_build --target xtest From de2bc5c4a12b8d30771886e3cbd7154cc2ad8799 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:28:50 +0000 Subject: [PATCH 28/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild