Unverified Commit a6bd96aa authored by Chang Liu's avatar Chang Liu Committed by GitHub
Browse files

Fix example crashes due to DGL API update (#4194)


Co-authored-by: default avatarXin Yao <xiny@nvidia.com>
parent f7dae453
...@@ -45,7 +45,7 @@ def main(args): ...@@ -45,7 +45,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -21,6 +21,7 @@ def evaluate(model, features, labels, mask): ...@@ -21,6 +21,7 @@ def evaluate(model, features, labels, mask):
def main(args): def main(args):
# load and preprocess dataset # load and preprocess dataset
data = load_data(args) data = load_data(args)
g = data[0]
features = torch.FloatTensor(data.features) features = torch.FloatTensor(data.features)
labels = torch.LongTensor(data.labels) labels = torch.LongTensor(data.labels)
if hasattr(torch, 'BoolTensor'): if hasattr(torch, 'BoolTensor'):
...@@ -33,7 +34,7 @@ def main(args): ...@@ -33,7 +34,7 @@ def main(args):
test_mask = torch.ByteTensor(data.test_mask) test_mask = torch.ByteTensor(data.test_mask)
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
if args.gpu < 0: if args.gpu < 0:
cuda = False cuda = False
...@@ -46,13 +47,10 @@ def main(args): ...@@ -46,13 +47,10 @@ def main(args):
val_mask = val_mask.cuda() val_mask = val_mask.cuda()
test_mask = test_mask.cuda() test_mask = test_mask.cuda()
# graph preprocess
g = data.graph
# add self loop # add self loop
if args.self_loop: if args.self_loop:
g.remove_edges_from(nx.selfloop_edges(g)) g.remove_edges_from(nx.selfloop_edges(g))
g.add_edges_from(zip(g.nodes(), g.nodes())) g.add_edges_from(zip(g.nodes(), g.nodes()))
g = DGLGraph(g)
n_edges = g.number_of_edges() n_edges = g.number_of_edges()
if args.gpu >= 0: if args.gpu >= 0:
......
...@@ -62,7 +62,7 @@ def main(args): ...@@ -62,7 +62,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
num_feats = features.shape[1] num_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -48,7 +48,7 @@ def accuracy(logits, labels): ...@@ -48,7 +48,7 @@ def accuracy(logits, labels):
return correct.item() * 1.0 / len(labels) return correct.item() * 1.0 / len(labels)
def evaluate(model, g, features, labels, mask): def evaluate(g, model, features, labels, mask):
model.eval() model.eval()
with torch.no_grad(): with torch.no_grad():
logits = model(g, features) logits = model(g, features)
...@@ -82,7 +82,7 @@ def main(args): ...@@ -82,7 +82,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
num_feats = features.shape[1] num_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
...@@ -156,7 +156,7 @@ def main(args): ...@@ -156,7 +156,7 @@ def main(args):
print() print()
if args.early_stop: if args.early_stop:
model.load_state_dict(torch.load('es_checkpoint.pt')) model.load_state_dict(torch.load('es_checkpoint.pt'))
acc = evaluate(model, features, labels, test_mask) acc = evaluate(g, model, features, labels, test_mask)
print("Test Accuracy {:.4f}".format(acc)) print("Test Accuracy {:.4f}".format(acc))
......
...@@ -140,7 +140,7 @@ def main(args): ...@@ -140,7 +140,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -47,7 +47,7 @@ def main(args): ...@@ -47,7 +47,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -70,7 +70,7 @@ def main(args): ...@@ -70,7 +70,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_classes n_classes = data.num_classes
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -60,7 +60,7 @@ def main(args): ...@@ -60,7 +60,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
num_feats = features.shape[1] num_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -57,7 +57,7 @@ def main(args): ...@@ -57,7 +57,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -78,7 +78,7 @@ def main(args): ...@@ -78,7 +78,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -51,7 +51,7 @@ def main(args): ...@@ -51,7 +51,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
...@@ -31,7 +31,7 @@ def main(args): ...@@ -31,7 +31,7 @@ def main(args):
# load and preprocess dataset # load and preprocess dataset
args.dataset = "reddit-self-loop" args.dataset = "reddit-self-loop"
data = load_data(args) data = load_data(args)
g = data.graph g = data[0]
if args.gpu < 0: if args.gpu < 0:
cuda = False cuda = False
else: else:
...@@ -45,7 +45,7 @@ def main(args): ...@@ -45,7 +45,7 @@ def main(args):
test_mask = g.ndata['test_mask'] test_mask = g.ndata['test_mask']
in_feats = features.shape[1] in_feats = features.shape[1]
n_classes = data.num_labels n_classes = data.num_labels
n_edges = data.graph.number_of_edges() n_edges = g.number_of_edges()
print("""----Data statistics------' print("""----Data statistics------'
#Edges %d #Edges %d
#Classes %d #Classes %d
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment