pyg-nightly 2.7.0.dev20250502__tar.gz → 2.7.0.dev20250504__tar.gz

{pyg_nightly-2.7.0.dev20250502 → pyg_nightly-2.7.0.dev20250504}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg-nightly
-Version: 2.7.0.dev20250502
+Version: 2.7.0.dev20250504
 Summary: Graph Neural Network Library for PyTorch
 Keywords: deep-learning,pytorch,geometric-deep-learning,graph-neural-networks,graph-convolutional-networks
 Author-email: Matthias Fey <matthias@pyg.org>

{pyg_nightly-2.7.0.dev20250502 → pyg_nightly-2.7.0.dev20250504}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend="flit_core.buildapi"
 
 [project]
 name="pyg-nightly"
-version="2.7.0.dev20250502"
+version="2.7.0.dev20250504"
 authors=[
     {name="Matthias Fey", email="matthias@pyg.org"},
 ]

{pyg_nightly-2.7.0.dev20250502 → pyg_nightly-2.7.0.dev20250504}/torch_geometric/__init__.py

@@ -31,7 +31,7 @@ from .lazy_loader import LazyLoader
 contrib = LazyLoader('contrib', globals(), 'torch_geometric.contrib')
 graphgym = LazyLoader('graphgym', globals(), 'torch_geometric.graphgym')
 
