Skip to content

Commit a4bbf88

Browse files
authored
Merge branch 'master' into zaristei/web_qsp_unittests
2 parents d14b813 + 470c988 commit a4bbf88

35 files changed

+698
-596
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 2 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
File renamed without changes.

.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/linting.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@v45
28+
uses: tj-actions/changed-files@v46
2929
with:
3030
files: |
3131
benchmark/**

.github/workflows/dist_testing.yml renamed to .github/workflows/testing_dist.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
torch_geometric/distributed/**

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

Lines changed: 4 additions & 6 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
File renamed without changes.

.github/workflows/testing.yml renamed to .github/workflows/testing_latest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Testing PyTorch 2.5
1+
name: Testing latest PyTorch
22

33
on: # yamllint disable-line rule:truthy
44
push:
@@ -37,7 +37,7 @@ jobs:
3737
# Skip workflow if only certain files have been changed.
3838
- name: Get changed files
3939
id: changed-files-specific
40-
uses: tj-actions/changed-files@v41
40+
uses: tj-actions/changed-files@v46
4141
with:
4242
files: |
4343
benchmark/**
@@ -67,7 +67,7 @@ jobs:
6767
6868
- name: Run tests
6969
if: steps.changed-files-specific.outputs.only_changed != 'true'
70-
timeout-minutes: 10
70+
timeout-minutes: 15
7171
run: |
7272
pytest --cov --cov-report=xml --durations 10
7373

0 commit comments

Comments
 (0)