fix GNN

Author: CarloLucibello

GNNGraphs/test/Project.toml

@@ -2,7 +2,6 @@
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 GNNGraphs = "aed8fd31-079b-4b5a-b342-a13352159b8c"
-GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
@@ -21,5 +20,3 @@ TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
-[compat]
-GPUArraysCore = "0.1"

GNNlib/src/GNNlib.jl

@@ -63,9 +63,9 @@ export agnn_conv,
 include("layers/temporalconv.jl")
 export a3tgcn_conv,
        dcgrucell_frwd,
-       evolvegcnocell_frwd
-       gconv_grucell_frwd,
-       gconv_lstmcell_frwd,
+       evolvegcnocell_frwd,
+       gconvgrucell_frwd,
+       gconvlstmcell_frwd,
        tgcn_frwd
 
 include("layers/pool.jl")

GNNlib/test/Project.toml

@@ -4,7 +4,6 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 GNNGraphs = "aed8fd31-079b-4b5a-b342-a13352159b8c"
 GNNlib = "a6a84749-d869-43f8-aacc-be26a1996e48"
-GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
 MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
@@ -19,4 +18,3 @@ TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-GPUArraysCore = "0.1"

GraphNeuralNetworks/src/layers/temporalconv.jl

@@ -244,7 +244,7 @@ function (cell::GConvGRUCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractVector)
 end
 
 function (cell::GConvGRUCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractMatrix)
-    return gconvgrucell_frwd(cell, g, x, h)
+    return GNNlib.gconvgrucell_frwd(cell, g, x, h)
 end
 
 function Base.show(io::IO, cell::GConvGRUCell)
@@ -415,7 +415,7 @@ function (cell::GConvLSTMCell)(g::GNNGraph, x::AbstractMatrix, (h, c))
         c = repeat(c, 1, g.num_nodes)
     end
     @assert ndims(h) == 2 && ndims(c) == 2
-    gconvlstmcell_frwd(cell, g, x, (h, c))
+    return GNNlib.gconvlstmcell_frwd(cell, g, x, (h, c))
 end
 
 function Base.show(io::IO, cell::GConvLSTMCell)
@@ -544,7 +544,7 @@ function (cell::DCGRUCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractVector)
 end
 
 function (cell::DCGRUCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractMatrix)
-    return dcgrucell_frwd(cell, g, x, h)
+    return GNNlib.dcgrucell_frwd(cell, g, x, h)
 end
 
 function Base.show(io::IO, cell::DCGRUCell)
@@ -672,7 +672,7 @@ end
 (cell::EvolveGCNOCell)(g::GNNGraph, x::AbstractMatrix) = cell(g, x, initialstates(cell))
 
 function (cell::EvolveGCNOCell)(g::GNNGraph, x::AbstractMatrix, state)
-    return evolvegcno_frwd(cell, g, x, state.weight, state.lstm)
+    return GNNlib.evolvegcnocell_frwd(cell, g, x, state)
 end
 
 function Base.show(io::IO, egcno::EvolveGCNOCell)
@@ -815,7 +815,7 @@ function (cell::TGCNCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractVector)
 end
 
 function (cell::TGCNCell)(g::GNNGraph, x::AbstractMatrix, h::AbstractMatrix)
-    return tgcncell_frwd(cell, g, x, h)
+    return GNNlib.tgcncell_frwd(cell, g, x, h)
 end
 
 function Base.show(io::IO, cell::TGCNCell)

GraphNeuralNetworks/test/Project.toml

@@ -5,7 +5,6 @@ Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
 Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 GNNGraphs = "aed8fd31-079b-4b5a-b342-a13352159b8c"
 GNNlib = "a6a84749-d869-43f8-aacc-be26a1996e48"
-GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
 GraphNeuralNetworks = "cffab07f-9bc2-4db1-8861-388f63bf7694"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
@@ -18,4 +17,3 @@ TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-GPUArraysCore = "0.1"