dmlc--dgl
44089c8b4d
* Merge * [Graph][CUDA] Graph on GPU and many refactoring (#1791) * change edge_ids behavior and C++ impl * fix unittests; remove utils.Index in edge_id * pass mx and th tests * pass tf test * add aten::Scatter_ * Add nonzero; impl CSRGetDataAndIndices/CSRSliceMatrix * CSRGetData and CSRGetDataAndIndices passed tests * CSRSliceMatrix basic tests * fix bug in empty slice * CUDA CSRHasDuplicate * has_node; has_edge_between * predecessors, successors * deprecate send/recv; fix send_and_recv * deprecate send/recv; fix send_and_recv * in_edges; out_edges; all_edges; apply_edges * in deg/out deg * subgraph/edge_subgraph * adj * in_subgraph/out_subgraph * sample neighbors * set/get_n/e_repr * wip: working on refactoring all idtypes * pass ndata/edata tests on gpu * fix * stash * workaround nonzero issue * stash * nx conversion * test_hetero_basics except update routines * test_update_routines * test_hetero_basics for pytorch * more fixes * WIP: flatten graph * wip: flatten * test_flatten * test_to_device * fix bug in to_homo * fix bug in CSRSliceMatrix * pass subgraph test * fix send_and_recv * fix filter * test_heterograph * passed all pytorch tests * fix mx unittest * fix pytorch test_nn * fix all unittests for PyTorch * passed all mxnet tests * lint * fix tf nn test * pass all tf tests * lint * lint * change deprecation * try fix compile * lint * update METIDS * fix utest * fix * fix utests * try debug * revert * small fix * fix utests * upd * upd * upd * fix * upd * upd * upd * upd * upd * trigger * +1s * [kernel] Use heterograph index instead of unitgraph index (#1813) * upd * upd * upd * fix * upd * upd * upd * upd * upd * trigger * +1s * [Graph] Mutation for Heterograph (#1818) * mutation add_nodes and add_edges * Add support for remove_edges, remove_nodes, add_selfloop, remove_selfloop * Fix Co-authored-by: Ubuntu <ubuntu@ip-172-31-51-214.ec2.internal> * upd * upd * upd * fix * [Transfom] Mutable transform (#1833) * add nodesy * All three * Fix * lint * Add some test case * Fix * Fix * Fix * Fix * Fix * Fix * fix * triger * Fix * fix Co-authored-by: Ubuntu <ubuntu@ip-172-31-51-214.ec2.internal> * [Graph] Migrate Batch & Readout module to heterograph (#1836) * dgl.batch * unbatch * fix to device * reduce readout; segment reduce * change batch_num_nodes|edges to function * reduce readout/ softmax * broadcast * topk * fix * fix tf and mx * fix some ci * fix batch but unbatch differently * new checkk * upd * upd * upd * idtype behavior; code reorg * idtype behavior; code reorg * wip: test_basics * pass test_basics * WIP: from nx/ to nx * missing files * upd * pass test_basics:test_nx_conversion * Fix test * Fix inplace update * WIP: fixing tests * upd * pass test_transform cpu * pass gpu test_transform * pass test_batched_graph * GPU graph auto cast to int32 * missing file * stash * WIP: rgcn-hetero * Fix two datasety * upd * weird * Fix capsuley * fuck you * fuck matthias * Fix dgmg * fix bug in block degrees; pass rgcn-hetero * rgcn * gat and diffpool fix also fix ppi and tu dataset * Tree LSTM * pointcloud * rrn; wip: sgc * resolve conflicts * upd * sgc and reddit dataset * upd * Fix deepwalk, gindt and gcn * fix datasets and sign * optimization * optimization * upd * upd * Fix GIN * fix bug in add_nodes add_edges; tagcn * adaptive sampling and gcmc * upd * upd * fix geometric * fix * metapath2vec * fix agnn * fix pickling problem of block * fix utests * miss file * linegraph * upd * upd * upd * graphsage * stgcn_wave * fix hgt * on unittests * Fix transformer * Fix HAN * passed pytorch unittests * lint * fix * Fix cluster gcn * cluster-gcn is ready * on fixing block related codes * 2nd order derivative * Revert "2nd order derivative" This reverts commit 523bf6c249bee61b51b1ad1babf42aad4167f206. * passed torch utests again * fix all mxnet unittests * delete some useless tests * pass all tf cpu tests * disable * disable distributed unittest * fix * fix * lint * fix * fix * fix script * fix tutorial * fix apply edges bug * fix 2 basics * fix tutorial Co-authored-by: yzh119 <expye@outlook.com> Co-authored-by: xiang song(charlie.song) <classicxsong@gmail.com> Co-authored-by: Ubuntu <ubuntu@ip-172-31-51-214.ec2.internal> Co-authored-by: Ubuntu <ubuntu@ip-172-31-7-42.us-west-2.compute.internal> Co-authored-by: Ubuntu <ubuntu@ip-172-31-1-5.us-west-2.compute.internal> Co-authored-by: Ubuntu <ubuntu@ip-172-31-68-185.ec2.internal>
212 行
5.6 KiB
Python
212 行
5.6 KiB
Python
import os
|
|
import backend as F
|
|
import networkx as nx
|
|
import numpy as np
|
|
import dgl
|
|
from test_utils import parametrize_dtype
|
|
|
|
@parametrize_dtype
|
|
def test_node_removal(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(10)
|
|
g.add_edge(0, 0)
|
|
assert g.number_of_nodes() == 10
|
|
g.ndata['id'] = F.arange(0, 10)
|
|
|
|
# remove nodes
|
|
g.remove_nodes(range(4, 7))
|
|
assert g.number_of_nodes() == 7
|
|
assert F.array_equal(g.ndata['id'], F.tensor([0, 1, 2, 3, 7, 8, 9]))
|
|
|
|
# add nodes
|
|
g.add_nodes(3)
|
|
assert g.number_of_nodes() == 10
|
|
assert F.array_equal(g.ndata['id'], F.tensor([0, 1, 2, 3, 7, 8, 9, 0, 0, 0]))
|
|
|
|
# remove nodes
|
|
g.remove_nodes(range(1, 4))
|
|
assert g.number_of_nodes() == 7
|
|
assert F.array_equal(g.ndata['id'], F.tensor([0, 7, 8, 9, 0, 0, 0]))
|
|
|
|
@parametrize_dtype
|
|
def test_multigraph_node_removal(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(5)
|
|
for i in range(5):
|
|
g.add_edge(i, i)
|
|
g.add_edge(i, i)
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 10
|
|
|
|
# remove nodes
|
|
g.remove_nodes([2, 3])
|
|
assert g.number_of_nodes() == 3
|
|
assert g.number_of_edges() == 6
|
|
|
|
# add nodes
|
|
g.add_nodes(1)
|
|
g.add_edge(1, 1)
|
|
g.add_edge(1, 1)
|
|
assert g.number_of_nodes() == 4
|
|
assert g.number_of_edges() == 8
|
|
|
|
# remove nodes
|
|
g.remove_nodes([0])
|
|
assert g.number_of_nodes() == 3
|
|
assert g.number_of_edges() == 6
|
|
|
|
@parametrize_dtype
|
|
def test_multigraph_edge_removal(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(5)
|
|
for i in range(5):
|
|
g.add_edge(i, i)
|
|
g.add_edge(i, i)
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 10
|
|
|
|
# remove edges
|
|
g.remove_edges([2, 3])
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 8
|
|
|
|
# add edges
|
|
g.add_edge(1, 1)
|
|
g.add_edge(1, 1)
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 10
|
|
|
|
# remove edges
|
|
g.remove_edges([0, 1])
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 8
|
|
|
|
@parametrize_dtype
|
|
def test_edge_removal(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(5)
|
|
for i in range(5):
|
|
for j in range(5):
|
|
g.add_edge(i, j)
|
|
g.edata['id'] = F.arange(0, 25)
|
|
|
|
# remove edges
|
|
g.remove_edges(range(13, 20))
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 18
|
|
assert F.array_equal(g.edata['id'], F.tensor(list(range(13)) + list(range(20, 25))))
|
|
|
|
# add edges
|
|
g.add_edge(3, 3)
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 19
|
|
assert F.array_equal(g.edata['id'], F.tensor(list(range(13)) + list(range(20, 25)) + [0]))
|
|
|
|
# remove edges
|
|
g.remove_edges(range(2, 10))
|
|
assert g.number_of_nodes() == 5
|
|
assert g.number_of_edges() == 11
|
|
assert F.array_equal(g.edata['id'], F.tensor([0, 1, 10, 11, 12, 20, 21, 22, 23, 24, 0]))
|
|
|
|
@parametrize_dtype
|
|
def test_node_and_edge_removal(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(10)
|
|
for i in range(10):
|
|
for j in range(10):
|
|
g.add_edge(i, j)
|
|
g.edata['id'] = F.arange(0, 100)
|
|
assert g.number_of_nodes() == 10
|
|
assert g.number_of_edges() == 100
|
|
|
|
# remove nodes
|
|
g.remove_nodes([2, 4])
|
|
assert g.number_of_nodes() == 8
|
|
assert g.number_of_edges() == 64
|
|
|
|
# remove edges
|
|
g.remove_edges(range(10, 20))
|
|
assert g.number_of_nodes() == 8
|
|
assert g.number_of_edges() == 54
|
|
|
|
# add nodes
|
|
g.add_nodes(2)
|
|
assert g.number_of_nodes() == 10
|
|
assert g.number_of_edges() == 54
|
|
|
|
# add edges
|
|
for i in range(8, 10):
|
|
for j in range(8, 10):
|
|
g.add_edge(i, j)
|
|
assert g.number_of_nodes() == 10
|
|
assert g.number_of_edges() == 58
|
|
|
|
# remove edges
|
|
g.remove_edges(range(10, 20))
|
|
assert g.number_of_nodes() == 10
|
|
assert g.number_of_edges() == 48
|
|
|
|
@parametrize_dtype
|
|
def test_node_frame(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(10)
|
|
data = np.random.rand(10, 3)
|
|
new_data = data.take([0, 1, 2, 7, 8, 9], axis=0)
|
|
g.ndata['h'] = F.tensor(data)
|
|
|
|
# remove nodes
|
|
g.remove_nodes(range(3, 7))
|
|
assert F.allclose(g.ndata['h'], F.tensor(new_data))
|
|
|
|
@parametrize_dtype
|
|
def test_edge_frame(idtype):
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(10)
|
|
g.add_edges(list(range(10)), list(range(1, 10)) + [0])
|
|
data = np.random.rand(10, 3)
|
|
new_data = data.take([0, 1, 2, 7, 8, 9], axis=0)
|
|
g.edata['h'] = F.tensor(data)
|
|
|
|
# remove edges
|
|
g.remove_edges(range(3, 7))
|
|
assert F.allclose(g.edata['h'], F.tensor(new_data))
|
|
|
|
@parametrize_dtype
|
|
def test_issue1287(idtype):
|
|
# reproduce https://github.com/dmlc/dgl/issues/1287.
|
|
# setting features after remove nodes
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(5)
|
|
g.add_edges([0, 2, 3, 1, 1], [1, 0, 3, 1, 0])
|
|
g.remove_nodes([0, 1])
|
|
g.ndata['h'] = F.randn((g.number_of_nodes(), 3))
|
|
g.edata['h'] = F.randn((g.number_of_edges(), 2))
|
|
|
|
# remove edges
|
|
g = dgl.DGLGraph()
|
|
g = g.astype(idtype).to(F.ctx())
|
|
g.add_nodes(5)
|
|
g.add_edges([0, 2, 3, 1, 1], [1, 0, 3, 1, 0])
|
|
g.remove_edges([0, 1])
|
|
g = g.to(F.ctx())
|
|
g.ndata['h'] = F.randn((g.number_of_nodes(), 3))
|
|
g.edata['h'] = F.randn((g.number_of_edges(), 2))
|
|
|
|
if __name__ == '__main__':
|
|
test_node_removal()
|
|
test_edge_removal()
|
|
test_multigraph_node_removal()
|
|
test_multigraph_edge_removal()
|
|
test_node_and_edge_removal()
|
|
test_node_frame()
|
|
test_edge_frame()
|
|
test_frame_size()
|