Skip to content

Fix affprop() random CI failures #246

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
Jul 26, 2023
Merged

Fix affprop() random CI failures #246

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
e0b3d73
affprop(): add temp diagnostic output
alyst Mar 20, 2023
95c9714
_asp_get_assignments(): simplify
alyst Jul 26, 2023
48dded1
affprop: fix test matrix
alyst Jul 26, 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
18 changes: 10 additions & 8 deletions src/affprop.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,17 @@ function _affinityprop(S::AbstractMatrix{T},

# extract exemplars and assignments
exemplars = _afp_extract_exemplars(A, R)
if isempty(exemplars)
@show A R
end
@assert !isempty(exemplars)
assignments, counts = _afp_get_assignments(S, exemplars)

if displevel >= 1
if converged
println("Affinity propagation converged with $t iterations: $(length(exemplars)) exemplars.")
@info "Affinity propagation converged with $t iterations: $(length(exemplars)) exemplars."
else
println("Affinity propagation terminated without convergence after $t iterations: $(length(exemplars)) exemplars.")
@warn "Affinity propagation terminated without convergence after $t iterations: $(length(exemplars)) exemplars."
end
end

Expand Down Expand Up @@ -250,7 +254,6 @@ function _afp_get_assignments(S::AbstractMatrix, exemplars::Vector{Int})
k = length(exemplars)
Se = S[:, exemplars]
a = Vector{Int}(undef, n)
cnts = zeros(Int, k)
for i = 1:n
p = 1
v = Se[i,1]
Expand All @@ -263,11 +266,10 @@ function _afp_get_assignments(S::AbstractMatrix, exemplars::Vector{Int})
end
a[i] = p
end
for i = 1:k
a[exemplars[i]] = i
end
for i = 1:n
@inbounds cnts[a[i]] += 1
a[exemplars] = eachindex(exemplars)
cnts = zeros(Int, k)
for aa in a
@inbounds cnts[aa] += 1
end
return (a, cnts)
end
6 changes: 4 additions & 2 deletions test/affprop.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ include("test_helpers.jl")
@test_throws ArgumentError affinityprop(randn(2, 2), tol=0.0)
@test_throws ArgumentError affinityprop(randn(2, 2), damp=-0.1)
@test_throws ArgumentError affinityprop(randn(2, 2), damp=1.0)
@test affinityprop(randn(2, 2), damp=0.5, tol=0.5) isa AffinityPropResult
x = randn(2, 4)
S = -pairwise(Euclidean(), x, x, dims=2)
@test affinityprop(S, damp=0.5, tol=0.5) isa AffinityPropResult
for disp in keys(Clustering.DisplayLevels)
@test affinityprop(randn(2, 2), tol=0.1, display=disp) isa AffinityPropResult
@test affinityprop(S, tol=0.1, display=disp) isa AffinityPropResult
end
end

Expand Down