This repository has been archived by the owner on Jan 30, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'trac/u/cpernet/fflas_and_linbox_broken_…
…with_gcc_8_1_0' into t/25391/sagemath_fails_to_build_on_on_fedora_28_with_gcc_8_1 Merge needed to include the linbox fix for gcc 8.1
- Loading branch information
Showing
2 changed files
with
53 additions
and
0 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
build/pkgs/fflas_ffpack/patches/25353-fflasffpack-constvoid.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl | ||
| index e416545..ba407ec 100644 | ||
| --- a/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl | ||
| +++ b/fflas-ffpack/fflas/fflas_simd/simd256_int16.inl | ||
| @@ -255,7 +255,7 @@ template <> struct Simd256_impl<true, true, true, 2> : public Simd256i_base { | ||
| * Return : [a0, b0, ..., a7, b7] int16_t | ||
| * [a8, b8, ..., a15, b15] int16_t | ||
| */ | ||
| - static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { | ||
| + static INLINE void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { | ||
| using Simd256_64 = Simd256<uint64_t>; | ||
| vect_t a1 = Simd256_64::template shuffle<0xD8>(a); // 0xD8 = 3120 base_4 | ||
| vect_t b1 = Simd256_64::template shuffle<0xD8>(b); // 0xD8 = 3120 base_4 | ||
| diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl | ||
| index 7b870a1..9d27d6a 100644 | ||
| --- a/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl | ||
| +++ b/fflas-ffpack/fflas/fflas_simd/simd256_int32.inl | ||
| @@ -255,7 +255,7 @@ template <> struct Simd256_impl<true, true, true, 4> : public Simd256i_base { | ||
| * Return : [a0, b0, ..., a3, b3] int32_t | ||
| * [a4, b4, ..., a7, b7] int32_t | ||
| */ | ||
| - static INLINE CONST void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { | ||
| + static INLINE void unpacklohi(vect_t& s1, vect_t& s2, const vect_t a, const vect_t b) { | ||
| using Simd256_64 = Simd256<uint64_t>; | ||
| vect_t a1 = Simd256_64::template shuffle<0xD8>(a); // 0xD8 = 3120 base_4 | ||
| vect_t b1 = Simd256_64::template shuffle<0xD8>(b); // 0xD8 = 3120 base_4 | ||
| diff --git a/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl b/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl | ||
| index 7f61345..3976c1e 100644 | ||
| --- a/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl | ||
| +++ b/fflas-ffpack/fflas/fflas_simd/simd256_int64.inl | ||
| @@ -244,7 +244,7 @@ template <> struct Simd256_impl<true, true, true, 8> : public Simd256i_base { | ||
| * Return : [a0, b0, a1, b1] int64_t | ||
| * [a2, b2, a3, b3] int64_t | ||
| */ | ||
| - static INLINE CONST void unpacklohi(vect_t& l, vect_t& h, const vect_t a, const vect_t b) { | ||
| + static INLINE void unpacklohi(vect_t& l, vect_t& h, const vect_t a, const vect_t b) { | ||
| vect_t a1 = shuffle<0xD8>(a); // 0xD8 = 3120 base_4 so a -> [a0,a2,a1,a3] | ||
| vect_t b1 = shuffle<0xD8>(b); // 0xD8 = 3120 base_4 | ||
| l = unpacklo_twice(a1, b1); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/linbox/matrix/densematrix/blas-transposed-matrix.h b/linbox/matrix/densematrix/blas-transposed-matrix.h | ||
| index b81e659..d9c0314 100644 | ||
| --- a/linbox/matrix/densematrix/blas-transposed-matrix.h | ||
| +++ b/linbox/matrix/densematrix/blas-transposed-matrix.h | ||
| @@ -67,9 +67,6 @@ namespace LinBox | ||
| /*! TransposedBlasMatrix. | ||
| * NO DOC | ||
| */ | ||
| -#if !defined(__INTEL_COMPILER) && !defined(__CUDACC__) & !defined(__clang__) | ||
| - template <> | ||
| -#endif | ||
| template< class Matrix > | ||
| class TransposedBlasMatrix< TransposedBlasMatrix< Matrix > > : public Matrix { | ||
|
|