Skip to content

Commit acf46ca

Browse files
authored
Merge branch 'master' into feature/adding_ssma_aggregation
2 parents bf87b50 + ffdec32 commit acf46ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2482
-550
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ inputs:
66
default: '3.9'
77
torch-version:
88
required: false
9-
default: '2.5.0'
9+
default: '2.6.0'
1010
cuda-version:
1111
required: false
1212
default: cpu
1313
torchvision-version:
1414
required: false
15-
default: '0.20.0'
15+
default: '0.21.0'
1616
full_install:
1717
required: false
1818
default: true
@@ -48,9 +48,6 @@ runs:
4848
if: ${{ inputs.torch-version == 'nightly' }}
4949
run: |
5050
pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/${{ inputs.cuda-version }}
51-
python -c "import torch; print('PyTorch:', torch.__version__)"
52-
python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
53-
python -c "import torch; print('CUDA:', torch.version.cuda)"
5451
shell: bash
5552

5653
- name: Install pyg-lib

.github/workflows/nightly.yml renamed to .github/workflows/building_nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
4040
- name: Build package
4141
run: |
42-
pip install --upgrade build
42+
pip install build
4343
python -m build
4444
4545
- name: Publish package

.github/workflows/building_pyg_conda.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/building_rusty1s_conda.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Skip workflow if only certain files have been changed.
2626
- name: Get changed files
2727
id: changed-files-specific
28-
uses: tj-actions/changed-files@v41
28+
uses: tj-actions/changed-files@v46
2929
with:
3030
files: |
3131
benchmark/**

.github/workflows/examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Install main package
2222
run: |
23-
pip install .[benchmark]
23+
pip install ".[benchmark]"
2424
2525
- name: Run GCN on Cora
2626
run: |

.github/workflows/linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Skip workflow if only certain files have been changed.
2626
- name: Get changed files
2727
id: changed-files-specific
28-
uses: tj-actions/changed-files@v45
28+
uses: tj-actions/changed-files@v46
2929
with:
3030
files: |
3131
benchmark/**
@@ -45,7 +45,7 @@ jobs:
4545
if: steps.changed-files-specific.outputs.only_changed != 'true'
4646
run: |
4747
pip install mypy
48-
pip install -e .[full,test]
48+
pip install -e ".[full,test]"
4949
5050
- name: Check type hints
5151
if: steps.changed-files-specific.outputs.only_changed != 'true'

.github/workflows/dist_testing.yml renamed to .github/workflows/testing_dist.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# Skip workflow if only certain files have been changed.
2626
- name: Get changed files
2727
id: changed-files-specific
28-
uses: tj-actions/changed-files@v41
28+
uses: tj-actions/changed-files@v46
2929
with:
3030
files: |
3131
torch_geometric/distributed/**
@@ -38,7 +38,10 @@ jobs:
3838
- name: Install main package
3939
if: steps.changed-files-specific.outputs.any_changed == 'true'
4040
run: |
41-
pip install -e .[test]
41+
pip install -e ".[test]"
42+
python -c "import torch; print('PyTorch:', torch.__version__)"
43+
python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
44+
python -c "import torch; print('CUDA:', torch.version.cuda)"
4245
4346
- name: Run tests
4447
if: steps.changed-files-specific.outputs.any_changed == 'true'

.github/workflows/full_testing.yml renamed to .github/workflows/testing_full.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, windows-latest, macos-14]
19-
python-version: ['3.9', '3.10']
20-
torch-version: [1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0, nightly]
19+
python-version: ['3.9']
20+
torch-version: [1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0, 2.5.0, 2.6.0, nightly]
2121
include:
2222
- torch-version: 1.13.0
2323
torchvision-version: 0.14.0
@@ -33,6 +33,8 @@ jobs:
3333
torchvision-version: 0.19.0
3434
- torch-version: 2.5.0
3535
torchvision-version: 0.20.0
36+
- torch-version: 2.6.0
37+
torchvision-version: 0.21.0
3638
- torch-version: nightly
3739
torchvision-version: nightly
3840
exclude:
@@ -44,10 +46,6 @@ jobs:
4446
torch-version: 2.1.0
4547
- os: macos-14
4648
torch-version: 2.2.0
47-
# TODO Some dependency version conflict lets pytest crash on Windows/3.10/2.4.0
48-
- os: windows-latest
49-
python-version: '3.10'
50-
torch-version: 2.4.0
5149

5250
steps:
5351
- name: Checkout repository
@@ -73,8 +71,10 @@ jobs:
7371

7472
- name: Install main package
7573
run: |
76-
echo "torch==${{ matrix.torch-version }}" > requirements-constraint.txt
77-
pip install -e .[full,test] --constraint requirements-constraint.txt
74+
pip install -e ".[full,test]"
75+
python -c "import torch; print('PyTorch:', torch.__version__)"
76+
python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
77+
python -c "import torch; print('CUDA:', torch.version.cuda)"
7878
shell: bash
7979

8080
- name: Run tests

.github/workflows/full_gpu_testing.yml renamed to .github/workflows/testing_full_gpu.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ jobs:
2626
2727
- name: Install main package
2828
run: |
29-
pip install -e .[full,test]
29+
pip install -e ".[full,test]"
30+
python -c "import torch; print('PyTorch:', torch.__version__)"
31+
python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
32+
python -c "import torch; print('CUDA:', torch.version.cuda)"
3033
3134
- name: Run tests
3235
timeout-minutes: 20

0 commit comments

Comments
 (0)