From f600289bc79988651ed15bfd17b88dd01e98e116 Mon Sep 17 00:00:00 2001 From: rusty1s Date: Mon, 29 Apr 2024 11:31:08 +0000 Subject: [PATCH] update --- .github/workflows/building-conda.yml | 13 ++----------- .github/workflows/building.yml | 11 ++--------- .github/workflows/testing.yml | 4 ++-- README.md | 14 +++++++------- conda/pytorch-cluster/README.md | 2 +- setup.py | 8 +++++--- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/.github/workflows/building-conda.yml b/.github/workflows/building-conda.yml index c2ec83a..982c81d 100644 --- a/.github/workflows/building-conda.yml +++ b/.github/workflows/building-conda.yml @@ -11,23 +11,14 @@ jobs: fail-fast: false matrix: # We have trouble building for Windows - drop for now. - os: [ubuntu-20.04, macos-11] # windows-2019 + os: [ubuntu-20.04] # windows-2019 python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - torch-version: [2.2.0] # [2.1.0, 2.2.0] + torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0] cuda-version: ['cpu', 'cu118', 'cu121'] exclude: - python-version: '3.12' # Python 3.12 not yet supported in `conda-build`. - torch-version: 2.1.0 python-version: '3.12' - - os: macos-11 - cuda-version: 'cu118' - - os: macos-11 - cuda-version: 'cu121' - # Fails with: - # * note: 'value' has been explicitly marked unavailable here - # * error: 'value' is unavailable: introduced in macOS 10.13 - - torch-version: 2.2.0 - os: macos-11 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml index c04ebef..25a41d8 100644 --- a/.github/workflows/building.yml +++ b/.github/workflows/building.yml @@ -10,9 +10,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-11, 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.2.0] # [2.1.0, 2.2.0] + torch-version: [2.3.0] # [2.1.0, 2.2.0, 2.3.0] cuda-version: ['cpu', 'cu118', 'cu121'] exclude: - torch-version: 2.1.0 @@ -21,13 +21,6 @@ jobs: cuda-version: 'cu118' - os: macos-11 cuda-version: 'cu121' - # Fails with: - # * note: 'value' has been explicitly marked unavailable here - # * error: 'value' is unavailable: introduced in macOS 10.13 - - os: macos-11 - python-version: '3.11' - - os: macos-11 - python-version: '3.12' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8550ad2..dd517b0 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.1.0, 2.2.0] + torch-version: [2.2.0, 2.3.0] steps: - uses: actions/checkout@v2 @@ -44,7 +44,7 @@ jobs: pytest --cov --cov-report=xml - name: Upload coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 if: success() with: fail_ci_if_error: false diff --git a/README.md b/README.md index eb7fdfd..5479e7d 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,12 @@ conda install pytorch-cluster -c pyg We alternatively provide pip wheels for all major OS/PyTorch/CUDA combinations, see [here](https://data.pyg.org/whl). -#### 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-cluster -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html +pip install torch-cluster -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. @@ -59,12 +59,12 @@ where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` dependin | **Windows** | ✅ | ✅ | ✅ | | **macOS** | ✅ | | | -#### PyTorch 2.1 +#### PyTorch 2.2 -To install the binaries for PyTorch 2.1.0, simply run +To install the binaries for PyTorch 2.2.0, simply run ``` -pip install torch-cluster -f https://data.pyg.org/whl/torch-2.1.0+${CUDA}.html +pip install torch-cluster -f https://data.pyg.org/whl/torch-2.2.0+${CUDA}.html ``` where `${CUDA}` should be replaced by either `cpu`, `cu118`, or `cu121` depending on your PyTorch installation. @@ -75,7 +75,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, and PyTorch 2.0.0 (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, and PyTorch 2.1.0/2.1.1/2.1.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-cluster/README.md b/conda/pytorch-cluster/README.md index ef041bc..c562ff4 100644 --- a/conda/pytorch-cluster/README.md +++ b/conda/pytorch-cluster/README.md @@ -1,3 +1,3 @@ ``` -./build_conda.sh 3.11 2.2.0 cu118 # python, pytorch and cuda version +./build_conda.sh 3.11 2.3.0 cu118 # python, pytorch and cuda version ``` diff --git a/setup.py b/setup.py index cd7de3c..1ef90ab 100644 --- a/setup.py +++ b/setup.py @@ -61,9 +61,11 @@ def get_extensions(): print('Compiling without OpenMP...') # Compile for mac arm64 - if (sys.platform == 'darwin' and platform.machine() == 'arm64'): - extra_compile_args['cxx'] += ['-arch', 'arm64'] - extra_link_args += ['-arch', 'arm64'] + if sys.platform == 'darwin': + extra_compile_args['cxx'] += ['-D_LIBCPP_DISABLE_AVAILABILITY'] + if platform.machine == 'arm64': + extra_compile_args['cxx'] += ['-arch', 'arm64'] + extra_link_args += ['-arch', 'arm64'] if suffix == 'cuda': define_macros += [('WITH_CUDA', None)]