Skip to content

Commit faa6ed8

Browse files
Release Managervbraun
Release Manager
authored and
vbraun
committed
Trac #25353: fflas and linbox broken with gcc 8.1.0
{{{ In file included from ../../linbox/matrix/densematrix/blas-matrix.h:54, from ../../linbox/matrix/dense-matrix.h:79, from ../../linbox/algorithms/rational-solver.h:43, from ../../linbox/algorithms/diophantine-solver.h:29, from diophantine-solver.C:26: ../../linbox/matrix/densematrix/blas-transposed-matrix.h:74:8: error: too many template-parameter-lists class TransposedBlasMatrix< TransposedBlasMatrix< Matrix > > : public Matrix { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256.inl:186, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd.h:208, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_freduce.h:33, from ../../../../../../../../include/fflas- ffpack/fflas/fflas.h:104, from ../../../../../../../../include/fflas- ffpack/ffpack/ffpack.h:47, from ../../linbox/matrix/matrixdomain/blas-matrix- domain.h:45, from ../../linbox/matrix/matrix-domain.h:68, from ../../linbox/matrix/transpose-matrix.h:47, from ../../linbox/matrix/matrixdomain/matrix- domain.inl:34, from ../../linbox/matrix/matrixdomain/matrix- domain.h:1233, from ../../linbox/matrix/densematrix/blas-matrix.h:55, from ../../linbox/matrix/dense-matrix.h:79, from ../../linbox/algorithms/rational-solver.h:43, from ../../linbox/algorithms/diophantine-solver.h:29, from diophantine-solver.C:26: ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256_int64.inl:247:90: warning: 'const' attribute on function returning 'void' [-Wattributes] static INLINE CONST void unpacklohi(vect_t& l, vect_t& h, const vect_t a, const vect_t b) { ^ In file included from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256.inl:187, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd.h:208, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_freduce.h:33, from ../../../../../../../../include/fflas- ffpack/fflas/fflas.h:104, from ../../../../../../../../include/fflas- ffpack/ffpack/ffpack.h:47, from ../../linbox/matrix/matrixdomain/blas-matrix- domain.h:45, from ../../linbox/matrix/matrix-domain.h:68, from ../../linbox/matrix/transpose-matrix.h:47, from ../../linbox/matrix/matrixdomain/matrix- domain.inl:34, from ../../linbox/matrix/matrixdomain/matrix- domain.h:1233, from ../../linbox/matrix/densematrix/blas-matrix.h:55, from ../../linbox/matrix/dense-matrix.h:79, from ../../linbox/algorithms/rational-solver.h:43, from ../../linbox/algorithms/diophantine-solver.h:29, from diophantine-solver.C:26: ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256_int32.inl:258:92: warning: 'const' attribute on function returning 'void' [-Wattributes] static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { ^ In file included from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256.inl:188, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd.h:208, from ../../../../../../../../include/fflas- ffpack/fflas/fflas_freduce.h:33, from ../../../../../../../../include/fflas- ffpack/fflas/fflas.h:104, from ../../../../../../../../include/fflas- ffpack/ffpack/ffpack.h:47, from ../../linbox/matrix/matrixdomain/blas-matrix- domain.h:45, from ../../linbox/matrix/matrix-domain.h:68, from ../../linbox/matrix/transpose-matrix.h:47, from ../../linbox/matrix/matrixdomain/matrix- domain.inl:34, from ../../linbox/matrix/matrixdomain/matrix- domain.h:1233, from ../../linbox/matrix/densematrix/blas-matrix.h:55, from ../../linbox/matrix/dense-matrix.h:79, from ../../linbox/algorithms/rational-solver.h:43, from ../../linbox/algorithms/diophantine-solver.h:29, from diophantine-solver.C:26: ../../../../../../../../include/fflas- ffpack/fflas/fflas_simd/simd256_int16.inl:258:92: warning: 'const' attribute on function returning 'void' [-Wattributes] static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { }}} URL: https://trac.sagemath.org/25353 Reported by: vdelecroix Ticket author(s): Clement Pernet Reviewer(s): Julian Rüth
2 parents e08eab2 + cb566ea commit faa6ed8

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

‎build/pkgs/fflas_ffpack/patches/25353-fflasffpack-constvoid.patch

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl
2+
index e416545..ba407ec 100644
3+
--- a/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl
4+
+++ b/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl
5+
@@ -255,7 +255,7 @@ template <> struct Simd256_impl<true, true, true, 2> : public Simd256i_base {
6+
* Return : [a0, b0, ..., a7, b7] int16_t
7+
* [a8, b8, ..., a15, b15] int16_t
8+
*/
9+
- static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) {
10+
+ static INLINE void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) {
11+
using Simd256_64 = Simd256<uint64_t>;
12+
vect_t a1 = Simd256_64::template shuffle<0xD8>(a); // 0xD8 = 3120 base_4
13+
vect_t b1 = Simd256_64::template shuffle<0xD8>(b); // 0xD8 = 3120 base_4
14+
diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl
15+
index 7b870a1..9d27d6a 100644
16+
--- a/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl
17+
+++ b/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl
18+
@@ -255,7 +255,7 @@ template <> struct Simd256_impl<true, true, true, 4> : public Simd256i_base {
19+
* Return : [a0, b0, ..., a3, b3] int32_t
20+
* [a4, b4, ..., a7, b7] int32_t
21+
*/
22+
- static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) {
23+
+ static INLINE void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) {
24+
using Simd256_64 = Simd256<uint64_t>;
25+
vect_t a1 = Simd256_64::template shuffle<0xD8>(a); // 0xD8 = 3120 base_4
26+
vect_t b1 = Simd256_64::template shuffle<0xD8>(b); // 0xD8 = 3120 base_4
27+
diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl
28+
index 7f61345..3976c1e 100644
29+
--- a/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl
30+
+++ b/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl
31+
@@ -244,7 +244,7 @@ template <> struct Simd256_impl<true, true, true, 8> : public Simd256i_base {
32+
* Return : [a0, b0, a1, b1] int64_t
33+
* [a2, b2, a3, b3] int64_t
34+
*/
35+
- static INLINE CONST void unpacklohi(vect_t& l, vect_t& h, const vect_t a, const vect_t b) {
36+
+ static INLINE void unpacklohi(vect_t& l, vect_t& h, const vect_t a, const vect_t b) {
37+
vect_t a1 = shuffle<0xD8>(a); // 0xD8 = 3120 base_4 so a -> [a0,a2,a1,a3]
38+
vect_t b1 = shuffle<0xD8>(b); // 0xD8 = 3120 base_4
39+
l = unpacklo_twice(a1, b1);

‎build/pkgs/linbox/patches/25353-linbox-template.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/linbox/matrix/densematrix/blas-transposed-matrix.h b/linbox/matrix/densematrix/blas-transposed-matrix.h
2+
index b81e659..d9c0314 100644
3+
--- a/linbox/matrix/densematrix/blas-transposed-matrix.h
4+
+++ b/linbox/matrix/densematrix/blas-transposed-matrix.h
5+
@@ -67,9 +67,6 @@ namespace LinBox
6+
/*! TransposedBlasMatrix.
7+
* NO DOC
8+
*/
9+
-#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) & !defined(__clang__)
10+
- template <>
11+
-#endif
12+
template< class Matrix >
13+
class TransposedBlasMatrix< TransposedBlasMatrix< Matrix > > : public Matrix {
14+

0 commit comments

Comments
 (0)