Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding 'wiki' dataset to LINKXDataset #4600

Merged
merged 9 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [2.0.5] - 2022-MM-DD
### Added
- Added the `Genius` datasets to `nn.datasets.LINKXDataset` ([#4570](https://github.com/pyg-team/pytorch_geometric/pull/4570))
- Added the `Genius` and `Wiki` datasets to `nn.datasets.LINKXDataset` ([#4570](https://github.com/pyg-team/pytorch_geometric/pull/4570), [#4600](https://github.com/pyg-team/pytorch_geometric/pull/4600))
- Added `nn.glob.GlobalPooling` module with support for multiple aggregations ([#4582](https://github.com/pyg-team/pytorch_geometric/pull/4582))
- Added support for graph-level outputs in `to_hetero` ([#4582](https://github.com/pyg-team/pytorch_geometric/pull/4582))
- Added `CHANGELOG.md` ([#4581](https://github.com/pyg-team/pytorch_geometric/pull/4581))
Expand Down
17 changes: 13 additions & 4 deletions torch_geometric/data/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
import ssl
import sys
import urllib
from typing import Optional

from .makedirs import makedirs


def download_url(url: str, folder: str, log: bool = True):
def download_url(url: str, folder: str, log: bool = True,
filename: Optional[str] = None):
r"""Downloads the content of an URL to a specific folder.

Args:
Expand All @@ -16,8 +18,10 @@ def download_url(url: str, folder: str, log: bool = True):
console. (default: :obj:`True`)
"""

filename = url.rpartition('/')[2]
filename = filename if filename[0] == '?' else filename.split('?')[0]
if filename is None:
filename = url.rpartition('/')[2]
filename = filename if filename[0] == '?' else filename.split('?')[0]

path = osp.join(folder, filename)

if osp.exists(path): # pragma: no cover
Expand All @@ -34,6 +38,11 @@ def download_url(url: str, folder: str, log: bool = True):
data = urllib.request.urlopen(url, context=context)

with open(path, 'wb') as f:
f.write(data.read())
# workaround for https://bugs.python.org/issue42853
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A better solution here might be to upload the file in smaller chunks

while True:
chunk = data.read(10 * 1024 * 1024)
if not chunk:
break
f.write(chunk)

return path
58 changes: 47 additions & 11 deletions torch_geometric/datasets/linkx_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,45 @@ class LINKXDataset(InMemoryDataset):
being saved to disk. (default: :obj:`None`)
"""

url = 'https://github.com/CUAI/Non-Homophily-Large-Scale/raw/master/data'
github_url = 'https://github.com/CUAI/Non-Homophily-Large-Scale/' \
'raw/master/data'
gdrive_url = 'https://drive.google.com/uc?confirm=t&'

facebook_datasets = [
'penn94', 'reed98', 'amherst41', 'cornell5', 'johnshopkins55'
]

datasets = {
'penn94': f'{url}/facebook100/Penn94.mat',
'reed98': f'{url}/facebook100/Reed98.mat',
'amherst41': f'{url}/facebook100/Amherst41.mat',
'cornell5': f'{url}/facebook100/Cornell5.mat',
'johnshopkins55': f'{url}/facebook100/Johns%20Hopkins55.mat',
'genius': f'{url}/genius.mat'
'penn94': {
'data.mat': f'{github_url}/facebook100/Penn94.mat'
},
'reed98': {
'data.mat': f'{github_url}/facebook100/Reed98.mat'
},
'amherst41': {
'data.mat': f'{github_url}/facebook100/Amherst41.mat',
},
'cornell5': {
'data.mat': f'{github_url}/facebook100/Cornell5.mat'
},
'johnshopkins55': {
'data.mat': f'{github_url}/facebook100/Johns%20Hopkins55.mat'
},
'genius': {
'data.mat': f'{github_url}/genius.mat'
},
'wiki': {
'wiki_views2M.pt':
f'{gdrive_url}id=1p5DlVHrnFgYm3VsNIzahSsvCD424AyvP',
'wiki_edges2M.pt':
f'{gdrive_url}id=14X7FlkjrlUgmnsYtPwdh-gGuFla4yb5u',
'wiki_features2M.pt':
f'{gdrive_url}id=1ySNspxbK-snNoAZM7oxiWGvOnTRdSyEK'
}
}

splits = {
'penn94': f'{url}/splits/fb100-Penn94-splits.npy',
'penn94': f'{github_url}/splits/fb100-Penn94-splits.npy',
}

def __init__(self, root: str, name: str,
Expand All @@ -69,7 +91,7 @@ def processed_dir(self) -> str:

@property
def raw_file_names(self) -> List[str]:
names = [self.datasets[self.name].split('/')[-1]]
names = list(self.datasets[self.name].keys())
if self.name in self.splits:
names += [self.splits[self.name].split('/')[-1]]
return names
Expand All @@ -79,10 +101,21 @@ def processed_file_names(self) -> str:
return 'data.pt'

def download(self):
download_url(self.datasets[self.name], self.raw_dir)
for filename, path in self.datasets[self.name].items():
download_url(path, self.raw_dir, filename=filename)
if self.name in self.splits:
download_url(self.splits[self.name], self.raw_dir)

def _process_wiki(self):

paths = {x.split("/")[-1]: x for x in self.raw_paths}
print(paths)
x = torch.load(paths['wiki_features2M.pt'])
edge_index = torch.load(paths['wiki_edges2M.pt']).T
y = torch.load(paths['wiki_views2M.pt'])

return Data(x=x, edge_index=edge_index, y=y)

def _process_facebook(self):
from scipy.io import loadmat

Expand Down Expand Up @@ -134,8 +167,11 @@ def process(self):
data = self._process_facebook()
elif self.name == 'genius':
data = self._process_genius()
elif self.name == 'wiki':
data = self._process_wiki()
else:
raise NotImplementedError
raise NotImplementedError(
f"chosen dataset '{self.name}' is not implemented")

if self.pre_transform is not None:
data = self.pre_transform(data)
Expand Down