Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/quadratic solve #433

Merged
merged 7 commits into from
Sep 12, 2023
Merged

Feature/quadratic solve #433

merged 7 commits into from
Sep 12, 2023

Conversation

michalk8
Copy link
Collaborator

closes #432

@michalk8 michalk8 added the enhancement New feature or request label Sep 11, 2023
@michalk8 michalk8 self-assigned this Sep 11, 2023
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

Copy link
Contributor

@marcocuturi marcocuturi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is starting to look good! thanks a lot Michal

src/ott/solvers/quadratic/_solve.py Outdated Show resolved Hide resolved
src/ott/solvers/quadratic/_solve.py Outdated Show resolved Hide resolved
@michalk8 michalk8 added the documentation Improvements or additions to documentation label Sep 11, 2023
@codecov
Copy link

codecov bot commented Sep 11, 2023

Codecov Report

Merging #433 (62e0cf2) into main (b6d978d) will increase coverage by 0.09%.
The diff coverage is 71.42%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #433      +/-   ##
==========================================
+ Coverage   90.37%   90.46%   +0.09%     
==========================================
  Files          56       57       +1     
  Lines        6265     6273       +8     
  Branches      892      893       +1     
==========================================
+ Hits         5662     5675      +13     
+ Misses        459      454       -5     
  Partials      144      144              
Files Changed Coverage Δ
src/ott/problems/quadratic/quadratic_problem.py 81.42% <ø> (ø)
src/ott/solvers/linear/_solve.py 83.33% <ø> (ø)
src/ott/solvers/quadratic/gromov_wasserstein_lr.py 81.47% <ø> (ø)
src/ott/solvers/quadratic/_solve.py 61.53% <61.53%> (ø)
src/ott/problems/quadratic/quadratic_costs.py 70.83% <80.00%> (ø)
src/ott/solvers/linear/sinkhorn_lr.py 98.32% <100.00%> (-0.01%) ⬇️
src/ott/solvers/quadratic/gromov_wasserstein.py 85.18% <100.00%> (+1.73%) ⬆️

... and 1 file with indirect coverage changes

Copy link
Contributor

@marcocuturi marcocuturi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

"cell_type": "markdown",
"metadata": {},
"source": [
"We provide the Average FOSCTTM to align `X` (chromatinaccessibility domain) to `Y` (gene expression domain) for each implementation:"
"We provide the Average FOSCTTM to align `X` (chromatin accessibility domain) to `Y` (gene expression domain) for each implementation:"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the catch!

@@ -24,23 +24,54 @@ class Loss(NamedTuple): # noqa: D101
is_linear: bool


class GWLoss(NamedTuple): # noqa: D101
class GWLoss(NamedTuple):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@marcocuturi marcocuturi merged commit fd47e71 into main Sep 12, 2023
@marcocuturi marcocuturi deleted the feature/quadratic-solve branch September 12, 2023 12:19
michalk8 added a commit that referenced this pull request Jun 27, 2024
* Add `solve` function for quadratic problems

* Update docs

* Fix typo in notebook

* Fix implicit diff passing in LR Sinkhorn

* Fix typo

* Clean `GWLoss` docs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Solve function for quadratic solvers
2 participants