Skip to content

Commit

Permalink
sagemathgh-37938: Updates to linbox-1.7.0, givaro-4.2.0, fflas-ffpack…
Browse files Browse the repository at this point in the history
…-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):
  • Loading branch information
Release Manager committed May 5, 2024
2 parents 30d3426 + e04e246 commit 22a2d75
Show file tree
Hide file tree
Showing 25 changed files with 248 additions and 2,768 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=05b0134b34e09f1a390f6e187125aa44ae8c9ed8
md5=3b7e7e776f1a738428fa62201c309a0f
cksum=2552125601
sha1=9e76a17c15c5b778a7d03475320fc29e65078ebf
md5=aa508e9770ee14f3fc70e70ca3c96810
cksum=3293964050
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49bb837484de01f2f5fe458bf8cc7734aef5146e
5b49b1c0adff69876371aa60fb8b967c4fd7bf3c
7 changes: 4 additions & 3 deletions build/pkgs/fflas_ffpack/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tarball=fflas_ffpack-VERSION.tar.bz2
sha1=c221513710b98e0e62153f424a9725c5be2ff62a
md5=05c77ea30394cacd53b7aed6ffba1e7b
cksum=3775757878
sha1=7c5faa81abc2b88ec24cec373b5e44cbaa7844dd
md5=d8b7c113951a2a3f498a3aaadbe5620f
cksum=3321469120
upstream_url=https://github.com/linbox-team/fflas-ffpack/releases/download/vVERSION/fflas_ffpack-VERSION.tar.bz2
2 changes: 1 addition & 1 deletion build/pkgs/fflas_ffpack/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.3.p0
2.5.0

This file was deleted.

35 changes: 35 additions & 0 deletions build/pkgs/fflas_ffpack/patches/357.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 9b6083c663096e9ca85775b79f1f27c848dbeb98 Mon Sep 17 00:00:00 2001
From: Cyril Bouvier <[email protected]>
Date: Fri, 17 Dec 2021 10:27:02 +0100
Subject: [PATCH] Fix SimdChooser: on not x86_64 machines its value could be an
nonexistant struct

---
fflas-ffpack/fflas/fflas_simd.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/fflas-ffpack/fflas/fflas_simd.h b/fflas-ffpack/fflas/fflas_simd.h
index bf5d30211..84ced0fd8 100644
--- a/fflas-ffpack/fflas/fflas_simd.h
+++ b/fflas-ffpack/fflas/fflas_simd.h
@@ -384,6 +384,20 @@ struct SimdChooser<T, true, true> // integral number
#endif
};

+#ifndef __x86_64__
+template <>
+struct SimdChooser<uint64_t, true, true>
+{
+ using value = NoSimd<uint64_t>;
+};
+
+template <>
+struct SimdChooser<int64_t, true, true>
+{
+ using value = NoSimd<int64_t>;
+};
+#endif
+
template <class T> using Simd = typename SimdChooser<T>::value;

// template <class T> struct SimdChooser<T, true> {
28 changes: 0 additions & 28 deletions build/pkgs/fflas_ffpack/patches/fix-ksh-pkgconfig.patch

This file was deleted.

2 changes: 1 addition & 1 deletion build/pkgs/fflas_ffpack/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SAGE_SPKG_CONFIGURE([fflas_ffpack], [
# the system fflas-ffpack, too. Use pkg-config to find a
# recentish version, if there is one.
PKG_CHECK_MODULES([FFLAS_FFPACK],
[fflas-ffpack >= 2.4.0],dnl The version test is refined in linbox/spkg-configure.m4
[fflas-ffpack >= 2.5.0],dnl The version test is refined in linbox/spkg-configure.m4
[sage_spkg_install_fflas_ffpack=no],
[sage_spkg_install_fflas_ffpack=yes])
])
Expand Down
7 changes: 4 additions & 3 deletions build/pkgs/givaro/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tarball=givaro-VERSION.tar.gz
sha1=2e7af1537d6f8325578a54d5b8092c990028863d
md5=b27c7713fcdced257df5f17b7bec8fd5
cksum=731010730
sha1=73ef15ca34c6f1c9f61013d2bd7d4d547e3ace14
md5=d03ca4ba1e4a44c20935cf2adfcb520b
cksum=3088182773
upstream_url=https://github.com/linbox-team/givaro/releases/download/vVERSION/givaro-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/givaro/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.1
4.2.0
28 changes: 28 additions & 0 deletions build/pkgs/givaro/patches/197.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From ab3d332508c21daff41fb64a8658cdc7cc74fc47 Mon Sep 17 00:00:00 2001
From: Cyril Bouvier <[email protected]>
Date: Thu, 16 Dec 2021 17:12:25 +0100
Subject: [PATCH] dom_power argument is now an uint64_t to avoid problem with
32bit machine

---
src/kernel/system/givpower.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kernel/system/givpower.h b/src/kernel/system/givpower.h
index eb784872..5644264d 100644
--- a/src/kernel/system/givpower.h
+++ b/src/kernel/system/givpower.h
@@ -71,11 +71,11 @@ namespace Givaro {

//! dom_power
template<class D, class TT>
- TT& dom_power(TT& res, const TT& n, long l, const D& F)
+ TT& dom_power(TT& res, const TT& n, uint64_t l, const D& F)
{
if (l == 0) return F.assign(res,F.one) ;

- unsigned long p = (unsigned long) l ;
+ uint64_t p = l;
bool is_assg = false ;

TT puiss; F.init(puiss); F.assign(puiss,n) ;
30 changes: 30 additions & 0 deletions build/pkgs/givaro/patches/226.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 20caba1b549fe46b483f120f8eec6ec4e9f4572d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <[email protected]>
Date: Thu, 25 Jan 2024 08:29:17 -0500
Subject: [PATCH] Temporary GCC 14 workaround
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/linbox-team/givaro/issues/226 “GCC 14: No match
for operator= for Givaro::ZRing<Givaro::Integer>”

Recommended in
https://github.com/linbox-team/givaro/issues/226#issuecomment-1908853755
---
src/kernel/integer/random-integer.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/src/kernel/integer/random-integer.h b/src/kernel/integer/random-integer.h
index f9361d33..ea189a36 100644
--- a/src/kernel/integer/random-integer.h
+++ b/src/kernel/integer/random-integer.h
@@ -87,7 +87,6 @@ namespace Givaro
if (this != &R) {
_bits = R._bits;
_integer = R._integer;
- const_cast<Integer_Domain&>(_ring)=R._ring;
}
return *this;
}
--
27 changes: 0 additions & 27 deletions build/pkgs/givaro/patches/fix-ksh-pkgconfig.patch

This file was deleted.

Loading

0 comments on commit 22a2d75

Please sign in to comment.