From 1ca4908bf500784ad68a13e5d0c6fa2fd43fa73b Mon Sep 17 00:00:00 2001 From: "padarn.wilson" Date: Sat, 9 Jul 2022 17:30:49 +0800 Subject: [PATCH 1/5] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15090708aa02..d7b3d0e8d925 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Added `predict()` support to the `LightningNodeData` module ([#4884](https://github.com/pyg-team/pytorch_geometric/pull/4884)) - Added `time_attr` argument to `LinkNeighborLoader` ([#4877](https://github.com/pyg-team/pytorch_geometric/pull/4877), [#4908](https://github.com/pyg-team/pytorch_geometric/pull/4908)) - Added a `filter_per_worker` argument to data loaders to allow filtering of data within sub-processes ([#4873](https://github.com/pyg-team/pytorch_geometric/pull/4873)) -- Added a `NeighborLoader` benchmark script ([#4815](https://github.com/pyg-team/pytorch_geometric/pull/4815)) +- Added a `NeighborLoader` benchmark script ([#4815](https://github.com/pyg-team/pytorch_geometric/pull/4815), [#4862](https://github.com/pyg-team/pytorch_geometric/pull/4862/files)) - Added support for `FeatureStore` and `GraphStore` in `NeighborLoader` ([#4817](https://github.com/pyg-team/pytorch_geometric/pull/4817), [#4851](https://github.com/pyg-team/pytorch_geometric/pull/4851), [#4854](https://github.com/pyg-team/pytorch_geometric/pull/4854), [#4856](https://github.com/pyg-team/pytorch_geometric/pull/4856), [#4857](https://github.com/pyg-team/pytorch_geometric/pull/4857), [#4882](https://github.com/pyg-team/pytorch_geometric/pull/4882), [#4883](https://github.com/pyg-team/pytorch_geometric/pull/4883), [#4929](https://github.com/pyg-team/pytorch_geometric/pull/4929), [#4992](https://github.com/pyg-team/pytorch_geometric/pull/4922)) - Added a `normalize` parameter to `dense_diff_pool` ([#4847](https://github.com/pyg-team/pytorch_geometric/pull/4847)) - Added `size=None` explanation to jittable `MessagePassing` modules in the documentation ([#4850](https://github.com/pyg-team/pytorch_geometric/pull/4850)) From d1e0b2c8196be6b1348b216c61c2e3275851c683 Mon Sep 17 00:00:00 2001 From: "padarn.wilson" Date: Sat, 25 Jun 2022 16:13:04 +0800 Subject: [PATCH 2/5] make benchmark arguments more flexible --- benchmark/loader/neighbor_loader.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/benchmark/loader/neighbor_loader.py b/benchmark/loader/neighbor_loader.py index cd8f7ed0186b..f1d6e1185fde 100644 --- a/benchmark/loader/neighbor_loader.py +++ b/benchmark/loader/neighbor_loader.py @@ -11,6 +11,7 @@ def run(args: argparse.ArgumentParser) -> None: + print(args.hetero_neighbor_sizes) for dataset_name in args.datasets: print(f"Dataset: {dataset_name}") root = osp.join(args.root, dataset_name) @@ -83,10 +84,14 @@ def run(args: argparse.ArgumentParser) -> None: add('--device', default='cpu') add('--datasets', nargs="+", default=['arxiv', 'products', 'mag']) add('--root', default='../../data') - add('--batch-sizes', default=[8192, 4096, 2048, 1024, 512]) - add('--eval-batch-sizes', default=[16384, 8192, 4096, 2048, 1024, 512]) - add('--homo-neighbor_sizes', default=[[10, 5], [15, 10, 5], [20, 15, 10]]) - add('--hetero-neighbor_sizes', default=[[5], [10], [10, 5]], type=int) + add('--batch-sizes', default=[8192, 4096, 2048, 1024, 512], type=int, + nargs='+') + add('--eval-batch-sizes', default=[16384, 8192, 4096, 2048, 1024, 512], + type=int, nargs='+') + add('--homo-neighbor_sizes', default=[[10, 5], [15, 10, 5], [20, 15, 10]], + type=int, nargs='+') + add('--hetero-neighbor_sizes', default=[[5], [10], [10, 5]], type=int, + nargs='+') add('--num-workers', default=0) add('--runs', default=3) From 4f0b8df54ff407e06f64d7ade2d0bd2109e13065 Mon Sep 17 00:00:00 2001 From: "padarn.wilson" Date: Sat, 25 Jun 2022 16:15:26 +0800 Subject: [PATCH 3/5] make benchmark arguments more flexible --- benchmark/loader/neighbor_loader.py | 1 - 1 file changed, 1 deletion(-) diff --git a/benchmark/loader/neighbor_loader.py b/benchmark/loader/neighbor_loader.py index f1d6e1185fde..7460b743a0c7 100644 --- a/benchmark/loader/neighbor_loader.py +++ b/benchmark/loader/neighbor_loader.py @@ -11,7 +11,6 @@ def run(args: argparse.ArgumentParser) -> None: - print(args.hetero_neighbor_sizes) for dataset_name in args.datasets: print(f"Dataset: {dataset_name}") root = osp.join(args.root, dataset_name) From 1ead6c819746aa49bddb1346c5fa28527cad2f79 Mon Sep 17 00:00:00 2001 From: "padarn.wilson" Date: Sat, 9 Jul 2022 17:28:33 +0800 Subject: [PATCH 4/5] add ast for lists --- benchmark/loader/neighbor_loader.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/benchmark/loader/neighbor_loader.py b/benchmark/loader/neighbor_loader.py index 7460b743a0c7..1bc1d874062d 100644 --- a/benchmark/loader/neighbor_loader.py +++ b/benchmark/loader/neighbor_loader.py @@ -1,4 +1,5 @@ import argparse +import ast import os.path as osp from timeit import default_timer @@ -88,9 +89,9 @@ def run(args: argparse.ArgumentParser) -> None: add('--eval-batch-sizes', default=[16384, 8192, 4096, 2048, 1024, 512], type=int, nargs='+') add('--homo-neighbor_sizes', default=[[10, 5], [15, 10, 5], [20, 15, 10]], - type=int, nargs='+') - add('--hetero-neighbor_sizes', default=[[5], [10], [10, 5]], type=int, - nargs='+') + type=ast.literal_eval) + add('--hetero-neighbor_sizes', default=[[5], [10], [10, 5]], + type=ast.literal_eval) add('--num-workers', default=0) add('--runs', default=3) From 84ab29ba8cefb3f10cd39fd029e02ab55339d258 Mon Sep 17 00:00:00 2001 From: "padarn.wilson" Date: Sat, 9 Jul 2022 17:30:09 +0800 Subject: [PATCH 5/5] update more argument --- benchmark/loader/neighbor_loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/benchmark/loader/neighbor_loader.py b/benchmark/loader/neighbor_loader.py index 1bc1d874062d..32e91ffc4ced 100644 --- a/benchmark/loader/neighbor_loader.py +++ b/benchmark/loader/neighbor_loader.py @@ -84,10 +84,10 @@ def run(args: argparse.ArgumentParser) -> None: add('--device', default='cpu') add('--datasets', nargs="+", default=['arxiv', 'products', 'mag']) add('--root', default='../../data') - add('--batch-sizes', default=[8192, 4096, 2048, 1024, 512], type=int, - nargs='+') + add('--batch-sizes', default=[8192, 4096, 2048, 1024, 512], + type=ast.literal_eval) add('--eval-batch-sizes', default=[16384, 8192, 4096, 2048, 1024, 512], - type=int, nargs='+') + type=ast.literal_eval) add('--homo-neighbor_sizes', default=[[10, 5], [15, 10, 5], [20, 15, 10]], type=ast.literal_eval) add('--hetero-neighbor_sizes', default=[[5], [10], [10, 5]],