Skip to content

Commit

Permalink
Merge branch 'master' into partialfgw
Browse files Browse the repository at this point in the history
  • Loading branch information
rflamary authored Dec 12, 2024
2 parents 52298f1 + 1fa685a commit 9a735d1
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 24 deletions.
97 changes: 97 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@

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/**

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/**
1 change: 1 addition & 0 deletions .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
pre-commit install --install-hooks
pre-commit run --all-files
linux:

runs-on: ubuntu-latest
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/build_tests_cuda.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/check_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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/changed-files@v45
id: changed-release-file
with:
files: 'RELEASES.md'
- name: Check if RELEASES.md file is changed
if: steps.changed-release-file.outputs.any_changed == 'false'
run: exit 1
14 changes: 14 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Pull Request Labeler"

on:
pull_request:
branches:
- 'master'
jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
1 change: 1 addition & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ignore: |
.github/workflows/*.yml
.circleci/config.yml
codecov.yml
.github/labeler.yml
rules:
line-length: disable
Expand Down
1 change: 1 addition & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Implement CG solvers for partial FGW (PR #687)
- Added feature `grad=last_step` for `ot.solvers.solve` (PR #693)
- Implement projected gradient descent solvers for entropic partial FGW (PR #702)
- 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)
Expand Down
2 changes: 1 addition & 1 deletion ot/coot.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------
Expand Down

0 comments on commit 9a735d1

Please sign in to comment.