Merge branch 'JuliaGraphs:master' into test-bench-pr

JuliaGraphs · Mar 25, 2024 · 62e9733 · 62e9733
2 parents eaf4f07 + de9cac7
commit 62e9733
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 14 deletions.
diff --git a/Project.toml b/Project.toml
@@ -17,7 +17,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
 Aqua = "0.6"
-ArnoldiMethod = "0.3"
+ArnoldiMethod = "0.4"
 Compat = "3.40, 4"
 DataStructures = "0.17, 0.18"
 Documenter = "0.27"

diff --git a/src/Graphs.jl b/src/Graphs.jl
@@ -3,7 +3,7 @@ module Graphs
 using SimpleTraits
 
 ### Remove the following line once #915 is closed
-using ArnoldiMethod
+using ArnoldiMethod: LM, SR, LR, partialschur, partialeigen
 using Statistics: mean
 
 # Currently used to support the ismutable function that is not available in Julia < v1.7

diff --git a/src/Parallel/Parallel.jl b/src/Parallel/Parallel.jl
@@ -5,7 +5,7 @@ using Graphs: sample, AbstractPathState, JohnsonState, BellmanFordState, FloydWa
 using Distributed: @distributed
 using Base.Threads: @threads, nthreads, Atomic, atomic_add!, atomic_cas!
 using SharedArrays: SharedMatrix, SharedVector, sdata
-using ArnoldiMethod
+using ArnoldiMethod: LM, SR, LR, partialschur, partialeigen
 using Random: AbstractRNG, shuffle
 import SparseArrays: sparse
 import Base: push!, popfirst!, isempty, getindex

diff --git a/src/graphcut/normalized_cut.jl b/src/graphcut/normalized_cut.jl
@@ -1,4 +1,3 @@
-using ArnoldiMethod
 # computes normalized cut cost for partition `cut`
 function _normalized_cut_cost(cut, W::AbstractMatrix, D)
     cut_cost = zero(eltype(W))

diff --git a/src/linalg/LinAlg.jl b/src/linalg/LinAlg.jl
@@ -1,10 +1,10 @@
 module LinAlg
 
-using ArnoldiMethod
+using ArnoldiMethod: LM, SR, LR, partialschur, partialeigen
 
 using SimpleTraits
 using SparseArrays: SparseMatrixCSC
-import SparseArrays: blockdiag, sparse
+import SparseArrays: blockdiag, sparse, spdiagm
 using LinearAlgebra: I, Symmetric, diagm, dot, eigen, eigvals, norm, rmul!, tril, triu
 import LinearAlgebra: Diagonal, diag, issymmetric, mul!
 

diff --git a/src/linalg/spectral.jl b/src/linalg/spectral.jl
@@ -1,8 +1,5 @@
 # This file provides reexported functions.
 
-using ArnoldiMethod
-using SparseArrays
-
 """
     adjacency_matrix(g[, T=Int; dir=:out])
 

diff --git a/src/shortestpaths/bellman-ford.jl b/src/shortestpaths/bellman-ford.jl
@@ -8,7 +8,6 @@
 #   The type that encapsulates the state of Bellman Ford algorithm
 #
 ###################################################################
-using Base.Threads
 
 struct NegativeCycleError <: Exception end
 

diff --git a/src/shortestpaths/spfa.jl b/src/shortestpaths/spfa.jl
@@ -6,8 +6,6 @@
 #
 ###################################################################
 
-using Base.Threads
-
 """
     spfa_shortest_paths(g, s, distmx=weights(g))
 

diff --git a/test/linalg/graphmatrices.jl b/test/linalg/graphmatrices.jl
@@ -1,5 +1,5 @@
 # export test_adjacency, test_laplacian, test_accessors, test_arithmetic, test_other
-using ArnoldiMethod
+using ArnoldiMethod: LM, SR, LR, partialschur, partialeigen
 
 @testset "Graph matrices" begin
 

diff --git a/test/linalg/spectral.jl b/test/linalg/spectral.jl
@@ -1,6 +1,6 @@
 import Base: Matrix
 import Base: size
-using ArnoldiMethod
+using ArnoldiMethod: LM, SR, LR, partialschur, partialeigen
 
 # using Graphs.LinAlg: eigs
 # just so that we can assert equality of matrices
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,6 @@ @@
     #
     ###################################################################
-    using Base.Threads
     """
         spfa_shortest_paths(g, s, distmx=weights(g))
@@ Expand Down @@