Skip to content

Commit 9212cde

Browse files
Reorder in alphabetical order for consistency (#157)
1 parent 098f071 commit 9212cde

File tree

5 files changed

+182
-183
lines changed

5 files changed

+182
-183
lines changed

docs/src/datasets/graphs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ MLDatasets.HeteroGraph
2323
CiteSeer
2424
Cora
2525
KarateClub
26+
MovieLens
2627
OGBDataset
2728
PolBlogs
2829
PubMed
2930
Reddit
3031
TUDataset
31-
MovieLens
3232
```

src/MLDatasets.jl

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,24 @@ export Titanic
7171

7272
## Vision
7373

74-
include("datasets/vision/emnist.jl")
75-
export EMNIST
76-
include("datasets/vision/mnist_reader/MNISTReader.jl")
77-
include("datasets/vision/mnist.jl")
78-
export MNIST
79-
include("datasets/vision/fashion_mnist.jl")
80-
export FashionMNIST
8174
include("datasets/vision/cifar10_reader/CIFAR10Reader.jl")
8275
include("datasets/vision/cifar10.jl")
8376
export CIFAR10
8477
include("datasets/vision/cifar100_reader/CIFAR100Reader.jl")
8578
include("datasets/vision/cifar100.jl")
8679
export CIFAR100
87-
include("datasets/vision/svhn2.jl")
88-
export SVHN2
80+
include("datasets/vision/emnist.jl")
81+
export EMNIST
82+
include("datasets/vision/fashion_mnist.jl")
83+
export FashionMNIST
84+
include("datasets/vision/mnist_reader/MNISTReader.jl")
85+
include("datasets/vision/mnist.jl")
86+
export MNIST
8987
include("datasets/vision/omniglot.jl")
9088
export Omniglot
89+
include("datasets/vision/svhn2.jl")
90+
export SVHN2
91+
9192

9293
## Text
9394

@@ -106,35 +107,35 @@ include("datasets/graphs/planetoid.jl")
106107
# export read_planetoid_data
107108
include("datasets/graphs/cora.jl")
108109
export Cora
109-
include("datasets/graphs/pubmed.jl")
110-
export PubMed
111110
include("datasets/graphs/citeseer.jl")
112111
export CiteSeer
113-
include("datasets/graphs/tudataset.jl")
114-
export TUDataset
112+
include("datasets/graphs/karateclub.jl")
113+
export KarateClub
114+
include("datasets/graphs/movielens.jl")
115+
export MovieLens
115116
include("datasets/graphs/ogbdataset.jl")
116117
export OGBDataset
117118
include("datasets/graphs/polblogs.jl")
118119
export PolBlogs
119-
include("datasets/graphs/karateclub.jl")
120-
export KarateClub
120+
include("datasets/graphs/pubmed.jl")
121+
export PubMed
121122
include("datasets/graphs/reddit.jl")
122123
export Reddit
123-
include("datasets/graphs/movielens.jl")
124-
export MovieLens
124+
include("datasets/graphs/tudataset.jl")
125+
export TUDataset
125126

126127
function __init__()
127128
# TODO automatically find and execute __init__xxx functions
128129

129130
# graph
130131
__init__citeseer()
131132
__init__cora()
133+
__init__movielens()
132134
__init__ogbdataset()
133135
__init__polblogs()
134136
__init__pubmed()
135137
__init__reddit()
136138
__init__tudataset()
137-
__init__movielens()
138139

139140
# misc
140141
__init__iris()

test/datasets/graphs.jl

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
11

2-
@testset "Cora" begin
3-
data = Cora()
4-
@test data isa AbstractDataset
5-
@test length(data) == 1
6-
g = data[1]
7-
@test g === data[:]
8-
@test g isa MLDatasets.Graph
9-
10-
@test g.num_nodes == 2708
11-
@test g.num_edges == 10556
12-
@test size(g.node_data.features) == (1433, g.num_nodes)
13-
@test size(g.node_data.targets) == (g.num_nodes,)
14-
@test sum(g.node_data.train_mask) == 140
15-
@test sum(g.node_data.val_mask) == 500
16-
@test sum(g.node_data.test_mask) == 1000
17-
@test g.edge_index isa Tuple{Vector{Int}, Vector{Int}}
18-
s, t = g.edge_index
19-
for a in (s, t)
20-
@test a isa Vector{Int}
21-
@test length(a) == g.num_edges
22-
@test minimum(a) == 1
23-
@test maximum(a) == g.num_nodes
24-
end
25-
end
26-
272
@testset "CiteSeer" begin
283
data = CiteSeer()
294
@test data isa AbstractDataset
@@ -49,19 +24,19 @@ end
4924
end
5025
end
5126

52-
@testset "PubMed" begin
53-
data = PubMed()
27+
@testset "Cora" begin
28+
data = Cora()
5429
@test data isa AbstractDataset
5530
@test length(data) == 1
5631
g = data[1]
5732
@test g === data[:]
5833
@test g isa MLDatasets.Graph
5934

60-
@test g.num_nodes == 19717
61-
@test g.num_edges == 88648
62-
@test size(g.node_data.features) == (500, g.num_nodes)
35+
@test g.num_nodes == 2708
36+
@test g.num_edges == 10556
37+
@test size(g.node_data.features) == (1433, g.num_nodes)
6338
@test size(g.node_data.targets) == (g.num_nodes,)
64-
@test sum(g.node_data.train_mask) == 60
39+
@test sum(g.node_data.train_mask) == 140
6540
@test sum(g.node_data.val_mask) == 500
6641
@test sum(g.node_data.test_mask) == 1000
6742
@test g.edge_index isa Tuple{Vector{Int}, Vector{Int}}
@@ -99,7 +74,6 @@ end
9974
end
10075
end
10176

102-
10377
@testset "PolBlogs" begin
10478
data = PolBlogs()
10579
@test data isa AbstractDataset
@@ -123,6 +97,31 @@ end
12397
end
12498
end
12599

100+
@testset "PubMed" begin
101+
data = PubMed()
102+
@test data isa AbstractDataset
103+
@test length(data) == 1
104+
g = data[1]
105+
@test g === data[:]
106+
@test g isa MLDatasets.Graph
107+
108+
@test g.num_nodes == 19717
109+
@test g.num_edges == 88648
110+
@test size(g.node_data.features) == (500, g.num_nodes)
111+
@test size(g.node_data.targets) == (g.num_nodes,)
112+
@test sum(g.node_data.train_mask) == 60
113+
@test sum(g.node_data.val_mask) == 500
114+
@test sum(g.node_data.test_mask) == 1000
115+
@test g.edge_index isa Tuple{Vector{Int}, Vector{Int}}
116+
s, t = g.edge_index
117+
for a in (s, t)
118+
@test a isa Vector{Int}
119+
@test length(a) == g.num_edges
120+
@test minimum(a) == 1
121+
@test maximum(a) == g.num_nodes
122+
end
123+
end
124+
126125
# maybe, maybe, maybe??
127126
Sys.iswindows() || @testset "OGBn-mag" begin
128127
data = OGBDataset("ogbn-mag")

0 commit comments

Comments
 (0)