Merge pull request #20 from CarloLucibello/cl/data

support multiple feature arrays in GNNGraph

Author: CarloLucibello

Project.toml

@@ -9,6 +9,7 @@ ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77"
+LearnBase = "7f8f8fb0-2700-5f03-b4bd-41f8cfc144b6"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
@@ -24,6 +25,7 @@ ChainRulesCore = "1"
 DataStructures = "0.18"
 Flux = "0.12"
 KrylovKit = "0.5"
+LearnBase = "0.5"
 LightGraphs = "1.3"
 MacroTools = "0.5"
 NNlib = "0.7"

docs/src/gnngraph.md

@@ -1,2 +1,8 @@
 # Graphs
 
+TODO
+
+```@docs
+GNNGraph
+```
+

docs/src/messagepassing.md

@@ -1,2 +1,7 @@
 # Message Passing
 
+TODO
+
+```@docs
+propagate
+```

perf/perf.jl

@@ -11,7 +11,7 @@ function run_single_benchmark(N, c, D, CONV; gtype=:lg)
     data = erdos_renyi(N, c / (N-1), seed=17)
     X = randn(Float32, D, N)
 
-    g = GNNGraph(data; nf=X, graph_type=gtype)
+    g = GNNGraph(data; ndata=X, graph_type=gtype)
     g_gpu = g |> gpu    
 
     m = CONV(D => D)

src/GraphNeuralNetworks.jl

@@ -1,8 +1,5 @@
 module GraphNeuralNetworks
 
-using Core: apply_type
-using NNlib: similar
-using LinearAlgebra: similar, fill!
 using Statistics: mean
 using LinearAlgebra
 using SparseArrays
@@ -12,17 +9,17 @@ using CUDA
 using Flux
 using Flux: glorot_uniform, leakyrelu, GRUCell, @functor
 using MacroTools: @forward
+using LearnBase: getobs
 using NNlib, NNlibCUDA
 using ChainRulesCore
 import LightGraphs
-using LightGraphs: AbstractGraph, outneighbors, inneighbors, is_directed, ne, nv, 
-                  adjacency_matrix, degree
+using LightGraphs: AbstractGraph, outneighbors, inneighbors, adjacency_matrix, degree
 
 export
     # gnngraph
     GNNGraph,
     edge_index,
-    node_feature, edge_feature, global_feature,
+    node_features, edge_features, global_features,
     adjacency_list, normalized_laplacian, scaled_laplacian,
     add_self_loops, remove_self_loops,
     subgraph,
@@ -52,7 +49,6 @@ export
     topk_index
 
 
-
 
 include("gnngraph.jl")
 include("graph_conversions.jl")