Adjust to expected AbstractAlgebra changes (#1730)

Nemocas · Apr 26, 2024 · 253a1c6 · 253a1c6
1 parent 09c3bef
commit 253a1c6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 28 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Nemo"
 uuid = "2edaba10-b0f1-5616-af89-8c11ac63239a"
-version = "0.43.3"
+version = "0.44.0-DEV"
 
 [deps]
 AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
@@ -16,7 +16,7 @@ RandomExtensions = "fb686558-2515-59ef-acaa-46db3789a887"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 
 [compat]
-AbstractAlgebra = "0.40.8"
+AbstractAlgebra = "0.41.0"
 Antic_jll = "~0.201.500"
 Arb_jll = "~200.2300.000"
 Calcium_jll = "~0.401.100"

diff --git a/src/Exports.jl b/src/Exports.jl
@@ -586,7 +586,6 @@ export snf
 export snf_diagonal
 export solve
 export sort_terms!
-export SparsePolynomialRing
 export sqr_classical
 export sqrt
 export sqrt1pm1

diff --git a/src/arb/ComplexMat.jl b/src/arb/ComplexMat.jl
@@ -615,7 +615,7 @@ end
 ################################################################################
 
 function solve_init(A::ComplexMat)
-   return Solve.SolveCtx{ComplexFieldElem, ComplexMat, ComplexMat}(A)
+   return Solve.SolveCtx{ComplexFieldElem, ComplexMat, ComplexMat, ComplexMat}(A)
 end
 
 function Solve._init_reduce(C::Solve.SolveCtx{ComplexFieldElem})

diff --git a/src/arb/RealMat.jl b/src/arb/RealMat.jl
@@ -557,7 +557,7 @@ end
 ################################################################################
 
 function solve_init(A::RealMat)
-   return Solve.SolveCtx{RealFieldElem, RealMat, RealMat}(A)
+   return Solve.SolveCtx{RealFieldElem, RealMat, RealMat, RealMat}(A)
 end
 
 function Solve._init_reduce(C::Solve.SolveCtx{RealFieldElem})

diff --git a/src/arb/acb_mat.jl b/src/arb/acb_mat.jl
@@ -618,7 +618,7 @@ end
 ################################################################################
 
 function solve_init(A::AcbMatrix)
-   return Solve.SolveCtx{AcbFieldElem, AcbMatrix, AcbMatrix}(A)
+   return Solve.SolveCtx{AcbFieldElem, AcbMatrix, AcbMatrix, AcbMatrix}(A)
 end
 
 function Solve._init_reduce(C::Solve.SolveCtx{AcbFieldElem})

diff --git a/src/arb/arb_mat.jl b/src/arb/arb_mat.jl
@@ -584,7 +584,7 @@ end
 ################################################################################
 
 function solve_init(A::ArbMatrix)
-   return Solve.SolveCtx{ArbFieldElem, ArbMatrix, ArbMatrix}(A)
+   return Solve.SolveCtx{ArbFieldElem, ArbMatrix, ArbMatrix, ArbMatrix}(A)
 end
 
 function Solve._init_reduce(C::Solve.SolveCtx{ArbFieldElem})

diff --git a/src/flint/fmpz_mat.jl b/src/flint/fmpz_mat.jl
@@ -1331,7 +1331,7 @@ function Solve._can_solve_internal_no_check(A::ZZMatrix, b::ZZMatrix, task::Symb
 # `lazy_transpose`
 
 function solve_init(A::ZZMatrix)
-  return Solve.SolveCtx{ZZRingElem, ZZMatrix, ZZMatrix}(A)
+  return Solve.SolveCtx{ZZRingElem, ZZMatrix, ZZMatrix, ZZMatrix}(A)
 end
 
 function Solve._init_reduce_transpose(C::Solve.SolveCtx{ZZRingElem})

diff --git a/src/matrix.jl b/src/matrix.jl
@@ -57,7 +57,7 @@ end
 ################################################################################
 
 function solve_init(A::_FieldMatTypes)
-   return Solve.SolveCtx{elem_type(base_ring(A)), typeof(A), typeof(A)}(A)
+   return Solve.SolveCtx{elem_type(base_ring(A)), typeof(A), typeof(A), typeof(A)}(A)
 end
 
 ################################################################################
@@ -80,18 +80,13 @@ function Solve._init_reduce(C::Solve.SolveCtx{T}) where {T <: Union{fpFieldElem,
    C.lu_perm = p
    if r < nrows(C)
       pA = p*matrix(C)
-      set_attribute!(C, :permuted_matrix_lu => view(pA, r + 1:nrows(C), :))
+      C.permuted_matrix = view(pA, r + 1:nrows(C), :)
    else
-      set_attribute!(C, :permuted_matrix_lu => zero(matrix(C), 0, ncols(C)))
+      C.permuted_matrix = zero(matrix(C), 0, ncols(C))
    end
    return nothing
 end
 
-function permuted_matrix_lu(C::Solve.SolveCtx{T, MatT}) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}, MatT}
-   Solve._init_reduce(C)
-   return get_attribute(C, :permuted_matrix_lu)::MatT
-end
-
 function Solve._init_reduce_transpose(C::Solve.SolveCtx{T}) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}}
    if isdefined(C, :red_transp) && isdefined(C, :lu_perm_transp)
       return nothing
