move mldatasets2gnngraph

CarloLucibello · CarloLucibello · commit 335cabf4f06a · 2024-07-25T18:12:05.000+02:00
diff --git a/GNNGraphs/Project.toml b/GNNGraphs/Project.toml
@@ -1,7 +1,7 @@
 name = "GNNGraphs"
 uuid = "aed8fd31-079b-4b5a-b342-a13352159b8c"
 authors = ["Carlo Lucibello and contributors"]
-version = "1.0.1"
+version = "1.1.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
diff --git a/GNNGraphs/src/GNNGraphs.jl b/GNNGraphs/src/GNNGraphs.jl
@@ -108,4 +108,7 @@ export sort_edge_index, color_refinement
 include("gatherscatter.jl")
 # _gather, _scatter
 
+include("mldatasets.jl")
+export mldataset2gnngraph
+
 end #module
diff --git a/GNNGraphs/src/mldatasets.jl b/GNNGraphs/src/mldatasets.jl
diff --git a/GNNGraphs/test/mldatasets.jl b/GNNGraphs/test/mldatasets.jl
diff --git a/GNNGraphs/test/runtests.jl b/GNNGraphs/test/runtests.jl
@@ -36,6 +36,7 @@ tests = [
     "sampling",
     "gnnheterograph",
     "temporalsnapshotsgnngraph",
+    "mldatasets",
     "ext/SimpleWeightedGraphs"
 ]
 
diff --git a/GNNlib/src/GNNlib.jl b/GNNlib/src/GNNlib.jl
@@ -31,9 +31,7 @@ export
       xi_sub_xj,
       xj_sub_xi,
       e_mul_xj,
-      w_mul_xj,
-      # mldatasets
-      mldataset2gnngraph
+      w_mul_xj
 
 ## The following methods are defined but not exported
 
@@ -78,7 +76,6 @@ include("layers/conv.jl")
 include("layers/temporalconv.jl")
 include("layers/pool.jl")
 include("msgpass.jl")
-include("mldatasets.jl")
 
 end #module
  
diff --git a/Project.toml b/Project.toml
@@ -48,11 +48,10 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 InlineStrings = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
-MLDatasets = "eb30cadb-4394-5ae3-aed4-317e484a6458"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
 
 [targets]
-test = ["Test", "Adapt", "DataFrames", "InlineStrings", "SparseArrays", "Graphs", "Zygote", "FiniteDifferences", "ChainRulesTestUtils", "MLDatasets", "CUDA", "cuDNN"]
+test = ["Test", "Adapt", "DataFrames", "InlineStrings", "SparseArrays", "Graphs", "Zygote", "FiniteDifferences", "ChainRulesTestUtils", "CUDA", "cuDNN"]
diff --git a/src/GraphNeuralNetworks.jl b/src/GraphNeuralNetworks.jl
@@ -93,7 +93,6 @@ include("layers/heteroconv.jl")
 include("layers/temporalconv.jl")
 include("layers/pool.jl")
 include("msgpass.jl")
-include("mldatasets.jl")
 include("deprecations.jl")
 
 end
diff --git a/src/mldatasets.jl b/src/mldatasets.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -31,7 +31,6 @@ tests = [
     "layers/heteroconv",
     "layers/temporalconv",
     "layers/pool",
-    "mldatasets",
     "examples/node_classification_cora",
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ tests = [`
`36`	`36`	`"sampling",`
`37`	`37`	`"gnnheterograph",`
`38`	`38`	`"temporalsnapshotsgnngraph",`
	`39`	`+ "mldatasets",`
`39`	`40`	`"ext/SimpleWeightedGraphs"`
`40`	`41`	`]`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ tests = [`
`31`	`31`	`"layers/heteroconv",`
`32`	`32`	`"layers/temporalconv",`
`33`	`33`	`"layers/pool",`
`34`		`- "mldatasets",`
`35`	`34`	`"examples/node_classification_cora",`
`36`	`35`	`]`
`37`	`36`