Merge branch 'master' into models/polynormer

xnuohz · web-flow · commit 7b4b3446dce2 · 2025-04-11T10:28:26.000+08:00
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -48,9 +48,6 @@ runs:
       if: ${{ inputs.torch-version == 'nightly' }}
       run: |
         pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/${{ inputs.cuda-version }}
-        python -c "import torch; print('PyTorch:', torch.__version__)"
-        python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
-        python -c "import torch; print('CUDA:', torch.version.cuda)"
       shell: bash
 
     - name: Install pyg-lib
diff --git a/.github/workflows/building_nightly.yml b/.github/workflows/building_nightly.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Build package
         run: |
-          pip install --upgrade build
+          pip install build
           python -m build
 
       - name: Publish package
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Install main package
         run: |
-          pip install .[benchmark]
+          pip install ".[benchmark]"
 
       - name: Run GCN on Cora
         run: |
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -45,7 +45,7 @@ jobs:
         if: steps.changed-files-specific.outputs.only_changed != 'true'
         run: |
           pip install mypy
-          pip install -e .[full,test]
+          pip install -e ".[full,test]"
 
       - name: Check type hints
         if: steps.changed-files-specific.outputs.only_changed != 'true'
diff --git a/.github/workflows/testing_dist.yml b/.github/workflows/testing_dist.yml
@@ -38,7 +38,10 @@ jobs:
       - name: Install main package
         if: steps.changed-files-specific.outputs.any_changed == 'true'
         run: |
-          pip install -e .[test]
+          pip install -e ".[test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         if: steps.changed-files-specific.outputs.any_changed == 'true'
diff --git a/.github/workflows/testing_full.yml b/.github/workflows/testing_full.yml
@@ -71,8 +71,10 @@ jobs:
 
       - name: Install main package
         run: |
-          echo "torch==${{ matrix.torch-version }}" > requirements-constraint.txt
-          pip install -e .[full,test] --constraint requirements-constraint.txt
+          pip install -e ".[full,test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
         shell: bash
 
       - name: Run tests
diff --git a/.github/workflows/testing_full_gpu.yml b/.github/workflows/testing_full_gpu.yml
@@ -26,7 +26,10 @@ jobs:
 
       - name: Install main package
         run: |
-          pip install -e .[full,test]
+          pip install -e ".[full,test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         timeout-minutes: 20
diff --git a/.github/workflows/testing_latest.yml b/.github/workflows/testing_latest.yml
@@ -58,12 +58,18 @@ jobs:
       - name: Install main package
         if: ${{ steps.changed-files-specific.outputs.only_changed != 'true' && runner.os == 'Windows' }}
         run: |
-          pip install -e .[test]
+          pip install -e ".[test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Install full main package
         if: ${{ steps.changed-files-specific.outputs.only_changed != 'true' && runner.os != 'Windows' }}
         run: |
-          pip install -e .[full,test]
+          pip install -e ".[full,test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         if: steps.changed-files-specific.outputs.only_changed != 'true'
diff --git a/.github/workflows/testing_minimal.yml b/.github/workflows/testing_minimal.yml
@@ -46,7 +46,10 @@ jobs:
       - name: Install main package
         if: steps.changed-files-specific.outputs.only_changed != 'true'
         run: |
-          pip install -e .[test]
+          pip install -e ".[test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         if: steps.changed-files-specific.outputs.only_changed != 'true'
diff --git a/.github/workflows/testing_nightly.yml b/.github/workflows/testing_nightly.yml
@@ -50,7 +50,10 @@ jobs:
       - name: Install main package
         if: steps.changed-files-specific.outputs.only_changed != 'true'
         run: |
-          pip install -e .[test]
+          pip install -e ".[test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         if: steps.changed-files-specific.outputs.only_changed != 'true'
diff --git a/.github/workflows/testing_prev.yml b/.github/workflows/testing_prev.yml
@@ -59,8 +59,10 @@ jobs:
       - name: Install main package
         if: steps.changed-files-specific.outputs.only_changed != 'true'
         run: |
-          echo "torch==${{ matrix.torch-version }}" > requirements-constraint.txt
-          pip install -e .[test] --constraint requirements-constraint.txt
+          pip install -e ".[test]"
+          python -c "import torch; print('PyTorch:', torch.__version__)"
+          python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
+          python -c "import torch; print('CUDA:', torch.version.cuda)"
 
       - name: Run tests
         if: steps.changed-files-specific.outputs.only_changed != 'true'
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -27,7 +27,7 @@ repos:
           )$
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.35.1
+    rev: v1.37.0
     hooks:
       - id: yamllint
         name: Lint yaml