-__version__ = '2.7.0.dev20250502'
+__version__ = '2.7.0.dev20250504'
 
 __all__ = [
     'Index',

{pyg_nightly-2.7.0.dev20250502 → pyg_nightly-2.7.0.dev20250504}/torch_geometric/datasets/__init__.py

@@ -81,6 +81,7 @@ from .git_mol_dataset import GitMolDataset
 from .molecule_gpt_dataset import MoleculeGPTDataset
 from .instruct_mol_dataset import InstructMolDataset
 from .tag_dataset import TAGDataset
+from .city import CityNetwork
 
 from .dbp15k import DBP15K
 from .aminer import AMiner
@@ -199,6 +200,7 @@ homo_datasets = [
     'MoleculeGPTDataset',
     'InstructMolDataset',
     'TAGDataset',
+    'CityNetwork',
 ]
 
 hetero_datasets = [

pyg_nightly-2.7.0.dev20250504/torch_geometric/datasets/city.py

@@ -0,0 +1,156 @@
+import os.path as osp
+from typing import Callable, Optional
+
+from torch_geometric.data import (
+    Data,
+    InMemoryDataset,
+    download_url,
+    extract_tar,
+)
+from torch_geometric.io import fs
+
+
+class CityNetwork(InMemoryDataset):
+    r"""The City-Networks are introduced in
+    `"Towards Quantifying Long-Range Interactions in Graph Machine Learning:
+    a Large Graph Dataset and a Measurement"
+    <https://arxiv.org/abs/2503.09008>`_ paper.
+    The dataset contains four city networks: `paris`, `shanghai`, `la`,
+    and 'london', where nodes represent junctions and edges represent
+    directed road segments. The task is to predict each node's eccentricity
+    score, which is approximated based on its 16-hop neighborhood. The score
+    indicates how accessible one node is in the network, and is mapped to
+    10 quantiles for transductive classification. See the original
+    `source code <https://github.com/LeonResearch/City-Networks>`_ for more
+    details on the individual networks.
+
+    Args:
+        root (str): Root directory where the dataset should be saved.
+        name (str): The name of the dataset (``"paris"``, ``"shanghai"``,
+            ``"la"``, ``"london"``).
+        augmented (bool, optional): Whether to use the augmented node features
+            from edge features.(default: :obj:`True`)
+        transform (callable, optional): A function/transform that takes in an
+            :class:`~torch_geometric.data.Data` object and returns a
+            transformed version. The data object will be transformed before
+            every access. (default: :obj:`None`)
+        pre_transform (callable, optional): A function/transform that takes in
+            an :class:`~torch_geometric.data.Data` object and returns a
+            transformed version. The data object will be transformed before
+            being saved to disk. (default: :obj:`None`)
+        force_reload (bool, optional): Whether to re-process the dataset.
+            (default: :obj:`False`)
+
+    **STATS:**
+
+    .. list-table::
+        :widths: 10 10 10 10 10
+        :header-rows: 1
+
+        * - Name
+          - #nodes
+          - #edges
+          - #features
+          - #classes
+        * - paris
+          - 114,127
+          - 182,511
+          - 37
+          - 10
+        * - shanghai
+          - 183,917
+          - 262,092
+          - 37
+          - 10
+        * - la
+          - 240,587
+          - 341,523
+          - 37
+          - 10
+        * - london
+          - 568,795
+          - 756,502
+          - 37
+          - 10
+    """
+    url = "https://github.com/LeonResearch/City-Networks/raw/refs/heads/main/data/"  # noqa: E501
+
+    def __init__(
+        self,
+        root: str,
+        name: str,
+        augmented: bool = True,
+        transform: Optional[Callable] = None,
+        pre_transform: Optional[Callable] = None,
+        force_reload: bool = False,
+        delete_raw: bool = False,
+    ) -> None:
+        self.name = name.lower()
+        assert self.name in ["paris", "shanghai", "la", "london"]
+        self.augmented = augmented
+        self.delete_raw = delete_raw
+        super().__init__(
+            root,
+            transform,
+            pre_transform,
+            force_reload=force_reload,
+        )
+        self.load(self.processed_paths[0])
+
+    @property
+    def raw_dir(self) -> str:
+        return osp.join(self.root, self.name, "raw")
+
+    @property
+    def processed_dir(self) -> str:
+        return osp.join(self.root, self.name, "processed")
+
+    @property
+    def raw_file_names(self) -> str:
+        return f"{self.name}.json"
+
+    @property
+    def processed_file_names(self) -> str:
+        return "data.pt"
+
+    def download(self) -> None:
+        self.download_path = download_url(
+            self.url + f"{self.name}.tar.gz",
+            self.raw_dir,
+        )
+
+    def process(self) -> None:
+        extract_tar(self.download_path, self.raw_dir)
+        data_path = osp.join(self.raw_dir, self.name)
+        node_feat = fs.torch_load(
+            osp.join(
+                data_path,
+                f"node_features{'_augmented' if self.augmented else ''}.pt",
+            ))
+        edge_index = fs.torch_load(osp.join(data_path, "edge_indices.pt"))
+        label = fs.torch_load(
+            osp.join(data_path, "10-chunk_16-hop_node_labels.pt"))
+        train_mask = fs.torch_load(osp.join(data_path, "train_mask.pt"))
+        val_mask = fs.torch_load(osp.join(data_path, "valid_mask.pt"))
+        test_mask = fs.torch_load(osp.join(data_path, "test_mask.pt"))
+        data = Data(
+            x=node_feat,
+            edge_index=edge_index,
+            y=label,
+            train_mask=train_mask,
+            val_mask=val_mask,
+            test_mask=test_mask,
+        )
+        if self.pre_transform is not None:
+            data = self.pre_transform(data)
+
+        self.save([data], self.processed_paths[0])
+
+        if self.delete_raw:
+            fs.rm(data_path)
+
+    def __repr__(self) -> str:
+        return (f"{self.__class__.__name__}("
+                f"root='{self.root}', "
+                f"name='{self.name}', "
+                f"augmented={self.augmented})")

{pyg_nightly-2.7.0.dev20250502 → pyg_nightly-2.7.0.dev20250504}/torch_geometric/sampler/neighbor_sampler.py

@@ -279,6 +279,7 @@ class NeighborSampler(BaseSampler):
         self.subgraph_type = SubgraphType(subgraph_type)
         self.disjoint = disjoint
         self.temporal_strategy = temporal_strategy
+        self.keep_orig_edges = False
 
     @property
     def num_neighbors(self) -> NumNeighbors:
@@ -321,7 +322,7 @@ class NeighborSampler(BaseSampler):
     ) -> Union[SamplerOutput, HeteroSamplerOutput]:
         out = node_sample(inputs, self._sample)
         if self.subgraph_type == SubgraphType.bidirectional:
-            out = out.to_bidirectional()
+            out = out.to_bidirectional(keep_orig_edges=self.keep_orig_edges)
         return out
 
     # Edge-based sampling #####################################################
@@ -334,7 +335,7 @@ class NeighborSampler(BaseSampler):
         out = edge_sample(inputs, self._sample, self.num_nodes, self.disjoint,
                           self.node_time, neg_sampling)
         if self.subgraph_type == SubgraphType.bidirectional:
-            out = out.to_bidirectional()
+            out = out.to_bidirectional(keep_orig_edges=self.keep_orig_edges)
         return out
 
     # Other Utilities #########################################################