@@ -106,19 +101,14 @@ function Solve._init_reduce_transpose(C::Solve.SolveCtx{T}) where {T <: Union{fp
    C.lu_perm_transp = p
    if r < ncols(C)
       Ap = matrix(C)*p
-      set_attribute!(C, :permuted_matrix_of_transpose_lu => view(Ap, :, r + 1:ncols(C)))
+      C.permuted_matrix_transp = view(Ap, :, r + 1:ncols(C))
    else
-      set_attribute!(C, :permuted_matrix_of_transpose_lu => zero(matrix(C), nrows(C), 0))
+      C.permuted_matrix_transp = zero(matrix(C), nrows(C), 0)
    end
    return nothing
 end
 
-function permuted_matrix_of_transpose_lu(C::Solve.SolveCtx{T, MatT}) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}, MatT}
-   Solve._init_reduce_transpose(C)
-   return get_attribute(C, :permuted_matrix_of_transpose_lu)::MatT
-end
-
-function Solve._can_solve_internal_no_check(C::Solve.SolveCtx{T, MatT}, b::MatT, task::Symbol; side::Symbol = :left) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}, MatT}
+function Solve._can_solve_internal_no_check(C::Solve.SolveCtx{T}, b::MatElem{T}, task::Symbol; side::Symbol = :left) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}}
    # Split up in separate functions to make the compiler happy
    if side === :right
       return Solve._can_solve_internal_no_check_right(C, b, task)
@@ -127,7 +117,7 @@ function Solve._can_solve_internal_no_check(C::Solve.SolveCtx{T, MatT}, b::MatT,
    end
 end
 
-function Solve._can_solve_internal_no_check_right(C::Solve.SolveCtx{T, MatT}, b::MatT, task::Symbol) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}, MatT}
+function Solve._can_solve_internal_no_check_right(C::Solve.SolveCtx{T}, b::MatElem{T}, task::Symbol) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}}
    LU = Solve.reduced_matrix(C)
    p = Solve.lu_permutation(C)
    pb = p*b
@@ -173,7 +163,7 @@ function Solve._can_solve_internal_no_check_right(C::Solve.SolveCtx{T, MatT}, b:
 
    fl = true
    if r < nrows(C)
-      fl = permuted_matrix_lu(C)*y == view(pb, r + 1:nrows(C), :)
+      fl = Solve.permuted_matrix(C)*y == view(pb, r + 1:nrows(C), :)
    end
 
    if task !== :with_kernel
@@ -183,7 +173,7 @@ function Solve._can_solve_internal_no_check_right(C::Solve.SolveCtx{T, MatT}, b:
    end
 end
 
-function Solve._can_solve_internal_no_check_left(C::Solve.SolveCtx{T, MatT}, b::MatT, task::Symbol) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}, MatT}
+function Solve._can_solve_internal_no_check_left(C::Solve.SolveCtx{T}, b::MatElem{T}, task::Symbol) where {T <: Union{fpFieldElem, FpFieldElem, FqFieldElem, fqPolyRepFieldElem, FqPolyRepFieldElem}}
    LU = Solve.reduced_matrix_of_transpose(C)
    p = Solve.lu_permutation_of_transpose(C)
    pbt = p*transpose(b)
@@ -204,7 +194,7 @@ function Solve._can_solve_internal_no_check_left(C::Solve.SolveCtx{T, MatT}, b::
    fl = true
    if r < ncols(C)
       bp = b*p
-      fl = y*permuted_matrix_of_transpose_lu(C) == view(bp, :, r + 1:ncols(C))
+      fl = y*Solve.permuted_matrix_of_transpose(C) == view(bp, :, r + 1:ncols(C))
    end
 
    if task !== :with_kernel