Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix num_labels to num_classes in dataset files #6666

Merged
merged 1 commit into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/mxnet/appnp/appnp.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/gat/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def main(args):
test_mask = g.ndata["test_mask"]
test_mask = mx.nd.array(np.nonzero(test_mask.asnumpy())[0], ctx=ctx)
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()

g = dgl.remove_self_loop(g)
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/gcn/gcn_concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/gcn/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/graphsage/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/monet/citation.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/sgc/sgc.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/mxnet/tagcn/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/dimenet/qm9.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class QM9(QM9Dataset):
Examples
--------
>>> data = QM9Dataset(label_keys=['mu', 'gap'], cutoff=5.0)
>>> data.num_labels
>>> data.num_classes
2
>>>
>>> # iterate over the dataset
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/gat/train_ppi.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def train(train_dataloader, val_dataloader, device, model):

# create GAT model
in_size = features.shape[1]
out_size = train_dataset.num_labels
out_size = train_dataset.num_classes
model = GAT(in_size, 256, out_size, heads=[4, 4, 6]).to(device)

# model training
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/geniepath/ppi.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def main(args):
else:
device = "cpu"

num_classes = train_dataset.num_labels
num_classes = train_dataset.num_classes

# Extract node features
graph = train_dataset[0]
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/sgc/sgc.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.num_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/sgc/sgc_reddit.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.num_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/sign/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def load_dataset(name):

data = CitationGraphDataset("cora")
g = data[0]
n_classes = data.num_labels
n_classes = data.num_classes
train_mask = g.ndata["train_mask"]
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
Expand Down
2 changes: 1 addition & 1 deletion examples/pytorch/tagcn/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.num_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow/dgi/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.number_of_edges()

# add self loop
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow/gat/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
num_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow/gcn/gcn_builtin.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow/gcn/gcn_mp.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = data.graph.number_of_edges()
print(
"""----Data statistics------'
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow/gcn/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def main(args):
val_mask = g.ndata["val_mask"]
test_mask = g.ndata["test_mask"]
in_feats = features.shape[1]
n_classes = data.num_labels
n_classes = data.num_classes
n_edges = g.number_of_edges()
print(
"""----Data statistics------'
Expand Down
6 changes: 5 additions & 1 deletion python/dgl/data/ppi.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class PPIDataset(DGLBuiltinDataset):
Examples
--------
>>> dataset = PPIDataset(mode='valid')
>>> num_labels = dataset.num_labels
>>> num_classes = dataset.num_classes
>>> for g in dataset:
.... feat = g.ndata['feat']
.... label = g.ndata['label']
Expand Down Expand Up @@ -173,6 +173,10 @@ def load(self):
def num_labels(self):
return 121

@property
def num_classes(self):
return 121

def __len__(self):
"""Return number of samples in this dataset."""
return len(self.graphs)
Expand Down
5 changes: 5 additions & 0 deletions python/dgl/data/qm7b.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ def num_labels(self):
"""Number of prediction tasks."""
return 14

@property
def num_classes(self):
"""Number of prediction tasks."""
return 14

def __getitem__(self, idx):
r"""Get graph and label by index
Expand Down
10 changes: 10 additions & 0 deletions python/dgl/data/qm9.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,16 @@ def num_labels(self):
"""
return self.label.shape[1]

@property
def num_classes(self):
r"""
Returns
--------
int
Number of prediction tasks.
"""
return self.label.shape[1]

@property
def num_tasks(self):
r"""
Expand Down