From 7d82dcb47fc6979750df50f643eee54487796c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Tue, 10 Dec 2024 16:17:40 +0100 Subject: [PATCH 01/10] add leberler --- .github/labeler.yml | 29 +++++++++++++++++++++++++++++ .github/workflows/build_tests.yml | 1 + .github/workflows/labeler.yml | 12 ++++++++++++ .yamllint.yml | 1 + 4 files changed, 43 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000..2ef6e8293 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,29 @@ + +Documentation: +- changed-files: + - any-glob-to-any-file: docs/** + +Examples: +- changed-files: + - any-glob-to-any-file: examples/** + +Tests: +- changed-files: + - any-glob-to-any-file: test/** + +CI: +- changed-files: + - any-glob-to-any-file: .github/workflows/** + - any-glob-to-any-file: .circleci/** + +ot.bregman: +- changed-files: + - any-glob-to-any-file: ot/bergman/** + +ot.gromov: +- changed-files: + - any-glob-to-any-file: ot/gromov/** + +ot.unbalanced: +- changed-files: + - any-glob-to-any-file: ot/unbalanced/** \ No newline at end of file diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index c06994a1a..4356daa2b 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -39,6 +39,7 @@ jobs: pre-commit install --install-hooks pre-commit run --all-files + linux: runs-on: ubuntu-latest diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 000000000..e3ecf923f --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,12 @@ +name: "Pull Request Labeler" +on: +- pull_request_target + +jobs: + labeler: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v5 \ No newline at end of file diff --git a/.yamllint.yml b/.yamllint.yml index e7c255105..e7c081ac9 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -4,6 +4,7 @@ ignore: | .github/workflows/*.yml .circleci/config.yml codecov.yml + .github/labeler.yml rules: line-length: disable From 650291203c08d92f708df7e0ea5edcd152c605e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Tue, 10 Dec 2024 16:21:41 +0100 Subject: [PATCH 02/10] change condition labeler --- .github/workflows/labeler.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index e3ecf923f..285c2ded8 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,7 +1,9 @@ name: "Pull Request Labeler" -on: -- pull_request_target +on: + pull_request: + branches: + - 'master' jobs: labeler: permissions: From 4f5846313ea1cc3f11de853bf0a6ecc43cf1a835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Tue, 10 Dec 2024 16:28:57 +0100 Subject: [PATCH 03/10] better labels --- .github/labeler.yml | 70 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 2ef6e8293..5405156e5 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -26,4 +26,72 @@ ot.gromov: ot.unbalanced: - changed-files: - - any-glob-to-any-file: ot/unbalanced/** \ No newline at end of file + - any-glob-to-any-file: ot/unbalanced/** + +ot.lp: +- changed-files: + - any-glob-to-any-file: ot/lp/** + +ot.utils: +- changed-files: + - any-glob-to-any-file: ot/utils.py + +ot.backend: +- changed-files: + - any-glob-to-any-file: ot/backend.py + +ot.coot: +- changed-files: + - any-glob-to-any-file: ot/coot.py + +ot.optim: +- changed-files: + - any-glob-to-any-file: ot/optim.py + +ot.plot: +- changed-files: + - any-glob-to-any-file: ot/plot.py + +ot.factored: +- changed-files: + - any-glob-to-any-file: ot/factored.py + +ot.gaussian: +- changed-files: + - any-glob-to-any-file: ot/gaussian.py + +ot.gmm: +- changed-files: + - any-glob-to-any-file: ot/gmm.py + +ot.lowrank: +- changed-files: + - any-glob-to-any-file: ot/lowrank.py + +ot.solvers: +- changed-files: + - any-glob-to-any-file: ot/solvers.py + +ot.partial: +- changed-files: + - any-glob-to-any-file: ot/partial.py + +ot.sliced: +- changed-files: + - any-glob-to-any-file: ot/sliced.py + +ot.smooth: +- changed-files: + - any-glob-to-any-file: ot/smooth.py + +ot.weak: +- changed-files: + - any-glob-to-any-file: ot/weak.py + +ot.dr: +- changed-files: + - any-glob-to-any-file: ot/dr.py + +ot.gnn: +- changed-files: + - any-glob-to-any-file: ot/gnn/** \ No newline at end of file From d6655b2805148155d8fe3e811b25b0a704912ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Tue, 10 Dec 2024 16:42:38 +0100 Subject: [PATCH 04/10] add check modified reelase file --- .github/workflows/check_release.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/check_release.yml diff --git a/.github/workflows/check_release.yml b/.github/workflows/check_release.yml new file mode 100644 index 000000000..a477be658 --- /dev/null +++ b/.github/workflows/check_release.yml @@ -0,0 +1,18 @@ +name: "Check updated RELEASES.md file" + +on: + pull_request: + branches: + - 'master' +jobs: + check_release_file: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: Verify Changed files + uses: tj-actions/verify-changed-files@v20 + with: + files: 'RELEASES.md' + fail-if-unchanged: true From 3be37fa0fc988c345f30c00c4283b4cd88c9bd9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Tue, 10 Dec 2024 16:44:29 +0100 Subject: [PATCH 05/10] update release file --- RELEASES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASES.md b/RELEASES.md index c2accd8bf..f3f100b66 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,6 +5,7 @@ #### New features - Implement CG solvers for partial FGW (PR #687) - Added feature `grad=last_step` for `ot.solvers.solve` (PR #693) +- Automatic PR labeling and release file update check (PR #704) #### Closed issues - Fixed `ot.mapping` solvers which depended on deprecated `cvxpy` `ECOS` solver (PR #692, Issue #668) From 1eff18b6af7b68a378d9cfe54029293ad8965bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Wed, 11 Dec 2024 09:09:15 +0100 Subject: [PATCH 06/10] fix action --- .github/workflows/check_release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_release.yml b/.github/workflows/check_release.yml index a477be658..df43d8a65 100644 --- a/.github/workflows/check_release.yml +++ b/.github/workflows/check_release.yml @@ -12,7 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Verify Changed files - uses: tj-actions/verify-changed-files@v20 + uses: tj-actions/changed-files@v45 + id: changed-release-file with: files: 'RELEASES.md' - fail-if-unchanged: true + - name: Check if RELEASES.md file is changed + if: steps.changed-release-file.outputs.any_changed == 'false' + run: exit 1 From dd12f6fa9be402de9fba36a5415e358c9a196bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Wed, 11 Dec 2024 09:10:44 +0100 Subject: [PATCH 07/10] test realse file unchanged --- RELEASES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index f3f100b66..c2accd8bf 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,7 +5,6 @@ #### New features - Implement CG solvers for partial FGW (PR #687) - Added feature `grad=last_step` for `ot.solvers.solve` (PR #693) -- Automatic PR labeling and release file update check (PR #704) #### Closed issues - Fixed `ot.mapping` solvers which depended on deprecated `cvxpy` `ECOS` solver (PR #692, Issue #668) From f201abbf74d4d527f379365c37e55b6430b79490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Wed, 11 Dec 2024 09:11:56 +0100 Subject: [PATCH 08/10] add relrase file comment --- RELEASES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASES.md b/RELEASES.md index c2accd8bf..f3f100b66 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,6 +5,7 @@ #### New features - Implement CG solvers for partial FGW (PR #687) - Added feature `grad=last_step` for `ot.solvers.solve` (PR #693) +- Automatic PR labeling and release file update check (PR #704) #### Closed issues - Fixed `ot.mapping` solvers which depended on deprecated `cvxpy` `ECOS` solver (PR #692, Issue #668) From 08c6cad84de874cf775616cf9902da0eb3c7936f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Wed, 11 Dec 2024 09:13:41 +0100 Subject: [PATCH 09/10] test modify file --- ot/coot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ot/coot.py b/ot/coot.py index 8ea08a2f9..6f4cfa6f0 100644 --- a/ot/coot.py +++ b/ot/coot.py @@ -148,7 +148,7 @@ def co_optimal_transport( duals_feature : (n_feature_x, n_feature_y) tuple, float Pair of dual vectors when solving OT problem w.r.t the feature coupling. distances : list, float - List of COOT distances. + List of COOT distances along iterations. References ---------- From 7738bb5387efd110137c8ee713201f4380a6a38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Wed, 11 Dec 2024 09:21:19 +0100 Subject: [PATCH 10/10] remove cuda --- .github/workflows/build_tests_cuda.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .github/workflows/build_tests_cuda.yml diff --git a/.github/workflows/build_tests_cuda.yml b/.github/workflows/build_tests_cuda.yml deleted file mode 100644 index 2d4e452c5..000000000 --- a/.github/workflows/build_tests_cuda.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Tests CUDA - -on: - workflow_dispatch: - pull_request_review: - types: [submitted] - -jobs: - linux-cuda: - - runs-on: pc-cuda - if: github.event.review.state == 'approved' || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/master') - - steps: - - uses: actions/checkout@v4 - - name: Install POT - run: | - python3.10 -m pip install --upgrade pip setuptools - python3.10 -m pip install --ignore-installed -e . - - name: Run tests - run: | - python3.10 -m pytest --durations=20 -v test/ ot/ --doctest-modules --color=yes --ignore=test/test_dr.py --ignore=ot.dr --ignore=ot.plot -