From 8ec9364b0bdcd99149952a25749ad211c2d0567b Mon Sep 17 00:00:00 2001 From: Matthias Fey Date: Thu, 15 Aug 2024 10:12:47 +0200 Subject: [PATCH] update (#458) --- .github/workflows/building-conda.yml | 20 +++++++------ .github/workflows/building.yml | 10 ++++--- .github/workflows/cuda/cu124-Linux-env.sh | 8 ++++++ .github/workflows/cuda/cu124-Linux.sh | 15 ++++++++++ .github/workflows/cuda/cu124-Windows-env.sh | 8 ++++++ .github/workflows/cuda/cu124-Windows.sh | 18 ++++++++++++ .github/workflows/testing.yml | 2 +- README.md | 26 ++++++++--------- conda/pytorch-scatter/README.md | 2 +- conda/pytorch-scatter/build_conda.sh | 3 ++ torch_scatter/scatter.py | 31 +++++++++++++++------ 11 files changed, 108 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/cuda/cu124-Linux-env.sh create mode 100755 .github/workflows/cuda/cu124-Linux.sh create mode 100644 .github/workflows/cuda/cu124-Windows-env.sh create mode 100755 .github/workflows/cuda/cu124-Windows.sh diff --git a/.github/workflows/building-conda.yml b/.github/workflows/building-conda.yml index 5811d11f..233e50a1 100644 --- a/.github/workflows/building-conda.yml +++ b/.github/workflows/building-conda.yml @@ -10,20 +10,24 @@ jobs: strategy: fail-fast: false matrix: - # We have trouble building for Windows - drop for now. - os: [ubuntu-20.04] # windows-2019 + os: [ubuntu-20.04, macos-14, windows-2019] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0] - cuda-version: ['cpu', 'cu118', 'cu121'] + torch-version: [2.4.0] # [2.4.0, 2.4.0] + cuda-version: ['cpu', 'cu118', 'cu121', 'cu124'] exclude: - - python-version: '3.12' # Python 3.12 not yet supported in `conda-build`. - - torch-version: 2.1.0 - python-version: '3.12' + - torch-version: 2.3.0 + cuda-version: 'cu124' + - os: macos-14 + cuda-version: 'cu118' + - os: macos-14 + cuda-version: 'cu121' + - os: macos-14 + cuda-version: 'cu124' steps: - uses: actions/checkout@v2 - name: Set up Conda for Python ${{ matrix.python-version }} - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index 71f3fba7..2baf6e87 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -12,15 +12,17 @@ jobs: matrix: os: [ubuntu-20.04, macos-14, windows-2019] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0] - cuda-version: ['cpu', 'cu118', 'cu121'] + torch-version: [2.4.0] # [2.3.0, 2.4.0] + cuda-version: ['cpu', 'cu118', 'cu121', 'cu124'] exclude: - - torch-version: 2.1.0 - python-version: '3.12' + - torch-version: 2.3.0 + cuda-version: 'cu124' - os: macos-14 cuda-version: 'cu118' - os: macos-14 cuda-version: 'cu121' + - os: macos-14 + cuda-version: 'cu124' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/cuda/cu124-Linux-env.sh b/.github/workflows/cuda/cu124-Linux-env.sh new file mode 100644 index 00000000..19133e1a --- /dev/null +++ b/.github/workflows/cuda/cu124-Linux-env.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +CUDA_HOME=/usr/local/cuda-12.4 +LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH} +PATH=${CUDA_HOME}/bin:${PATH} + +export FORCE_CUDA=1 +export TORCH_CUDA_ARCH_LIST="5.0+PTX;6.0;7.0;7.5;8.0;8.6;9.0" diff --git a/.github/workflows/cuda/cu124-Linux.sh b/.github/workflows/cuda/cu124-Linux.sh new file mode 100755 index 00000000..f337d5f5 --- /dev/null +++ b/.github/workflows/cuda/cu124-Linux.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +OS=ubuntu2004 + +wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin +sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600 +wget -nv https://developer.download.nvidia.com/compute/cuda/12.4.1/local_installers/cuda-repo-${OS}-12-4-local_12.4.1-550.54.15-1_amd64.deb +sudo dpkg -i cuda-repo-${OS}-12-4-local_12.4.1-550.54.15-1_amd64.deb +sudo cp /var/cuda-repo-${OS}-12-4-local/cuda-*-keyring.gpg /usr/share/keyrings/ + +sudo apt-get -qq update +sudo apt install cuda-nvcc-12-4 cuda-libraries-dev-12-4 +sudo apt clean + +rm -f https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda-repo-${OS}-12-4-local_12.4.1-550.54.15-1_amd64.deb diff --git a/.github/workflows/cuda/cu124-Windows-env.sh b/.github/workflows/cuda/cu124-Windows-env.sh new file mode 100644 index 00000000..c47fdbbb --- /dev/null +++ b/.github/workflows/cuda/cu124-Windows-env.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +CUDA_HOME=/c/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v12.4 +PATH=${CUDA_HOME}/bin:$PATH +PATH=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/MSBuild/15.0/Bin:$PATH + +export FORCE_CUDA=1 +export TORCH_CUDA_ARCH_LIST="6.0+PTX" diff --git a/.github/workflows/cuda/cu124-Windows.sh b/.github/workflows/cuda/cu124-Windows.sh new file mode 100755 index 00000000..b85aeb69 --- /dev/null +++ b/.github/workflows/cuda/cu124-Windows.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Install NVIDIA drivers, see: +# https://github.com/pytorch/vision/blob/master/packaging/windows/internal/cuda_install.bat#L99-L102 +curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "/tmp/gpu_driver_dlls.zip" +7z x "/tmp/gpu_driver_dlls.zip" -o"/c/Windows/System32" + +export CUDA_SHORT=12.4 +export CUDA_URL=https://developer.download.nvidia.com/compute/cuda/${CUDA_SHORT}.1/local_installers +export CUDA_FILE=cuda_${CUDA_SHORT}.1_551.78_windows.exe + +# Install CUDA: +curl -k -L "${CUDA_URL}/${CUDA_FILE}" --output "${CUDA_FILE}" +echo "" +echo "Installing from ${CUDA_FILE}..." +PowerShell -Command "Start-Process -FilePath \"${CUDA_FILE}\" -ArgumentList \"-s nvcc_${CUDA_SHORT} cuobjdump_${CUDA_SHORT} nvprune_${CUDA_SHORT} cupti_${CUDA_SHORT} cublas_dev_${CUDA_SHORT} cudart_${CUDA_SHORT} cufft_dev_${CUDA_SHORT} curand_dev_${CUDA_SHORT} cusolver_dev_${CUDA_SHORT} cusparse_dev_${CUDA_SHORT} thrust_${CUDA_SHORT} npp_dev_${CUDA_SHORT} nvrtc_dev_${CUDA_SHORT} nvml_dev_${CUDA_SHORT}\" -Wait -NoNewWindow" +echo "Done!" +rm -f "${CUDA_FILE}" diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 979439fa..91db4aed 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] python-version: [3.8] - torch-version: [2.2.0, 2.3.0] + torch-version: [2.3.0, 2.4.0] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 40ee5597..c4b839f1 100644 --- a/README.md +++ b/README.md @@ -54,28 +54,28 @@ conda install pytorch-scatter -c pyg We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl). -#### PyTorch 2.3 +#### PyTorch 2.4 -To install the binaries for PyTorch 2.3.0, simply run +To install the binaries for PyTorch 2.4.0, simply run ``` -pip install torch-scatter -f https://data.pyg.org/whl/torch-2.3.0+${CUDA}.html +pip install torch-scatter -f https://data.pyg.org/whl/torch-2.4.0+${CUDA}.html ``` -where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation. +where `${CUDA}` should be replaced by either `cpu`, `cu118`, `cu121`, or `cu124` depending on your PyTorch installation. -| | `cpu` | `cu118` | `cu121` | -|-------------|-------|---------|---------| -| **Linux** | ✅ | ✅ | ✅ | -| **Windows** | ✅ | ✅ | ✅ | -| **macOS** | ✅ | | | +| | `cpu` | `cu118` | `cu121` | `cu124` | +|-------------|-------|---------|---------|---------| +| **Linux** | ✅ | ✅ | ✅ | ✅ | +| **Windows** | ✅ | ✅ | ✅ | ✅ | +| **macOS** | ✅ | | | | -#### PyTorch 2.2 +#### PyTorch 2.3 -To install the binaries for PyTorch 2.2.0, simply run +To install the binaries for PyTorch 2.3.0, simply run ``` -pip install torch-scatter -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html +pip install torch-scatter -f https://data.pyg.org/whl/torch-2.3.0+${CUDA}.html ``` where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation. @@ -86,7 +86,7 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin | **Windows** | ✅ | ✅ | ✅ | | **macOS** | ✅ | | | -**Note:** Binaries of older versions are also provided for PyTorch 1.4.0, PyTorch 1.5.0, PyTorch 1.6.0, PyTorch 1.7.0/1.7.1, PyTorch 1.8.0/1.8.1, PyTorch 1.9.0, PyTorch 1.10.0/1.10.1/1.10.2, PyTorch 1.11.0, PyTorch 1.12.0/1.12.1, PyTorch 1.13.0/1.13.1, PyTorch 2.0.0/2.0.1, and PyTorch 2.1.0/2.1.1/2.1.2 (following the same procedure). +**Note:** Binaries of older versions are also provided for PyTorch 1.4.0, PyTorch 1.5.0, PyTorch 1.6.0, PyTorch 1.7.0/1.7.1, PyTorch 1.8.0/1.8.1, PyTorch 1.9.0, PyTorch 1.10.0/1.10.1/1.10.2, PyTorch 1.11.0, PyTorch 1.12.0/1.12.1, PyTorch 1.13.0/1.13.1, PyTorch 2.0.0/2.0.1, PyTorch 2.1.0/2.1.1/2.1.2, and PyTorch 2.2.0/2.2.1/2.2.2 (following the same procedure). For older versions, you need to explicitly specify the latest supported version number or install via `pip install --no-index` in order to prevent a manual installation from source. You can look up the latest supported version number [here](https://data.pyg.org/whl). diff --git a/conda/pytorch-scatter/README.md b/conda/pytorch-scatter/README.md index c562ff4d..746cee57 100644 --- a/conda/pytorch-scatter/README.md +++ b/conda/pytorch-scatter/README.md @@ -1,3 +1,3 @@ ``` -./build_conda.sh 3.11 2.3.0 cu118 # python, pytorch and cuda version +./build_conda.sh 3.11 2.4.0 cu118 # python, pytorch and cuda version ``` diff --git a/conda/pytorch-scatter/build_conda.sh b/conda/pytorch-scatter/build_conda.sh index 17d55e3b..05c04e36 100755 --- a/conda/pytorch-scatter/build_conda.sh +++ b/conda/pytorch-scatter/build_conda.sh @@ -10,6 +10,9 @@ if [ "${CUDA_VERSION}" = "cpu" ]; then export CONDA_CUDATOOLKIT_CONSTRAINT="cpuonly # [not osx]" else case $CUDA_VERSION in + cu124) + export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==12.4.*" + ;; cu121) export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda==12.1.*" ;; diff --git a/torch_scatter/scatter.py b/torch_scatter/scatter.py index b994873d..d4d80503 100644 --- a/torch_scatter/scatter.py +++ b/torch_scatter/scatter.py @@ -5,7 +5,9 @@ from .utils import broadcast -def scatter_sum(src: torch.Tensor, index: torch.Tensor, dim: int = -1, +def scatter_sum(src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> torch.Tensor: index = broadcast(index, src, dim) @@ -23,19 +25,25 @@ def scatter_sum(src: torch.Tensor, index: torch.Tensor, dim: int = -1, return out.scatter_add_(dim, index, src) -def scatter_add(src: torch.Tensor, index: torch.Tensor, dim: int = -1, +def scatter_add(src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> torch.Tensor: return scatter_sum(src, index, dim, out, dim_size) -def scatter_mul(src: torch.Tensor, index: torch.Tensor, dim: int = -1, +def scatter_mul(src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> torch.Tensor: return torch.ops.torch_scatter.scatter_mul(src, index, dim, out, dim_size) -def scatter_mean(src: torch.Tensor, index: torch.Tensor, dim: int = -1, +def scatter_mean(src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> torch.Tensor: out = scatter_sum(src, index, dim, out, dim_size) @@ -59,21 +67,28 @@ def scatter_mean(src: torch.Tensor, index: torch.Tensor, dim: int = -1, def scatter_min( - src: torch.Tensor, index: torch.Tensor, dim: int = -1, + src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> Tuple[torch.Tensor, torch.Tensor]: return torch.ops.torch_scatter.scatter_min(src, index, dim, out, dim_size) def scatter_max( - src: torch.Tensor, index: torch.Tensor, dim: int = -1, + src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None) -> Tuple[torch.Tensor, torch.Tensor]: return torch.ops.torch_scatter.scatter_max(src, index, dim, out, dim_size) -def scatter(src: torch.Tensor, index: torch.Tensor, dim: int = -1, - out: Optional[torch.Tensor] = None, dim_size: Optional[int] = None, +def scatter(src: torch.Tensor, + index: torch.Tensor, + dim: int = -1, + out: Optional[torch.Tensor] = None, + dim_size: Optional[int] = None, reduce: str = "sum") -> torch.Tensor: r""" |