Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "HMatrices"
uuid = "8646bddf-ab1c-4fa7-9c51-ba187d647618"
version = "0.2.12"
version = "0.2.13"

[deps]
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
Expand Down
10 changes: 7 additions & 3 deletions src/compressor.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,13 @@ function _aca_partial(K, irange, jrange, atol, rmax, rtol, istart, buffer_ = not
if isnothing(i)
# ran out of candidate rows. Good case: the matrix is zero. Bad
# case: aca failed
all(j -> iszero(K[first(irange), j]), jrange) &&
all(i -> iszero(K[i, first(jrange)]), irange) ||
@warn "aca possibly failed on $irange × $jrange"
if K isa KernelMatrix
all(j -> iszero(K[first(irange), j]), jrange) &&
all(i -> iszero(K[i, first(jrange)]), irange) ||
@warn "aca possibly failed on $irange × $jrange" maxlog=1
else
@warn "aca possibly failed on $irange × $jrange" maxlog=1
end
break
end
else # δ != 0
Expand Down
4 changes: 2 additions & 2 deletions src/multiplication.jl
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ Multiplication when the target is a dense matrix. The numbering system in the fo
function _mul_dense!(C::Base.Matrix, A, B, a)
Adata = isleaf(A) ? data(A) : A
Bdata = isleaf(B) ? data(B) : B
if Adata isa HMatrix
if Adata isa HMatrix || Adata isa AdjointHMatrix
if Bdata isa Matrix
_mul131!(C, Adata, Bdata, a)
elseif Bdata isa RkMatrix
Expand All @@ -235,7 +235,7 @@ function _mul_dense!(C::Base.Matrix, A, B, a)
elseif Bdata isa HMatrix
_mul113!(C, Adata, Bdata, a)
end
elseif Adata isa RkMatrix
elseif Adata isa RkMatrix || Adata isa AdjointHMatrix
if Bdata isa Matrix
_mul121!(C, Adata, Bdata, a)
elseif Bdata isa RkMatrix
Expand Down
Loading