differentiable adjacency_matrix for dense

Author: CarloLucibello

src/GNNGraphs/convert.jl

@@ -120,11 +120,14 @@ function to_dense(coo::COO_T, T=nothing; dir=:out, num_nodes=nothing, weighted=t
     if !weighted
         val = T(1)
     end
-    A = fill!(similar(s, T, (n, n)), 0)
-    v = vec(A) # vec view of A
     idxs = s .+ n .* (t .- 1) 
+    
+    ## using scatter instead of indexing since there could be multiple edges
+    # A = fill!(similar(s, T, (n, n)), 0)
+    # v = vec(A) # vec view of A
     # A[idxs] .= val # exploiting linear indexing
-    NNlib.scatter!(+, v, val, idxs) # using scatter instead of indexing since there could be multiple edges 
+    v = NNlib.scatter(+, val, idxs, dstsize=n^2) 
+    A = reshape(v, (n, n))
     return A, n, length(s)
 end
 

src/GNNGraphs/query.jl

@@ -413,13 +413,11 @@ function has_multi_edges(g::GNNGraph)
     length(union(idxs)) < length(idxs)
 end
 
-
 @non_differentiable adjacency_list(x...)
-@non_differentiable adjacency_matrix(g::GNNGraph{<:ADJMAT_T}) # TODO remove this in the future
 @non_differentiable graph_indicator(x...)
 @non_differentiable has_multi_edges(x...)
 @non_differentiable Graphs.has_self_loops(x...) 
 @non_differentiable is_bidirected(x...)
 @non_differentiable normalized_adjacency(x...) # TODO remove this in the future
 @non_differentiable normalized_laplacian(x...) # TODO remove this in the future
-@non_differentiable scaled_laplacian(x...)
+@non_differentiable scaled_laplacian(x...) # TODO remove this in the future

test/runtests.jl

@@ -40,10 +40,12 @@ tests = [
 
 !CUDA.functional() && @warn("CUDA unavailable, not testing GPU support")
 
-@testset "GraphNeuralNetworks: graph format $graph_type" for graph_type in (:coo, :dense, :sparse) 
+@testset "GraphNeuralNetworks: graph format $graph_type" for graph_type in (:dense, :coo, :sparse) 
     global GRAPH_T = graph_type
-    global TEST_GPU = CUDA.functional() && (GRAPH_T != :sparse)
-    
+    # global TEST_GPU = CUDA.functional() && (GRAPH_T != :sparse)
+    global TEST_GPU = false
+
+
     for t in tests
         startswith(t, "examples") && GRAPH_T == :dense && continue     # not testing :dense since causes OutOfMememory on github's CI
         include("$t.jl")