Merge pull request #45 from ilancoulon/ic/fix-gat-example

Try to fix GAT example by split utility dependency for SimpleGraph and SimpleWeightedGraphs

Author: yuehhua

src/GeometricFlux.jl

@@ -94,7 +94,7 @@ export
     feature,
     nv,
 
-    # graph/utils
+    # graph/simplegraphs
     adjlist,
 
     # utils
@@ -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,10 @@
-using LightGraphs: AbstractSimpleGraph, nv, adjacency_matrix, inneighbors, outneighbors, all_neighbors
+using LightGraphs: AbstractSimpleGraph, nv, adjacency_matrix, inneighbors, outneighbors,
+                   all_neighbors
+
+function adjlist(g::AbstractSimpleGraph)
+    N = nv(g)
+    Vector{Int}[outneighbors(g, i) for i = 1:N]
+end
 
 ## Convolution layers accepting AbstractSimpleGraph
 

src/graph/utils.jl

@@ -1,4 +1,9 @@
-using SimpleWeightedGraphs: AbstractSimpleWeightedGraph, nv
+using SimpleWeightedGraphs: AbstractSimpleWeightedGraph, nv, outneighbors
+
+function adjlist(g::AbstractSimpleWeightedGraph)
+    N = nv(g)
+    Vector{Int}[outneighbors(g, i) for i = 1:N]
+end
 
 ## Convolution layers accepting AbstractSimpleWeightedGraph
 

src/graph/weightedgraphs.jl

@@ -30,8 +30,19 @@ ug = SimpleGraph(6)
 add_edge!(ug, 1, 2); add_edge!(ug, 1, 3); add_edge!(ug, 2, 3)
 add_edge!(ug, 3, 4); add_edge!(ug, 2, 5); add_edge!(ug, 3, 6)
 
+dg = SimpleDiGraph(6)
+add_edge!(dg, 1, 3); add_edge!(dg, 2, 3); add_edge!(dg, 1, 6)
+add_edge!(dg, 2, 5); add_edge!(dg, 3, 4); add_edge!(dg, 3, 5)
+
+el_ug = Vector{Int64}[[2, 3], [1, 3, 5], [1, 2, 4, 6], [3], [2], [3]]
+el_dg = Vector{Int64}[[3, 6], [3, 5], [4, 5], [], [], []]
 
 @testset "simplegraphs" begin
+    @testset "adjlist" begin
+        @test adjlist(ug) == el_ug
+        @test adjlist(dg) == el_dg
+    end
+
     @testset "linalg" begin
         for T in [Int8, Int16, Int32, Int64, Int128]
             @test degree_matrix(adj, T, dir=:out) == T.(deg)

test/graph/simplegraphs.jl

@@ -30,8 +30,19 @@ ug = SimpleWeightedGraph(6)
 add_edge!(ug, 1, 2, 2); add_edge!(ug, 1, 3, 2); add_edge!(ug, 2, 3, 1)
 add_edge!(ug, 3, 4, 5); add_edge!(ug, 2, 5, 2); add_edge!(ug, 3, 6, 2)
 
+dg = SimpleWeightedDiGraph(6)
+add_edge!(dg, 1, 3, 2); add_edge!(dg, 2, 3, 2); add_edge!(dg, 1, 6, 1)
+add_edge!(dg, 2, 5, -2); add_edge!(dg, 3, 4, -2); add_edge!(dg, 3, 5, -1)
+
+el_ug = Vector{Int64}[[2, 3], [1, 3, 5], [1, 2, 4, 6], [3], [2], [3]]
+el_dg = Vector{Int64}[[3, 6], [3, 5], [4, 5], [], [], []]
 
 @testset "weightedgraphs" begin
+    @testset "adjlist" begin
+        @test adjlist(ug) == el_ug
+        @test adjlist(dg) == el_dg
+    end
+
     @testset "linalg" begin
         for T in [Int8, Int16, Int32, Int64, Int128]
             @test degree_matrix(adj, T, dir=:out) == T.(deg)

test/graph/utils.jl

@@ -41,7 +41,6 @@ tests = [
     "graph/simplegraphs",
     "graph/weightedgraphs",
     "graph/metagraphs",
-    "graph/utils",
     "utils",
 ]