Update NNDescent.jl compat to 0.3; add LsqFit 0.7 compat

dillondaudert · Dec 13, 2019 · 1319fbb · 1319fbb
1 parent 9243791
commit 1319fbb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -14,8 +14,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 Arpack = "0.3, 0.4"
 Distances = "0.8"
-LsqFit = "0.6, 0.8"
-NearestNeighborDescent = "0.2"
+LsqFit = "0.6, 0.7, 0.8"
+NearestNeighborDescent = "0.3"
 julia = "1.0"
 
 [extras]

diff --git a/src/UMAP.jl b/src/UMAP.jl
@@ -1,11 +1,11 @@
 module UMAP
 
-using Distances: evaluate, pairwise!, Euclidean, SqEuclidean, SemiMetric
-using NearestNeighborDescent: DescentGraph
+using Arpack
+using Distances
+using LinearAlgebra
 using LsqFit: curve_fit
-using SparseArrays: SparseMatrixCSC, sparse, dropzeros, nzrange, rowvals, nonzeros
-using LinearAlgebra: Symmetric, Diagonal, issymmetric, I
-using Arpack: eigs, ARPACKException
+using NearestNeighborDescent
+using SparseArrays
 
 include("utils.jl")
 include("umap_.jl")

diff --git a/src/utils.jl b/src/utils.jl
@@ -65,8 +65,8 @@ function knn_search(X::AbstractMatrix{S},
                     k,
                     metric,
                     ::Val{:approximate}) where {S <: Real}
-    knngraph = DescentGraph(X, k, metric)
-    return knngraph.indices, knngraph.distances
+    knngraph = nndescent(X, k, metric)
+    return knn_matrices(knngraph)
 end
 
 function _knn_from_dists(dist_mat::AbstractMatrix{S}, k) where {S <: Real}