Skip to content

Commit 220d393

Browse files
author
Release Manager
committedMay 11, 2024
sagemathgh-37938: Updates to linbox-1.7.0, givaro-4.2.0, fflas-ffpack-2.5.0
### 📚 Description Draft PR taken from sagemath#35148. I rebased on top of 10.4 and added two more patches taken from upstream @ClementPernet closes sagemath#32959 closes sagemath#35148 URL: sagemath#37938 Reported by: Volker Braun Reviewer(s):
2 parents f1804ba + e04e246 commit 220d393

25 files changed

+248
-2768
lines changed
 

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=599182ff950764df31446f7bf8350499717dc76e
3-
md5=06e0643f4948ad4b4c87d2530d026a1f
4-
cksum=4286155814
2+
sha1=fcc7a915c6597a65a80354a05d08dde1cd1f2219
3+
md5=4bfa7e14f9ff7fd4f9c1d20ed4510952
4+
cksum=1641534268
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e77b3df44ade2f51f750de90ad255f772a933776
1+
58ee28135bd13dec49617367915262e94945ab91

‎build/pkgs/fflas_ffpack/checksums.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=fflas_ffpack-VERSION.tar.bz2
2-
sha1=c221513710b98e0e62153f424a9725c5be2ff62a
3-
md5=05c77ea30394cacd53b7aed6ffba1e7b
4-
cksum=3775757878
2+
sha1=7c5faa81abc2b88ec24cec373b5e44cbaa7844dd
3+
md5=d8b7c113951a2a3f498a3aaadbe5620f
4+
cksum=3321469120
5+
upstream_url=https://github.com/linbox-team/fflas-ffpack/releases/download/vVERSION/fflas_ffpack-VERSION.tar.bz2
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3.p0
1+
2.5.0

‎build/pkgs/fflas_ffpack/patches/0001-Do-not-use-variable-names-B0-B1-to-avoid-clash-with-.patch

-93
This file was deleted.
+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 9b6083c663096e9ca85775b79f1f27c848dbeb98 Mon Sep 17 00:00:00 2001
2+
From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
3+
Date: Fri, 17 Dec 2021 10:27:02 +0100
4+
Subject: [PATCH] Fix SimdChooser: on not x86_64 machines its value could be an
5+
nonexistant struct
6+
7+
---
8+
fflas-ffpack/fflas/fflas_simd.h | 14 ++++++++++++++
9+
1 file changed, 14 insertions(+)
10+
11+
diff --git a/fflas-ffpack/fflas/fflas_simd.h b/fflas-ffpack/fflas/fflas_simd.h
12+
index bf5d30211..84ced0fd8 100644
13+
--- a/fflas-ffpack/fflas/fflas_simd.h
14+
+++ b/fflas-ffpack/fflas/fflas_simd.h
15+
@@ -384,6 +384,20 @@ struct SimdChooser<T, true, true> // integral number
16+
#endif
17+
};
18+
19+
+#ifndef __x86_64__
20+
+template <>
21+
+struct SimdChooser<uint64_t, true, true>
22+
+{
23+
+ using value = NoSimd<uint64_t>;
24+
+};
25+
+
26+
+template <>
27+
+struct SimdChooser<int64_t, true, true>
28+
+{
29+
+ using value = NoSimd<int64_t>;
30+
+};
31+
+#endif
32+
+
33+
template <class T> using Simd = typename SimdChooser<T>::value;
34+
35+
// template <class T> struct SimdChooser<T, true> {

‎build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch

-28
This file was deleted.

‎build/pkgs/fflas_ffpack/spkg-configure.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SAGE_SPKG_CONFIGURE([fflas_ffpack], [
44
# the system fflas-ffpack, too. Use pkg-config to find a
55
# recentish version, if there is one.
66
PKG_CHECK_MODULES([FFLAS_FFPACK],
7-
[fflas-ffpack >= 2.4.0],dnl The version test is refined in linbox/spkg-configure.m4
7+
[fflas-ffpack >= 2.5.0],dnl The version test is refined in linbox/spkg-configure.m4
88
[sage_spkg_install_fflas_ffpack=no],
99
[sage_spkg_install_fflas_ffpack=yes])
1010
])

‎build/pkgs/givaro/checksums.ini

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=givaro-VERSION.tar.gz
2-
sha1=2e7af1537d6f8325578a54d5b8092c990028863d
3-
md5=b27c7713fcdced257df5f17b7bec8fd5
4-
cksum=731010730
2+
sha1=73ef15ca34c6f1c9f61013d2bd7d4d547e3ace14
3+
md5=d03ca4ba1e4a44c20935cf2adfcb520b
4+
cksum=3088182773
5+
upstream_url=https://github.com/linbox-team/givaro/releases/download/vVERSION/givaro-VERSION.tar.gz

‎build/pkgs/givaro/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.1
1+
4.2.0

‎build/pkgs/givaro/patches/197.patch

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From ab3d332508c21daff41fb64a8658cdc7cc74fc47 Mon Sep 17 00:00:00 2001
2+
From: Cyril Bouvier <cyril.bouvier@lirmm.fr>
3+
Date: Thu, 16 Dec 2021 17:12:25 +0100
4+
Subject: [PATCH] dom_power argument is now an uint64_t to avoid problem with
5+
32bit machine
6+
7+
---
8+
src/kernel/system/givpower.h | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h
12+
index eb784872..5644264d 100644
13+
--- a/src/kernel/system/givpower.h
14+
+++ b/src/kernel/system/givpower.h
15+
@@ -71,11 +71,11 @@ namespace Givaro {
16+
17+
//! dom_power
18+
template<class D, class TT>
19+
- TT& dom_power(TT& res, const TT& n, long l, const D& F)
20+
+ TT& dom_power(TT& res, const TT& n, uint64_t l, const D& F)
21+
{
22+
if (l == 0) return F.assign(res,F.one) ;
23+
24+
- unsigned long p = (unsigned long) l ;
25+
+ uint64_t p = l;
26+
bool is_assg = false ;
27+
28+
TT puiss; F.init(puiss); F.assign(puiss,n) ;

‎build/pkgs/givaro/patches/226.patch

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 20caba1b549fe46b483f120f8eec6ec4e9f4572d Mon Sep 17 00:00:00 2001
2+
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
3+
Date: Thu, 25 Jan 2024 08:29:17 -0500
4+
Subject: [PATCH] Temporary GCC 14 workaround
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Fixes https://github.com/linbox-team/givaro/issues/226 “GCC 14: No match
10+
for operator= for Givaro::ZRing<Givaro::Integer>”
11+
12+
Recommended in
13+
https://github.com/linbox-team/givaro/issues/226#issuecomment-1908853755
14+
---
15+
src/kernel/integer/random-integer.h | 1 -
16+
1 file changed, 1 deletion(-)
17+
18+
diff --git a/src/kernel/integer/random-integer.h b/src/kernel/integer/random-integer.h
19+
index f9361d33..ea189a36 100644
20+
--- a/src/kernel/integer/random-integer.h
21+
+++ b/src/kernel/integer/random-integer.h
22+
@@ -87,7 +87,6 @@ namespace Givaro
23+
if (this != &R) {
24+
_bits = R._bits;
25+
_integer = R._integer;
26+
- const_cast<Integer_Domain&>(_ring)=R._ring;
27+
}
28+
return *this;
29+
}
30+
--

‎build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch

-27
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.