Skip to content

GitLab

"...git@developer.sourcefind.cn:renzhc/diffusers_dcu.git" did not exist on "a1ea8c01c31a44bf48f6a3b85ccabeb45ef6418f"
Unverified Commit d780f6d0 authored by yxy235's avatar yxy235 Committed by GitHub
Browse files

[GraphBolt] Remove coo from `InSubgraphSampler`. (#6845) 


Co-authored-by: default avatarUbuntu <ubuntu@ip-172-31-0-133.us-west-2.compute.internal>
parent 40ee9e37
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 179 deletions
python/dgl/graphbolt/impl/in_subgraph_sampler.py
View file @ d780f6d0
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
from torch.utils.data import functional_datapipe from torch.utils.data import functional_datapipe
from ..internal import ( from ..internal import unique_and_compact_csc_formats
unique_and_compact_csc_formats,
unique_and_compact_node_pairs,
)
from ..subgraph_sampler import SubgraphSampler from ..subgraph_sampler import SubgraphSampler
from .sampled_subgraph_impl import FusedSampledSubgraphImpl, SampledSubgraphImpl from .sampled_subgraph_impl import SampledSubgraphImpl
__all__ = ["InSubgraphSampler"] __all__ = ["InSubgraphSampler"]
...@@ -65,37 +62,22 @@ class InSubgraphSampler(SubgraphSampler): ...@@ -65,37 +62,22 @@ class InSubgraphSampler(SubgraphSampler):
self, self,
datapipe, datapipe,
graph, graph,
# TODO: clean up once the migration is done.
output_cscformat=True,
): ):
super().__init__(datapipe) super().__init__(datapipe)
self.graph = graph self.graph = graph
self.output_cscformat = output_cscformat
self.sampler = graph.in_subgraph self.sampler = graph.in_subgraph
def sample_subgraphs(self, seeds): def sample_subgraphs(self, seeds):
subgraph = self.sampler(seeds, self.output_cscformat) subgraph = self.sampler(seeds)
if not self.output_cscformat: (
( original_row_node_ids,
original_row_node_ids, compacted_csc_formats,
compacted_node_pairs, ) = unique_and_compact_csc_formats(subgraph.sampled_csc, seeds)
) = unique_and_compact_node_pairs(subgraph.sampled_csc, seeds) subgraph = SampledSubgraphImpl(
subgraph = FusedSampledSubgraphImpl( sampled_csc=compacted_csc_formats,
sampled_csc=compacted_node_pairs, original_column_node_ids=seeds,
original_column_node_ids=seeds, original_row_node_ids=original_row_node_ids,
original_row_node_ids=original_row_node_ids, original_edge_ids=subgraph.original_edge_ids,
original_edge_ids=subgraph.original_edge_ids, )
)
else:
(
original_row_node_ids,
compacted_csc_formats,
) = unique_and_compact_csc_formats(subgraph.sampled_csc, seeds)
subgraph = SampledSubgraphImpl(
sampled_csc=compacted_csc_formats,
original_column_node_ids=seeds,
original_row_node_ids=original_row_node_ids,
original_edge_ids=subgraph.original_edge_ids,
)
seeds = original_row_node_ids seeds = original_row_node_ids
return (seeds, [subgraph]) return (seeds, [subgraph])
tests/python/pytorch/graphbolt/impl/test_in_subgraph_sampler.py
View file @ d780f6d0
...@@ -62,148 +62,6 @@ def test_index_select_csc(indptr_dtype, indices_dtype, idtype, is_pinned): ...@@ -62,148 +62,6 @@ def test_index_select_csc(indptr_dtype, indices_dtype, idtype, is_pinned):
assert torch.equal(cpu_indices, gpu_indices.cpu()) assert torch.equal(cpu_indices, gpu_indices.cpu())
def test_InSubgraphSampler_node_pairs_homo():
"""Original graph in COO:
1 0 1 0 1 0
1 0 0 1 0 1
0 1 0 1 0 0
0 1 0 0 1 0
1 0 0 0 0 1
0 0 1 0 1 0
"""
indptr = torch.LongTensor([0, 3, 5, 7, 9, 12, 14])
indices = torch.LongTensor([0, 1, 4, 2, 3, 0, 5, 1, 2, 0, 3, 5, 1, 4])
graph = gb.fused_csc_sampling_graph(indptr, indices)
seed_nodes = torch.LongTensor([0, 5, 3])
item_set = gb.ItemSet(seed_nodes, names="seed_nodes")
batch_size = 1
item_sampler = gb.ItemSampler(item_set, batch_size=batch_size)
in_subgraph_sampler = gb.InSubgraphSampler(
item_sampler, graph, output_cscformat=False
)
it = iter(in_subgraph_sampler)
def original_node_pairs(minibatch):
sampled_subgraph = minibatch.sampled_subgraphs[0]
_src = [
sampled_subgraph.original_row_node_ids[id]
for id in sampled_subgraph.sampled_csc[0]
]
_dst = [
sampled_subgraph.original_column_node_ids[id]
for id in sampled_subgraph.sampled_csc[1]
]
return _src, _dst
mn = next(it)
assert torch.equal(mn.seed_nodes, torch.LongTensor([0]))
assert original_node_pairs(mn) == ([0, 1, 4], [0, 0, 0])
mn = next(it)
assert torch.equal(mn.seed_nodes, torch.LongTensor([5]))
assert original_node_pairs(mn) == ([1, 4], [5, 5])
mn = next(it)
assert torch.equal(mn.seed_nodes, torch.LongTensor([3]))
assert original_node_pairs(mn) == ([1, 2], [3, 3])
def test_InSubgraphSampler_node_pairs_hetero():
"""Original graph in COO:
1 0 1 0 1 0
1 0 0 1 0 1
0 1 0 1 0 0
0 1 0 0 1 0
1 0 0 0 0 1
0 0 1 0 1 0
node_type_0: [0, 1, 2]
node_type_1: [3, 4, 5]
edge_type_0: node_type_0 -> node_type_0
edge_type_1: node_type_0 -> node_type_1
edge_type_2: node_type_1 -> node_type_0
edge_type_3: node_type_1 -> node_type_1
"""
ntypes = {
"N0": 0,
"N1": 1,
}
etypes = {
"N0:R0:N0": 0,
"N0:R1:N1": 1,
"N1:R2:N0": 2,
"N1:R3:N1": 3,
}
indptr = torch.LongTensor([0, 3, 5, 7, 9, 12, 14])
indices = torch.LongTensor([0, 1, 4, 2, 3, 0, 5, 1, 2, 0, 3, 5, 1, 4])
node_type_offset = torch.LongTensor([0, 3, 6])
type_per_edge = torch.LongTensor([0, 0, 2, 0, 2, 0, 2, 1, 1, 1, 3, 3, 1, 3])
graph = gb.fused_csc_sampling_graph(
csc_indptr=indptr,
indices=indices,
node_type_offset=node_type_offset,
type_per_edge=type_per_edge,
node_type_to_id=ntypes,
edge_type_to_id=etypes,
)
item_set = gb.ItemSetDict(
{
"N0": gb.ItemSet(torch.LongTensor([1, 0, 2]), names="seed_nodes"),
"N1": gb.ItemSet(torch.LongTensor([0, 2, 1]), names="seed_nodes"),
}
)
batch_size = 2
item_sampler = gb.ItemSampler(item_set, batch_size=batch_size)
in_subgraph_sampler = gb.InSubgraphSampler(
item_sampler, graph, output_cscformat=False
)
it = iter(in_subgraph_sampler)
mn = next(it)
assert torch.equal(mn.seed_nodes["N0"], torch.LongTensor([1, 0]))
expected_node_pairs = {
"N0:R0:N0": (torch.LongTensor([2, 1, 0]), torch.LongTensor([0, 1, 1])),
"N0:R1:N1": (torch.LongTensor([]), torch.LongTensor([])),
"N1:R2:N0": (torch.LongTensor([0, 1]), torch.LongTensor([0, 1])),
"N1:R3:N1": (torch.LongTensor([]), torch.LongTensor([])),
}
for etype, pairs in mn.sampled_subgraphs[0].sampled_csc.items():
assert torch.equal(pairs[0], expected_node_pairs[etype][0])
assert torch.equal(pairs[1], expected_node_pairs[etype][1])
mn = next(it)
assert mn.seed_nodes == {
"N0": torch.LongTensor([2]),
"N1": torch.LongTensor([0]),
}
expected_node_pairs = {
"N0:R0:N0": (torch.LongTensor([1]), torch.LongTensor([0])),
"N0:R1:N1": (torch.LongTensor([2, 0]), torch.LongTensor([0, 0])),
"N1:R2:N0": (torch.LongTensor([1]), torch.LongTensor([0])),
"N1:R3:N1": (torch.LongTensor([]), torch.LongTensor([])),
}
for etype, pairs in mn.sampled_subgraphs[0].sampled_csc.items():
assert torch.equal(pairs[0], expected_node_pairs[etype][0])
assert torch.equal(pairs[1], expected_node_pairs[etype][1])
mn = next(it)
assert torch.equal(mn.seed_nodes["N1"], torch.LongTensor([2, 1]))
expected_node_pairs = {
"N0:R0:N0": (torch.LongTensor([]), torch.LongTensor([])),
"N0:R1:N1": (torch.LongTensor([0, 1]), torch.LongTensor([0, 1])),
"N1:R2:N0": (torch.LongTensor([]), torch.LongTensor([])),
"N1:R3:N1": (torch.LongTensor([1, 2, 0]), torch.LongTensor([0, 1, 1])),
}
for etype, pairs in mn.sampled_subgraphs[0].sampled_csc.items():
assert torch.equal(pairs[0], expected_node_pairs[etype][0])
assert torch.equal(pairs[1], expected_node_pairs[etype][1])
def test_InSubgraphSampler_homo(): def test_InSubgraphSampler_homo():
"""Original graph in COO: """Original graph in COO:
1 0 1 0 1 0 1 0 1 0 1 0
...@@ -222,9 +80,7 @@ def test_InSubgraphSampler_homo(): ...@@ -222,9 +80,7 @@ def test_InSubgraphSampler_homo():
batch_size = 1 batch_size = 1
item_sampler = gb.ItemSampler(item_set, batch_size=batch_size) item_sampler = gb.ItemSampler(item_set, batch_size=batch_size)
in_subgraph_sampler = gb.InSubgraphSampler( in_subgraph_sampler = gb.InSubgraphSampler(item_sampler, graph)
item_sampler, graph, output_cscformat=True
)
it = iter(in_subgraph_sampler) it = iter(in_subgraph_sampler)
...@@ -304,9 +160,7 @@ def test_InSubgraphSampler_hetero(): ...@@ -304,9 +160,7 @@ def test_InSubgraphSampler_hetero():
batch_size = 2 batch_size = 2
item_sampler = gb.ItemSampler(item_set, batch_size=batch_size) item_sampler = gb.ItemSampler(item_set, batch_size=batch_size)
in_subgraph_sampler = gb.InSubgraphSampler( in_subgraph_sampler = gb.InSubgraphSampler(item_sampler, graph)
item_sampler, graph, output_cscformat=True
)
it = iter(in_subgraph_sampler) it = iter(in_subgraph_sampler)
......
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