Skip to content

Use buffer #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use buffer #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0656459
Use buffer
blegat Feb 16, 2023
17b83d4
Fixes
blegat Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions src/gcd.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ _polynomial(ts, state, ::MA.IsNotMutable) = polynomial(ts, state)
_polynomial(ts, state, ::MA.IsMutable) = polynomial!(ts, state)

"""
primitive_univariate_gcd!(p::APL, q::APL, algo::AbstractUnivariateGCDAlgorithm)
primitive_univariate_gcd!(p::APL, q::APL, algo::AbstractUnivariateGCDAlgorithm, buffer=nothing)

Returns the `gcd` of primitive polynomials `p` and `q` using algorithm `algo`
which is a subtype of [`AbstractUnivariateGCDAlgorithm`](@ref).
Expand All @@ -419,9 +419,14 @@ end

# If `p` and `q` do not have the same type then the local variables `p` and `q`
# won't be type stable so we create `u` and `v`.
function primitive_univariate_gcd!(p::APL, q::APL, algo::GeneralizedEuclideanAlgorithm)
function primitive_univariate_gcd!(
p::APL,
q::APL,
algo::GeneralizedEuclideanAlgorithm,
buffer=nothing,
)
if maxdegree(p) < maxdegree(q)
return primitive_univariate_gcd!(q, p, algo)
return primitive_univariate_gcd!(q, p, algo, buffer)
end
R = MA.promote_operation(gcd, typeof(p), typeof(q))
u = convert(R, p)
Expand All @@ -436,7 +441,7 @@ function primitive_univariate_gcd!(p::APL, q::APL, algo::GeneralizedEuclideanAlg
end

d_before = degree(leadingmonomial(u))
r = MA.operate!!(rem_or_pseudo_rem, u, v, algo)
r = MA.buffered_operate!!(buffer, rem_or_pseudo_rem, u, v, algo)
d_after = degree(leadingmonomial(r))
if d_after == d_before
not_divided_error(u, v)
Expand Down Expand Up @@ -485,7 +490,7 @@ function primitive_univariate_gcdx(u0::APL, v0::APL, algo::GeneralizedEuclideanA
end


function primitive_univariate_gcd!(p::APL, q::APL, ::SubresultantAlgorithm)
function primitive_univariate_gcd!(p::APL, q::APL, ::SubresultantAlgorithm, buffer=nothing)
error("Not implemented yet")
end

Expand All @@ -512,13 +517,28 @@ If the coefficients are not `AbstractFloat`, this
*Art of computer programming, volume 2: Seminumerical algorithms.*
Addison-Wesley Professional. Third edition.
"""
function univariate_gcd(p1::APL{S}, p2::APL{T}, algo::AbstractUnivariateGCDAlgorithm, m1::MA.MutableTrait, m2::MA.MutableTrait) where {S,T}
return univariate_gcd(_field_absorb(algebraic_structure(S), algebraic_structure(T)), p1, p2, algo, m1, m2)
end
function univariate_gcd(::UFD, p1::APL, p2::APL, algo::AbstractUnivariateGCDAlgorithm, m1::MA.MutableTrait, m2::MA.MutableTrait)
function univariate_gcd(
p1::APL{S},
p2::APL{T},
algo::AbstractUnivariateGCDAlgorithm,
m1::MA.MutableTrait,
m2::MA.MutableTrait,
buffer=nothing
) where {S,T}
return univariate_gcd(_field_absorb(algebraic_structure(S), algebraic_structure(T)), p1, p2, algo, m1, m2, buffer)
end
function univariate_gcd(
::UFD,
p1::APL,
p2::APL,
algo::AbstractUnivariateGCDAlgorithm,
m1::MA.MutableTrait,
m2::MA.MutableTrait,
buffer=nothing,
)
f1, g1 = primitive_part_content(p1, algo, m1)
f2, g2 = primitive_part_content(p2, algo, m2)
pp = primitive_univariate_gcd!(f1, f2, algo)
pp = primitive_univariate_gcd!(f1, f2, algo, buffer)
gg = _gcd(g1, g2, algo, MA.IsMutable(), MA.IsMutable())#::MA.promote_operation(gcd, typeof(g1), typeof(g2))
# Multiply each coefficient by the gcd of the contents.
if !isone(gg)
Expand All @@ -527,8 +547,8 @@ function univariate_gcd(::UFD, p1::APL, p2::APL, algo::AbstractUnivariateGCDAlgo
return pp
end

function univariate_gcd(::Field, p1::APL, p2::APL, algo::AbstractUnivariateGCDAlgorithm, m1::MA.MutableTrait, m2::MA.MutableTrait)
return primitive_univariate_gcd!(_copy(p1, m1), _copy(p2, m2), algo)
function univariate_gcd(::Field, p1::APL, p2::APL, algo::AbstractUnivariateGCDAlgorithm, m1::MA.MutableTrait, m2::MA.MutableTrait, buffer=nothing)
return primitive_univariate_gcd!(_copy(p1, m1), _copy(p2, m2), algo, buffer)
end

function univariate_gcdx(p1::APL{S}, p2::APL{T}, algo::AbstractUnivariateGCDAlgorithm) where {S,T}
Expand Down
18 changes: 15 additions & 3 deletions test/allocations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,31 @@ function test_div()
end

function _test_univ_gcd(T, algo)
if T == BigInt && VERSION < v"1.0"
# Getting allocations on Julia v1.6
# https://github.com/JuliaAlgebra/MultivariatePolynomials.jl/actions/runs/4193583097/jobs/7270643628
return
end
o = one(T)
@polyvar x
p1 = o * x^2 + 2o * x + o
p2 = o * x + o
buffer = buffer_for(MP.rem_or_pseudo_rem, typeof(p1), typeof(p2), typeof(algo))
mutable_alloc_test(mutable_copy(p1), 0) do p1
MP.univariate_gcd(p1, p2, algo, IsMutable(), IsMutable())
MP.primitive_univariate_gcd!(p1, p2, algo, buffer)
end
if T === Int
mutable_alloc_test(mutable_copy(p1), 0) do p1
MP.gcd(p1, p2, algo, IsMutable(), IsMutable())
end
end
end

function test_univ_gcd()
algo = GeneralizedEuclideanAlgorithm()
_test_univ_gcd(Int, algo)
#_test_univ_gcd(BigInt, algo) # TODO
@testset "$T" for T in [Int, BigInt]
_test_univ_gcd(T, algo)
end
end

end
Expand Down