Splitting graph/utils.jl to include some functions only when necessary

Author: ilancoulon

src/GeometricFlux.jl

@@ -151,7 +151,6 @@ function __init__()
     end
     @require SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622" begin
         include("graph/weightedgraphs.jl")
-        include("graph/utils.jl")
     end
     @require MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5" begin
         include("graph/metagraphs.jl")

src/graph/simplegraphs.jl

@@ -1,4 +1,34 @@
-using LightGraphs: AbstractSimpleGraph, nv, adjacency_matrix, inneighbors, outneighbors, all_neighbors
+using LightGraphs: AbstractSimpleGraph, nv, inneighbors, outneighbors, all_neighbors
+import LightGraphs: adjacency_matrix
+
+## Utils for AbstractSimpleGraph
+
+function adjlist(g::AbstractSimpleGraph)
+    N = nv(g)
+    el = Vector{Int}[outneighbors(g, i) for i = 1:N]
+    return el
+end
+
+
+## Linear algebra API for AbstractSimpleGraph
+
+function degrees(sg::AbstractSimpleGraph, T::DataType=eltype(sg); dir::Symbol=:out)
+    degrees(adjacency_matrix(sg, T; dir=dir), T; dir=dir)
+end
+
+function degree_matrix(sg::AbstractSimpleGraph, T::DataType=eltype(sg); dir::Symbol=:out)
+    degree_matrix(adjacency_matrix(sg, T; dir=dir), T; dir=dir)
+end
+
+function inv_sqrt_degree_matrix(sg::AbstractSimpleGraph, T::DataType=eltype(sg); dir::Symbol=:out)
+    inv_sqrt_degree_matrix(adjacency_matrix(sg, T; dir=dir), T; dir=dir)
+end
+
+function laplacian_matrix(sg::AbstractSimpleGraph, T::DataType=eltype(sg); dir::Symbol=:out)
+    laplacian_matrix(adjacency_matrix(sg, T; dir=dir), T; dir=dir)
+end
+
+adjacency_matrix(sg::Base.RefValue{<:AbstractSimpleGraph}, T::DataType=eltype(sg)) = adjacency_matrix(sg[], T)
 
 ## Convolution layers accepting AbstractSimpleGraph
 

src/graph/utils.jl

@@ -1,4 +1,37 @@
-using SimpleWeightedGraphs: AbstractSimpleWeightedGraph, nv
+using SimpleWeightedGraphs: AbstractSimpleWeightedGraph, nv, outneighbors
+
+## Utils for AbstractSimpleWeightedGraph
+
+function adjlist(g::AbstractSimpleWeightedGraph)
+    N = nv(g)
+    el = Vector{Int}[outneighbors(g, i) for i = 1:N]
+    return el
+end
+
+## Linear algebra API for AbstractSimpleWeightedGraph
+
+function degrees(wg::AbstractSimpleWeightedGraph, T::DataType=eltype(wg); dir::Symbol=:out)
+    degrees(adjacency_matrix(wg, T; dir=dir), T; dir=dir)
+end
+
+function degree_matrix(wg::AbstractSimpleWeightedGraph, T::DataType=eltype(wg); dir::Symbol=:out)
+    degree_matrix(adjacency_matrix(wg, T; dir=dir), T; dir=dir)
+end
+
+function inv_sqrt_degree_matrix(wg::AbstractSimpleWeightedGraph, T::DataType=eltype(wg); dir::Symbol=:out)
+    inv_sqrt_degree_matrix(adjacency_matrix(wg, T; dir=dir), T; dir=dir)
+end
+
+function laplacian_matrix(wg::AbstractSimpleWeightedGraph, T::DataType=eltype(wg); dir::Symbol=:out)
+    laplacian_matrix(adjacency_matrix(wg, T; dir=dir), T; dir=dir)
+end
+
+function normalized_laplacian(wg::AbstractSimpleWeightedGraph, T::DataType=eltype(wg); selfloop::Bool=false)
+    adj = adjacency_matrix(wg, T)
+    selfloop && (adj += I)
+    normalized_laplacian(adj, T)
+end
+
 
 ## Convolution layers accepting AbstractSimpleWeightedGraph