Skip to content

Minor memory optimization for Zernike jacobi matrices #122

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

Merged
merged 3 commits into from
Apr 26, 2022
Merged

Minor memory optimization for Zernike jacobi matrices #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eda151
Remove unnecessary stored 0s due to symmetry
TSGut Apr 26, 2022
4f3739b
adapt size test for smaller data
TSGut Apr 26, 2022
c847428
increase coverage
TSGut Apr 26, 2022
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
16 changes: 4 additions & 12 deletions src/disk.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,7 @@ function zernikejacobibandsX(Z::Zernike)
du = sqrt.( (dufirst .+ dueven .+ duodd ) ./ quotient)
dl = sqrt.( (dleven .+ dlodd .+ dlspecial) ./ quotient)

return BlockHcat(
BlockBroadcastArray(hcat, du, Zeros((axes(n,1),)), dl),
Zeros((axes(n,1),Base.OneTo(3))),
Zeros((axes(n,1),Base.OneTo(3)))
)
return BlockBroadcastArray(hcat, du, Zeros((axes(n,1),)), dl)
end

function zernikejacobibandsY(Z::Zernike)
Expand Down Expand Up @@ -264,12 +260,8 @@ function zernikejacobibandsY(Z::Zernike)
dl = (-1) .* (nodd .* kodd .+ neven .* keven) .* Vcat(0 , d)
du = (-1) .* (nodd .* keven .+ neven .* kodd) .* d[2:end]

# zero blocks for banded blockarray structure
z = Zeros((axes(n,1),))
z5 = Zeros((axes(n,1),Base.OneTo(5)))

# generate and return bands
return dat = BlockHcat(BlockBroadcastArray(hcat, dl, z, d, z, du), z5, z5)
return dat = BlockBroadcastArray(hcat, dl, Zeros((axes(n,1),)), d, Zeros((axes(n,1),)), du)
end

function getindex(b::ZernikeJacobimatrixBandsX{T},i,j) where T
Expand All @@ -282,15 +274,15 @@ end
function jacobimatrix(::Val{1}, Z::Zernike{T}) where T
if iszero(Z.a)
dat = ZernikeJacobimatrixBandsX{T}(Z)
return Symmetric(BlockBandedMatrices._BandedBlockBandedMatrix(dat', axes(dat,1), (1,1), (1,1)))
return Symmetric(BlockBandedMatrices._BandedBlockBandedMatrix(dat', axes(dat,1), (-1,1), (1,1)))
else
error("Implement for non-zero first basis parameter.")
end
end
function jacobimatrix(::Val{2}, Z::Zernike{T}) where T
if iszero(Z.a)
dat = ZernikeJacobimatrixBandsY{T}(Z)
return Symmetric(BlockBandedMatrices._BandedBlockBandedMatrix(dat', axes(dat,1), (1,1), (2,2)))
return Symmetric(BlockBandedMatrices._BandedBlockBandedMatrix(dat', axes(dat,1), (-1,1), (2,2)))
else
error("Implement for non-zero first basis parameter.")
end
Expand Down
8 changes: 6 additions & 2 deletions test/test_disk.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ import ForwardDiff: hessian
yf = Z \ (y.*sin.(x.*y) .+ y .* x.^2 .- y.^2)
@test Y[Block.(1:20),Block.(1:20)]*f[Block.(1:20)] ≈ yf[Block.(1:20)]
# data size tests
@test size((X.data).data) == (9, ℵ₀)
@test size((Y.data).data) == (15, ℵ₀)
@test size((X.data).data) == (3, ℵ₀)
@test size((Y.data).data) == (5, ℵ₀)

# for now, reject non-zero first parameter options
@test_throws ErrorException("Implement for non-zero first basis parameter.") jacobimatrix(Val(1),Zernike(1,1))
@test_throws ErrorException("Implement for non-zero first basis parameter.") jacobimatrix(Val(2),Zernike(1,1))
end

@testset "Transform" begin
Expand Down