Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dgl
Commits
9eaace92
Unverified
Commit
9eaace92
authored
Aug 29, 2020
by
Quan (Andy) Gan
Committed by
GitHub
Aug 29, 2020
Browse files
rename create_format_ to create_formats_ (#2126)
parent
745078e7
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
22 additions
and
22 deletions
+22
-22
docs/source/guide/minibatch-link.rst
docs/source/guide/minibatch-link.rst
+1
-1
examples/pytorch/gcmc/train_sampling.py
examples/pytorch/gcmc/train_sampling.py
+2
-2
examples/pytorch/graphsage/train_cv.py
examples/pytorch/graphsage/train_cv.py
+1
-1
examples/pytorch/graphsage/train_cv_multi_gpu.py
examples/pytorch/graphsage/train_cv_multi_gpu.py
+1
-1
examples/pytorch/graphsage/train_sampling.py
examples/pytorch/graphsage/train_sampling.py
+3
-3
examples/pytorch/graphsage/train_sampling_multi_gpu.py
examples/pytorch/graphsage/train_sampling_multi_gpu.py
+3
-3
examples/pytorch/graphsage/train_sampling_unsupervised.py
examples/pytorch/graphsage/train_sampling_unsupervised.py
+1
-1
examples/pytorch/ogb/cluster-sage/sampler.py
examples/pytorch/ogb/cluster-sage/sampler.py
+1
-1
examples/pytorch/ogb/ogbn-products/gat/main.py
examples/pytorch/ogb/ogbn-products/gat/main.py
+1
-1
examples/pytorch/ogb/ogbn-products/graphsage/main.py
examples/pytorch/ogb/ogbn-products/graphsage/main.py
+1
-1
python/dgl/dataloading/dataloader.py
python/dgl/dataloading/dataloader.py
+1
-1
python/dgl/heterograph.py
python/dgl/heterograph.py
+4
-4
python/dgl/heterograph_index.py
python/dgl/heterograph_index.py
+1
-1
tests/compute/test_heterograph.py
tests/compute/test_heterograph.py
+1
-1
No files found.
docs/source/guide/minibatch-link.rst
View file @
9eaace92
...
@@ -240,7 +240,7 @@ source-destination array pairs. An example is given as follows:
...
@@ -240,7 +240,7 @@ source-destination array pairs. An example is given as follows:
dataloader
=
dgl
.
dataloading
.
EdgeDataLoader
(
dataloader
=
dgl
.
dataloading
.
EdgeDataLoader
(
g
,
train_eid_dict
,
sampler
,
g
,
train_eid_dict
,
sampler
,
negative_sampler
=
negative_sampler
=
NegativeSampler
(
g
,
5
),
negative_sampler
=
NegativeSampler
(
g
,
5
),
batch_size
=
1024
,
batch_size
=
1024
,
shuffle
=
True
,
shuffle
=
True
,
drop_last
=
False
,
drop_last
=
False
,
...
...
examples/pytorch/gcmc/train_sampling.py
View file @
9eaace92
...
@@ -403,8 +403,8 @@ if __name__ == '__main__':
...
@@ -403,8 +403,8 @@ if __name__ == '__main__':
run
(
0
,
n_gpus
,
args
,
devices
,
dataset
)
run
(
0
,
n_gpus
,
args
,
devices
,
dataset
)
# multi gpu
# multi gpu
else
:
else
:
dataset
.
train_enc_graph
.
create_format_
()
dataset
.
train_enc_graph
.
create_format
s
_
()
dataset
.
train_dec_graph
.
create_format_
()
dataset
.
train_dec_graph
.
create_format
s
_
()
procs
=
[]
procs
=
[]
for
proc_id
in
range
(
n_gpus
):
for
proc_id
in
range
(
n_gpus
):
p
=
mp
.
Process
(
target
=
thread_wrapped_func
(
run
),
args
=
(
proc_id
,
n_gpus
,
args
,
devices
,
dataset
))
p
=
mp
.
Process
(
target
=
thread_wrapped_func
(
run
),
args
=
(
proc_id
,
n_gpus
,
args
,
devices
,
dataset
))
...
...
examples/pytorch/graphsage/train_cv.py
View file @
9eaace92
...
@@ -317,7 +317,7 @@ if __name__ == '__main__':
...
@@ -317,7 +317,7 @@ if __name__ == '__main__':
train_mask
=
g
.
ndata
[
'train_mask'
]
train_mask
=
g
.
ndata
[
'train_mask'
]
val_mask
=
g
.
ndata
[
'val_mask'
]
val_mask
=
g
.
ndata
[
'val_mask'
]
g
.
ndata
[
'features'
]
=
features
g
.
ndata
[
'features'
]
=
features
g
.
create_format_
()
g
.
create_format
s
_
()
# Pack data
# Pack data
data
=
train_mask
,
val_mask
,
in_feats
,
labels
,
n_classes
,
g
data
=
train_mask
,
val_mask
,
in_feats
,
labels
,
n_classes
,
g
...
...
examples/pytorch/graphsage/train_cv_multi_gpu.py
View file @
9eaace92
...
@@ -384,7 +384,7 @@ if __name__ == '__main__':
...
@@ -384,7 +384,7 @@ if __name__ == '__main__':
g
.
ndata
[
'features'
]
=
features
.
share_memory_
()
g
.
ndata
[
'features'
]
=
features
.
share_memory_
()
create_history_storage
(
g
,
args
,
n_classes
)
create_history_storage
(
g
,
args
,
n_classes
)
g
.
create_format_
()
g
.
create_format
s
_
()
# Pack data
# Pack data
data
=
train_mask
,
val_mask
,
in_feats
,
labels
,
n_classes
,
g
data
=
train_mask
,
val_mask
,
in_feats
,
labels
,
n_classes
,
g
...
...
examples/pytorch/graphsage/train_sampling.py
View file @
9eaace92
...
@@ -229,9 +229,9 @@ if __name__ == '__main__':
...
@@ -229,9 +229,9 @@ if __name__ == '__main__':
else
:
else
:
train_g
=
val_g
=
test_g
=
g
train_g
=
val_g
=
test_g
=
g
train_g
.
create_format_
()
train_g
.
create_format
s
_
()
val_g
.
create_format_
()
val_g
.
create_format
s
_
()
test_g
.
create_format_
()
test_g
.
create_format
s
_
()
# Pack data
# Pack data
data
=
in_feats
,
n_classes
,
train_g
,
val_g
,
test_g
data
=
in_feats
,
n_classes
,
train_g
,
val_g
,
test_g
...
...
examples/pytorch/graphsage/train_sampling_multi_gpu.py
View file @
9eaace92
...
@@ -258,9 +258,9 @@ if __name__ == '__main__':
...
@@ -258,9 +258,9 @@ if __name__ == '__main__':
else
:
else
:
train_g
=
val_g
=
test_g
=
g
train_g
=
val_g
=
test_g
=
g
train_g
.
create_format_
()
train_g
.
create_format
s
_
()
val_g
.
create_format_
()
val_g
.
create_format
s
_
()
test_g
.
create_format_
()
test_g
.
create_format
s
_
()
# Pack data
# Pack data
data
=
in_feats
,
n_classes
,
train_g
,
val_g
,
test_g
data
=
in_feats
,
n_classes
,
train_g
,
val_g
,
test_g
...
...
examples/pytorch/graphsage/train_sampling_unsupervised.py
View file @
9eaace92
...
@@ -298,7 +298,7 @@ def main(args, devices):
...
@@ -298,7 +298,7 @@ def main(args, devices):
val_mask
=
g
.
ndata
[
'val_mask'
]
val_mask
=
g
.
ndata
[
'val_mask'
]
test_mask
=
g
.
ndata
[
'test_mask'
]
test_mask
=
g
.
ndata
[
'test_mask'
]
g
.
ndata
[
'features'
]
=
features
g
.
ndata
[
'features'
]
=
features
g
.
create_format_
()
g
.
create_format
s
_
()
# Pack data
# Pack data
data
=
train_mask
,
val_mask
,
test_mask
,
in_feats
,
labels
,
n_classes
,
g
data
=
train_mask
,
val_mask
,
test_mask
,
in_feats
,
labels
,
n_classes
,
g
...
...
examples/pytorch/ogb/cluster-sage/sampler.py
View file @
9eaace92
...
@@ -67,5 +67,5 @@ def subgraph_collate_fn(g, batch):
...
@@ -67,5 +67,5 @@ def subgraph_collate_fn(g, batch):
g1
.
ndata
[
'feat'
]
=
g
.
ndata
[
'feat'
][
nid
]
g1
.
ndata
[
'feat'
]
=
g
.
ndata
[
'feat'
][
nid
]
g1
.
ndata
[
'labels'
]
=
g
.
ndata
[
'labels'
][
nid
]
g1
.
ndata
[
'labels'
]
=
g
.
ndata
[
'labels'
][
nid
]
g1
.
ndata
[
'train_mask'
]
=
g
.
ndata
[
'train_mask'
][
nid
]
g1
.
ndata
[
'train_mask'
]
=
g
.
ndata
[
'train_mask'
][
nid
]
g1
.
create_format_
()
g1
.
create_format
s
_
()
return
g1
return
g1
examples/pytorch/ogb/ogbn-products/gat/main.py
View file @
9eaace92
...
@@ -243,7 +243,7 @@ if __name__ == '__main__':
...
@@ -243,7 +243,7 @@ if __name__ == '__main__':
in_feats
=
graph
.
ndata
[
'feat'
].
shape
[
1
]
in_feats
=
graph
.
ndata
[
'feat'
].
shape
[
1
]
n_classes
=
(
labels
.
max
()
+
1
).
item
()
n_classes
=
(
labels
.
max
()
+
1
).
item
()
graph
.
create_format_
()
graph
.
create_format
s
_
()
# Pack data
# Pack data
data
=
train_idx
,
val_idx
,
test_idx
,
in_feats
,
labels
,
n_classes
,
graph
,
args
.
head
data
=
train_idx
,
val_idx
,
test_idx
,
in_feats
,
labels
,
n_classes
,
graph
,
args
.
head
...
...
examples/pytorch/ogb/ogbn-products/graphsage/main.py
View file @
9eaace92
...
@@ -234,7 +234,7 @@ if __name__ == '__main__':
...
@@ -234,7 +234,7 @@ if __name__ == '__main__':
in_feats
=
graph
.
ndata
[
'feat'
].
shape
[
1
]
in_feats
=
graph
.
ndata
[
'feat'
].
shape
[
1
]
n_classes
=
(
labels
.
max
()
+
1
).
item
()
n_classes
=
(
labels
.
max
()
+
1
).
item
()
graph
.
create_format_
()
graph
.
create_format
s
_
()
# Pack data
# Pack data
data
=
train_idx
,
val_idx
,
test_idx
,
in_feats
,
labels
,
n_classes
,
graph
data
=
train_idx
,
val_idx
,
test_idx
,
in_feats
,
labels
,
n_classes
,
graph
...
...
python/dgl/dataloading/dataloader.py
View file @
9eaace92
...
@@ -245,7 +245,7 @@ class BlockSampler(object):
...
@@ -245,7 +245,7 @@ class BlockSampler(object):
seed_nodes
=
{
ntype
:
block
.
srcnodes
[
ntype
].
data
[
NID
]
for
ntype
in
block
.
srctypes
}
seed_nodes
=
{
ntype
:
block
.
srcnodes
[
ntype
].
data
[
NID
]
for
ntype
in
block
.
srctypes
}
# Pre-generate CSR format so that it can be used in training directly
# Pre-generate CSR format so that it can be used in training directly
block
.
create_format_
()
block
.
create_format
s
_
()
blocks
.
insert
(
0
,
block
)
blocks
.
insert
(
0
,
block
)
return
blocks
return
blocks
...
...
python/dgl/heterograph.py
View file @
9eaace92
...
@@ -5241,7 +5241,7 @@ class DGLHeteroGraph(object):
...
@@ -5241,7 +5241,7 @@ class DGLHeteroGraph(object):
ret
.
_graph
=
self
.
_graph
.
formats
(
formats
)
ret
.
_graph
=
self
.
_graph
.
formats
(
formats
)
return
ret
return
ret
def
create_format_
(
self
):
def
create_format
s
_
(
self
):
r
"""Create all sparse matrices allowed for the graph.
r
"""Create all sparse matrices allowed for the graph.
By default, we create sparse matrices for a graph only when necessary.
By default, we create sparse matrices for a graph only when necessary.
...
@@ -5261,7 +5261,7 @@ class DGLHeteroGraph(object):
...
@@ -5261,7 +5261,7 @@ class DGLHeteroGraph(object):
>>> g = dgl.graph(([0, 0, 1], [2, 3, 2]))
>>> g = dgl.graph(([0, 0, 1], [2, 3, 2]))
>>> g.format()
>>> g.format()
{'created': ['coo'], 'not created': ['csr', 'csc']}
{'created': ['coo'], 'not created': ['csr', 'csc']}
>>> g.create_format_()
>>> g.create_format
s
_()
>>> g.format()
>>> g.format()
{'created': ['coo', 'csr', 'csc'], 'not created': []}
{'created': ['coo', 'csr', 'csc'], 'not created': []}
...
@@ -5275,14 +5275,14 @@ class DGLHeteroGraph(object):
...
@@ -5275,14 +5275,14 @@ class DGLHeteroGraph(object):
... })
... })
>>> g.format()
>>> g.format()
{'created': ['coo'], 'not created': ['csr', 'csc']}
{'created': ['coo'], 'not created': ['csr', 'csc']}
>>> g.create_format_()
>>> g.create_format
s
_()
>>> g.format()
>>> g.format()
{'created': ['coo', 'csr', 'csc'], 'not created': []}
{'created': ['coo', 'csr', 'csc'], 'not created': []}
"""
"""
if
self
.
num_edges
()
==
0
:
if
self
.
num_edges
()
==
0
:
return
0
return
0
return
self
.
_graph
.
create_format_
()
return
self
.
_graph
.
create_format
s
_
()
def
astype
(
self
,
idtype
):
def
astype
(
self
,
idtype
):
"""Cast this graph to use another ID type.
"""Cast this graph to use another ID type.
...
...
python/dgl/heterograph_index.py
View file @
9eaace92
...
@@ -909,7 +909,7 @@ class HeteroGraphIndex(ObjectBase):
...
@@ -909,7 +909,7 @@ class HeteroGraphIndex(ObjectBase):
formats
=
[
formats
]
formats
=
[
formats
]
return
_CAPI_DGLHeteroGetFormatGraph
(
self
,
formats
)
return
_CAPI_DGLHeteroGetFormatGraph
(
self
,
formats
)
def
create_format_
(
self
):
def
create_format
s
_
(
self
):
"""Create all sparse matrices allowed for the graph."""
"""Create all sparse matrices allowed for the graph."""
return
_CAPI_DGLHeteroCreateFormat
(
self
)
return
_CAPI_DGLHeteroCreateFormat
(
self
)
...
...
tests/compute/test_heterograph.py
View file @
9eaace92
...
@@ -1714,7 +1714,7 @@ def test_format(idtype):
...
@@ -1714,7 +1714,7 @@ def test_format(idtype):
assert
g
.
formats
()[
'created'
]
==
[
'coo'
]
assert
g
.
formats
()[
'created'
]
==
[
'coo'
]
g1
=
g
.
formats
([
'coo'
,
'csr'
,
'csc'
])
g1
=
g
.
formats
([
'coo'
,
'csr'
,
'csc'
])
assert
len
(
g1
.
formats
()[
'created'
])
+
len
(
g1
.
formats
()[
'not created'
])
==
3
assert
len
(
g1
.
formats
()[
'created'
])
+
len
(
g1
.
formats
()[
'not created'
])
==
3
g1
.
create_format_
()
g1
.
create_format
s
_
()
assert
len
(
g1
.
formats
()[
'created'
])
==
3
assert
len
(
g1
.
formats
()[
'created'
])
==
3
assert
g
.
formats
()[
'created'
]
==
[
'coo'
]
assert
g
.
formats
()[
'created'
]
==
[
'coo'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment