Merge pull request #333 from FluxML/compact

Support GraphSignals to 0.7

Author: yuehhua

Project.toml

@@ -31,7 +31,7 @@ DataStructures = "0.18"
 FillArrays = "0.13"
 Flux = "0.12 - 0.13"
 GraphMLDatasets = "0.1"
-GraphSignals = "0.6"
+GraphSignals = "0.7"
 Graphs = "1"
 NNlib = "0.8"
 NNlibCUDA = "0.2"

test/layers/gn.jl

@@ -21,19 +21,17 @@
     @testset "without aggregation" begin
         function (l::NewGNLayer)(fg::AbstractFeaturedGraph)
             nf = node_feature(fg)
-            ef = edge_feature(fg)
             GraphSignals.check_num_nodes(fg, nf)
-            GraphSignals.check_num_edges(fg, ef)
-            return GeometricFlux.propagate(l, graph(fg), ef, nf, global_feature(fg), nothing, nothing, nothing)
+            return GeometricFlux.propagate(l, graph(fg), nothing, nf, nothing, nothing, nothing, nothing)
         end
 
         fg = FeaturedGraph(adj, nf=nf)
         l = NewGNLayer()
         ef_, nf_, gf_ = l(fg)
 
         @test nf_ == nf
-        @test size(ef_) == (0, 2E)
-        @test size(gf_) == (0,)
+        @test isnothing(ef_)
+        @test isnothing(gf_)
     end
 
     @testset "with neighbor aggregation" begin
@@ -42,16 +40,16 @@
             ef = edge_feature(fg)
             GraphSignals.check_num_nodes(fg, nf)
             GraphSignals.check_num_edges(fg, ef)
-            return GeometricFlux.propagate(l, graph(fg), ef, nf, global_feature(fg), +, nothing, nothing)
+            return GeometricFlux.propagate(l, graph(fg), ef, nf, nothing, +, nothing, nothing)
         end
 
         fg = FeaturedGraph(adj, nf=nf, ef=ef, gf=zeros(0))
         l = NewGNLayer()
         ef_, nf_, gf_ = l(fg)
 
         @test size(nf_) == (in_channel, V)
-        @test size(ef_) == (0, 2E)
-        @test size(gf_) == (0,)
+        @test size(ef_) == (in_channel, 2E)
+        @test isnothing(gf_)
     end
 
     GeometricFlux.update_edge(l::NewGNLayer, e, vi, vj, u) = similar(e, out_channel, size(e)[2:end]...)
@@ -61,7 +59,7 @@
             ef = edge_feature(fg)
             GraphSignals.check_num_nodes(fg, nf)
             GraphSignals.check_num_edges(fg, ef)
-            return GeometricFlux.propagate(l, graph(fg), ef, nf, global_feature(fg), +, nothing, nothing)
+            return GeometricFlux.propagate(l, graph(fg), ef, nf, nothing, +, nothing, nothing)
         end
 
         fg = FeaturedGraph(adj, nf=nf, ef=ef, gf=zeros(0))
@@ -70,17 +68,18 @@
 
         @test size(nf_) == (in_channel, V)
         @test size(ef_) == (out_channel, 2E)
-        @test size(gf_) == (0,)
+        @test isnothing(gf_)
     end
 
     GeometricFlux.update_vertex(l::NewGNLayer, ē, vi, u) = similar(vi, out_channel, size(vi)[2:end]...)
     @testset "update edge/vertex with all aggregation" begin
         function (l::NewGNLayer)(fg::AbstractFeaturedGraph)
             nf = node_feature(fg)
             ef = edge_feature(fg)
+            gf = global_feature(fg)
             GraphSignals.check_num_nodes(fg, nf)
             GraphSignals.check_num_edges(fg, ef)
-            return GeometricFlux.propagate(l, graph(fg), ef, nf, global_feature(fg), +, +, +)
+            return GeometricFlux.propagate(l, graph(fg), ef, nf, gf, +, +, +)
         end
 
         fg = FeaturedGraph(adj, nf=nf, ef=ef, gf=gf)

test/layers/msgpass.jl

@@ -37,7 +37,7 @@
         @test GraphSignals.adjacency_matrix(fg_) == adj
         @test size(node_feature(fg_)) == (in_channel, num_V)
         @test size(edge_feature(fg_)) == (0, num_E)
-        @test size(global_feature(fg_)) == (0,)
+        @test !has_global_feature(fg_)
     end
 
     GeometricFlux.message(l::NewLayer, x_i, x_j::AbstractMatrix, e_ij) = l.weight * x_j
@@ -47,7 +47,7 @@
         @test GraphSignals.adjacency_matrix(fg_) == adj
         @test size(node_feature(fg_)) == (out_channel, num_V)
         @test size(edge_feature(fg_)) == (0, num_E)
-        @test size(global_feature(fg_)) == (0,)
+        @test !has_global_feature(fg_)
     end
 
     GeometricFlux.update(l::NewLayer, m::AbstractMatrix, x) = l.weight * x + m
@@ -57,6 +57,6 @@
         @test GraphSignals.adjacency_matrix(fg_) == adj
         @test size(node_feature(fg_)) == (out_channel, num_V)
         @test size(edge_feature(fg_)) == (0, num_E)
-        @test size(global_feature(fg_)) == (0,)
+        @test !has_global_feature(fg_)
     end
 end