@@ -61,27 +61,27 @@ repos:
         additional_dependencies: [toml]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         name: Sort imports
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         name: Check PEP8
         additional_dependencies: [Flake8-pyproject]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.11.4
     hooks:
       - id: ruff
         name: Ruff formatting
         args: [--fix, --exit-non-zero-on-fix]
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.21
+    rev: 0.7.22
     hooks:
       - id: mdformat
         name: Format Markdown
diff --git a/README.md b/README.md
@@ -334,7 +334,7 @@ These approaches have been implemented in PyG, and can benefit from the above GN
 
 ## Installation
 
-PyG is available for Python 3.9 to Python 3.12.
+PyG is available for Python 3.9 to Python 3.13.
 
 From **PyG 2.3** onwards, you can install and use PyG **without any external library** required except for PyTorch.
 For this, simply run
diff --git a/docs/source/install/installation.rst b/docs/source/install/installation.rst
@@ -1,7 +1,7 @@
 Installation
 ============
 
-:pyg:`PyG` is available for :python:`Python 3.9` to :python:`Python 3.12`.
+:pyg:`PyG` is available for :python:`Python 3.9` to :python:`Python 3.13`.
 
 .. note::
    We do not recommend installation as a root user on your system :python:`Python`.
diff --git a/examples/cpp/README.md b/examples/cpp/README.md
@@ -4,7 +4,7 @@ This is a minimal example of getting PyG to work in C++ with CMake.
 
 In order to successfully compile this example, make sure you have both the C++ APIs of [`TorchScatter`](https://github.com/rusty1s/pytorch_scatter#c-api) and [`TorchSparse`](https://github.com/rusty1s/pytorch_sparse/#c-api) installed.
 
-For this, we need to add `TorchLib` to the `-DCMAKE_PREFIX_PATH` (run `import torch, print(torch.utils.cmake_prefix_path)` to obtain it).
+For this, we need to add `TorchLib` to the `-DCMAKE_PREFIX_PATH` (run `import torch; print(torch.utils.cmake_prefix_path)` to obtain it).
 Then, *e.g.*, to install `TorchScatter`, run:
 
 ```
diff --git a/pyproject.toml b/pyproject.toml
@@ -27,6 +27,7 @@ classifiers=[
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies=[
diff --git a/torch_geometric/distributed/rpc.py b/torch_geometric/distributed/rpc.py
@@ -144,7 +144,7 @@ def rpc_async(self, *args, **kwargs):
 @rpc_require_initialized
 def rpc_register(call: RPCCallBase) -> int:
     r"""Registers a call for RPC requests."""
-    global _rpc_call_id, _rpc_call_pool
+    global _rpc_call_id
 
     with _rpc_call_lock:
         call_id = _rpc_call_id
diff --git a/torch_geometric/nn/conv/transformer_conv.py b/torch_geometric/nn/conv/transformer_conv.py
@@ -126,9 +126,11 @@ def __init__(
         if isinstance(in_channels, int):
             in_channels = (in_channels, in_channels)
 
-        self.lin_key = Linear(in_channels[0], heads * out_channels)
-        self.lin_query = Linear(in_channels[1], heads * out_channels)
-        self.lin_value = Linear(in_channels[0], heads * out_channels)
+        self.lin_key = Linear(in_channels[0], heads * out_channels, bias=bias)
+        self.lin_query = Linear(in_channels[1], heads * out_channels,
+                                bias=bias)
+        self.lin_value = Linear(in_channels[0], heads * out_channels,
+                                bias=bias)
         if edge_dim is not None:
             self.lin_edge = Linear(edge_dim, heads * out_channels, bias=False)
         else:
diff --git a/torch_geometric/testing/decorators.py b/torch_geometric/testing/decorators.py
@@ -33,8 +33,8 @@ def onlyFullTest(func: Callable) -> Callable:
 
 def is_distributed_test() -> bool:
     r"""Whether to run the distributed test suite."""
-    return ((is_full_test() or os.getenv('DIST_TEST', '0') == '1')
-            and sys.platform == 'linux' and has_package('pyg_lib'))
+    return (os.getenv('DIST_TEST', '0') == '1' and sys.platform == 'linux'
+            and has_package('pyg_lib'))
 
 
 def onlyDistributedTest(func: Callable) -> Callable:
