From dfe599da6a206853c05d0bb7b32d6de126e82b3c Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Fri, 7 Feb 2025 09:57:44 +0000 Subject: [PATCH 1/4] update --- .github/actions/setup/action.yml | 4 ++-- .github/workflows/testing.yml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 07d7dae4..7d5ce539 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,7 +6,7 @@ inputs: default: '3.9' torch-version: required: false - default: '2.5.0' + default: '2.5' cuda-version: required: false default: cpu @@ -27,7 +27,7 @@ runs: - name: Install PyTorch ${{ inputs.torch-version }}+${{ inputs.cuda-version }} if: ${{ inputs.torch-version != 'nightly' }} run: | - pip install torch==${{ inputs.torch-version }} --extra-index-url https://download.pytorch.org/whl/${{ inputs.cuda-version }} + pip install torch==${{ inputs.torch-version }}.* --extra-index-url https://download.pytorch.org/whl/${{ inputs.cuda-version }} python -c "import torch; print('PyTorch:', torch.__version__)" python -c "import torch; print('CUDA:', torch.version.cuda)" shell: bash diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index b2bfec73..9f03d875 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,6 +10,21 @@ jobs: pytest: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: + - '3.9' + - '3.11' + torch-version: + - '1.13' + - '2.0' + - '2.1' + - '2.2' + - '2.3' + - '2.4' + - '2.5' + - 'nightly' steps: - name: Checkout repository @@ -31,6 +46,10 @@ jobs: - name: Setup packages if: steps.changed-files-specific.outputs.only_changed != 'true' uses: ./.github/actions/setup + with: + python-version: ${{ matrix.python-version }} + torch-version: ${{ matrix.torch-version }} + cuda-version: cpu - name: Install main package if: steps.changed-files-specific.outputs.only_changed != 'true' From a9a12dd64da07daec1941f32030bf73af6945b18 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 9 Feb 2025 10:12:03 +0000 Subject: [PATCH 2/4] update --- .github/actions/setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 7d5ce539..f2edd6c0 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -36,6 +36,7 @@ runs: if: ${{ inputs.torch-version == 'nightly' }} run: | pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/${{ inputs.cuda-version }} + pip list python -c "import torch; print('PyTorch:', torch.__version__)" python -c "import torch; print('CUDA:', torch.version.cuda)" shell: bash From 10912c91b7d98fa53e2727459ddae1470e1b2771 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 9 Feb 2025 10:22:33 +0000 Subject: [PATCH 3/4] update --- .github/actions/setup/action.yml | 5 ++- .github/workflows/documentation.yml | 2 -- .github/workflows/latest_testing.yml | 45 ------------------------- .github/workflows/prev_testing.yml | 50 ---------------------------- 4 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 .github/workflows/latest_testing.yml delete mode 100644 .github/workflows/prev_testing.yml diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index f2edd6c0..c434d0d4 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -36,7 +36,10 @@ runs: if: ${{ inputs.torch-version == 'nightly' }} run: | pip install --pre torch --extra-index-url https://download.pytorch.org/whl/nightly/${{ inputs.cuda-version }} - pip list python -c "import torch; print('PyTorch:', torch.__version__)" python -c "import torch; print('CUDA:', torch.version.cuda)" shell: bash + + - name: List installed packages + run: pip list + shell: bash diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 0270ffa2..902f8b9e 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -30,8 +30,6 @@ jobs: - name: Setup packages if: steps.changed-files-specific.outputs.only_changed != 'true' uses: ./.github/actions/setup - with: - full_install: false - name: Install main package if: steps.changed-files-specific.outputs.only_changed != 'true' diff --git a/.github/workflows/latest_testing.yml b/.github/workflows/latest_testing.yml deleted file mode 100644 index 72ad27fc..00000000 --- a/.github/workflows/latest_testing.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Testing PyTorch nightly - -on: # yamllint disable-line rule:truthy - push: - branches: - - master - pull_request: - -jobs: - - latest_pytest: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 40 - - # Skip workflow if only certain files have been changed. - - name: Get changed files - id: changed-files-specific - uses: tj-actions/changed-files@v45 - with: - files: | - docs/** - examples/** - README.md - CHANGELOG.md - - - name: Setup packages - if: steps.changed-files-specific.outputs.only_changed != 'true' - uses: ./.github/actions/setup - with: - torch-version: nightly - - - name: Install main package - if: steps.changed-files-specific.outputs.only_changed != 'true' - run: | - pip install -e .[full,test] - - - name: Run tests - if: steps.changed-files-specific.outputs.only_changed != 'true' - run: | - pytest diff --git a/.github/workflows/prev_testing.yml b/.github/workflows/prev_testing.yml deleted file mode 100644 index 52c807ef..00000000 --- a/.github/workflows/prev_testing.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Testing previous PyTorch versions - -on: # yamllint disable-line rule:truthy - push: - branches: - - master - pull_request: - -jobs: - - prev_pytest: - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - torch-version: [1.13.0, 2.0.0, 2.1.0, 2.2.0, 2.3.0, 2.4.0] - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 40 - - # Skip workflow if only certain files have been changed. - - name: Get changed files - id: changed-files-specific - uses: tj-actions/changed-files@v45 - with: - files: | - docs/** - examples/** - README.md - CHANGELOG.md - - - name: Setup packages - if: steps.changed-files-specific.outputs.only_changed != 'true' - uses: ./.github/actions/setup - with: - torch-version: ${{ matrix.torch-version }} - - - name: Install main package - if: steps.changed-files-specific.outputs.only_changed != 'true' - run: | - pip install -e .[full,test] - - - name: Run tests - if: steps.changed-files-specific.outputs.only_changed != 'true' - run: | - pytest From cc9988a68da64bfac58bc96d76e9aef0572b12f6 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 9 Feb 2025 10:30:53 +0000 Subject: [PATCH 4/4] update --- .github/workflows/documentation.yml | 2 ++ .github/workflows/linting.yml | 1 + .github/workflows/testing.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 902f8b9e..7ef84762 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -36,6 +36,8 @@ jobs: run: | pip install git+https://github.com/pyg-team/pyg_sphinx_theme.git pip install -e . + pip list + - name: Build documentation if: steps.changed-files-specific.outputs.only_changed != 'true' diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a1830085..80a691d3 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -19,5 +19,6 @@ jobs: - name: Install dependencies run: | pip install -e '.[full,test]' -f https://download.pytorch.org/whl/cpu + pip list - name: Check type hints run: mypy diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9f03d875..b7fe56ec 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -55,6 +55,7 @@ jobs: if: steps.changed-files-specific.outputs.only_changed != 'true' run: | pip install -e .[full,test] + pip list - name: Run tests if: steps.changed-files-specific.outputs.only_changed != 'true'