Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
14e2e0d
first implementation of sliced ot plans with example
eloitanguy Sep 12, 2025
2911166
tests + temperature option in expected-sliced
eloitanguy Sep 16, 2025
134846c
fixed cell rendering in example
eloitanguy Sep 16, 2025
fc80010
Merge branch 'master' into dev_sliced_plans
eloitanguy Sep 17, 2025
414a295
ref number update
eloitanguy Sep 17, 2025
778bc73
skip jax and tf in expected sliced testing due to array assignment
eloitanguy Sep 17, 2025
7c9761f
Merge branch 'master' into dev_sliced_plans
eloitanguy Sep 22, 2025
08c5348
raise NotImplementedError when expected_sliced is used with tf or jax
eloitanguy Sep 22, 2025
4f3a151
Merge branch 'master' into dev_sliced_plans
eloitanguy Oct 7, 2025
40a978e
update with n\neq m and a\neq b
lchapel Oct 7, 2025
cd6ce31
update lint
lchapel Oct 7, 2025
01e53c3
update contributing.md
lchapel Oct 7, 2025
86749e0
update tests for sliced plans
lchapel Oct 7, 2025
83b653b
update tests and doc
lchapel Oct 8, 2025
e591737
update tests and doc
lchapel Oct 8, 2025
85056c6
update tests and doc
lchapel Oct 8, 2025
7561530
update tests with backend
lchapel Oct 8, 2025
2f4b675
update tests with backend and improve code coverage
lchapel Oct 8, 2025
15e0d71
PR number, authot update, and small backend fix
eloitanguy Oct 10, 2025
aee78fc
deleted debug files
eloitanguy Oct 10, 2025
dd1b31f
dense computation of costs for sliced_plans with jax
eloitanguy Oct 10, 2025
652b49d
jax .data fix + backend typing fix in sliced_plans test function
eloitanguy Oct 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 113 additions & 88 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
Contributing to POT
===================
# Contributing to POT

First off, thank you for considering contributing to POT.

First off, thank you for considering contributing to POT.

How to contribute
-----------------
## How to contribute

The preferred workflow for contributing to POT is to fork the
[main repository](https://github.com/rflamary/POT) on
Expand All @@ -23,7 +20,7 @@ GitHub, clone, and develop on a branch. Steps:
$ cd POT
```

2. Install pre-commit hooks to ensure that your code is properly formatted:
3. Install pre-commit hooks to ensure that your code is properly formatted:

```bash
$ pip install pre-commit
Expand All @@ -32,15 +29,48 @@ GitHub, clone, and develop on a branch. Steps:

This will install the pre-commit hooks that will run on every commit. If the hooks fail, the commit will be aborted.

3. Create a ``feature`` branch to hold your development changes:
4. Create a `feature` branch to hold your development changes:

```bash
$ git checkout -b my-feature
```

Always use a ``feature`` branch. It's good practice to never work on the ``master`` branch!
Always use a `feature` branch. It's good practice to never work on the `master` branch!

5. Install a recent version of Python (e.g. 3.10), using conda for instance. You can create a conda environment and activate it:

```bash
$ conda create -n dev-pot-env python=3.10
$ conda activate dev-pot-env
```

6. Install all the necessary packages in your environment:

4. Develop the feature on your feature branch. Add changed files using ``git add`` and then ``git commit`` files:
```bash
$ pip install -r requirements_all.txt
```

6. Install a compiler with OpenMP support for your platform (see details on the [scikit-learn contributing guide](https://scikit-learn.org/stable/developers/advanced_installation.html#platform-specific-instructions)).
For instance, with macOS, Apple clang does not support OpenMP. One can install the LLVM OpenMP library from homebrew:

```bash
$ brew install libomp
```

and set environment variables:

```bash
$ export CC=/usr/local/opt/llvm/bin/clang
$ export CXX=/usr/local/opt/llvm/bin/clang++
```

7. Build the projet with pip:

```bash
pip install -e .
```

8. Develop the feature on your feature branch. Add changed files using `git add` and then `git commit` files:

```bash
$ git add modified_files
Expand All @@ -53,117 +83,114 @@ GitHub, clone, and develop on a branch. Steps:
$ git push -u origin my-feature
```

5. Follow [these instructions](https://help.github.com/articles/creating-a-pull-request-from-a-fork)
to create a pull request from your fork. This will send an email to the committers.
9. Follow [these instructions](https://help.github.com/articles/creating-a-pull-request-from-a-fork)
to create a pull request from your fork. This will send an email to the committers.

(If any of the above seems like magic to you, please look up the
[Git documentation](https://git-scm.com/documentation) on the web, or ask a friend or another contributor for help.)

Pull Request Checklist
----------------------
## Pull Request Checklist

We recommended that your contribution complies with the
following rules before you submit a pull request:

- Follow the PEP8 Guidelines which should be handles automatically by pre-commit.

- If your pull request addresses an issue, please use the pull request title
to describe the issue and mention the issue number in the pull request description. This will make sure a link back to the original issue is
created.

- All public methods should have informative docstrings with sample
usage presented as doctests when appropriate.

- Please prefix the title of your pull request with `[MRG]` (Ready for
Merge), if the contribution is complete and ready for a detailed review.
Two core developers will review your code and change the prefix of the pull
request to `[MRG + 1]` and `[MRG + 2]` on approval, making it eligible
for merging. An incomplete contribution -- where you expect to do more work before
receiving a full review -- should be prefixed `[WIP]` (to indicate a work
in progress) and changed to `[MRG]` when it matures. WIPs may be useful
to: indicate you are working on something to avoid duplicated work,
request broad review of functionality or API, or seek collaborators.
WIPs often benefit from the inclusion of a
[task list](https://github.com/blog/1375-task-lists-in-gfm-issues-pulls-comments)
in the PR description.


- When adding additional functionality, provide at least one
example script in the ``examples/`` folder. Have a look at other
examples for reference. Examples should demonstrate why the new
functionality is useful in practice and, if possible, compare it
to other methods available in POT.

- Documentation and high-coverage tests are necessary for enhancements to be
accepted. Bug-fixes or new features should be provided with
[non-regression tests](https://en.wikipedia.org/wiki/Non-regression_testing).
These tests verify the correct behavior of the fix or feature. In this
manner, further modifications on the code base are granted to be consistent
with the desired behavior.
For the Bug-fixes case, at the time of the PR, this tests should fail for
the code base in master and pass for the PR code.

- At least one paragraph of narrative documentation with links to
references in the literature (with PDF links when possible) and
the example.
* Follow the PEP8 Guidelines which should be handles automatically by pre-commit.

* If your pull request addresses an issue, please use the pull request title
to describe the issue and mention the issue number in the pull request description. This will make sure a link back to the original issue is
created.

* All public methods should have informative docstrings with sample
usage presented as doctests when appropriate.

* Please prefix the title of your pull request with `[MRG]` (Ready for
Merge), if the contribution is complete and ready for a detailed review.
Two core developers will review your code and change the prefix of the pull
request to `[MRG + 1]` and `[MRG + 2]` on approval, making it eligible
for merging. An incomplete contribution -- where you expect to do more work before
receiving a full review -- should be prefixed `[WIP]` (to indicate a work
in progress) and changed to `[MRG]` when it matures. WIPs may be useful
to: indicate you are working on something to avoid duplicated work,
request broad review of functionality or API, or seek collaborators.
WIPs often benefit from the inclusion of a
[task list](https://github.com/blog/1375-task-lists-in-gfm-issues-pulls-comments)
in the PR description.

* When adding additional functionality, provide at least one
example script in the `examples/` folder. Have a look at other
examples for reference. Examples should demonstrate why the new
functionality is useful in practice and, if possible, compare it
to other methods available in POT.

* Documentation and high-coverage tests are necessary for enhancements to be
accepted. Bug-fixes or new features should be provided with
[non-regression tests](https://en.wikipedia.org/wiki/Non-regression_testing).
These tests verify the correct behavior of the fix or feature. In this
manner, further modifications on the code base are granted to be consistent
with the desired behavior.
For the Bug-fixes case, at the time of the PR, this tests should fail for
the code base in master and pass for the PR code.

* At least one paragraph of narrative documentation with links to
references in the literature (with PDF links when possible) and
the example.

You can also check for common programming errors with the following
tools:

- All lint checks pass. You can run the following command to check:
* All lint checks pass. You can run the following command to check:

```bash
$ pre-commit run --all-files
```

This will run the pre-commit checks on all files in the repository.

- All tests pass. You can run the following command to check:
* All tests pass. You can run the following command to check:

```bash
$ pytest --durations=20 -v test/ --doctest-modules
```
```

Bonus points for contributions that include a performance analysis with
a benchmark script and profiling output (please report on the mailing
list or on the GitHub issue).

Filing bugs
-----------
## Filing bugs

We use Github issues to track all bugs and feature requests; feel free to
open an issue if you have found a bug or wish to see a feature implemented.

It is recommended to check that your issue complies with the
following rules before submitting:

- Verify that your issue is not being currently addressed by other
[issues](https://github.com/rflamary/POT/issues?q=)
or [pull requests](https://github.com/rflamary/POT/pulls?q=).
* Verify that your issue is not being currently addressed by other
[issues](https://github.com/rflamary/POT/issues?q=)
or [pull requests](https://github.com/rflamary/POT/pulls?q=).

- Please ensure all code snippets and error messages are formatted in
appropriate code blocks.
See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks).
* Please ensure all code snippets and error messages are formatted in
appropriate code blocks.
See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks).

- Please include your operating system type and version number, as well
as your Python, POT, numpy, and scipy versions. This information
can be found by running the following code snippet:
* Please include your operating system type and version number, as well
as your Python, POT, numpy, and scipy versions. This information
can be found by running the following code snippet:

```python
import platform; print(platform.platform())
import sys; print("Python", sys.version)
import numpy; print("NumPy", numpy.__version__)
import scipy; print("SciPy", scipy.__version__)
import ot; print("POT", ot.__version__)
```
```python
import platform; print(platform.platform())
import sys; print("Python", sys.version)
import numpy; print("NumPy", numpy.__version__)
import scipy; print("SciPy", scipy.__version__)
import ot; print("POT", ot.__version__)
```

- Please be specific about what estimators and/or functions are involved
and the shape of the data, as appropriate; please include a
[reproducible](http://stackoverflow.com/help/mcve) code snippet
or link to a [gist](https://gist.github.com). If an exception is raised,
please provide the traceback.
* Please be specific about what estimators and/or functions are involved
and the shape of the data, as appropriate; please include a
[reproducible](http://stackoverflow.com/help/mcve) code snippet
or link to a [gist](https://gist.github.com). If an exception is raised,
please provide the traceback.

New contributor tips
--------------------
## New contributor tips

A great way to start contributing to POT is to pick an item
from the list of [Easy issues](https://github.com/rflamary/POT/issues?labels=Easy)
Expand All @@ -173,17 +200,16 @@ assistance in this area will be greatly appreciated by the more
experienced developers as it helps free up their time to concentrate on
other issues.

Documentation
-------------
## Documentation

We are glad to accept any sort of documentation: function docstrings,
reStructuredText documents (like this one), tutorials, etc.
reStructuredText documents live in the source code repository under the
doc/ directory.

You can edit the documentation using any text editor and then generate
the HTML output by typing ``make html`` from the ``docs/`` directory.
Alternatively, ``make`` can be used to quickly generate the
the HTML output by typing `make html` from the `docs/` directory.
Alternatively, `make` can be used to quickly generate the
documentation without the example gallery with `make html-noplot`. The resulting HTML files will
be placed in `docs/build/html/` and are viewable in a web browser.

Expand All @@ -199,5 +225,4 @@ start with a small paragraph with a hand-waving explanation of what the
method does to the data and a figure (coming from an example)
illustrating it.


This Contribution guide is strongly inspired by the one of the [scikit-learn](https://github.com/scikit-learn/scikit-learn) team.
Loading
Loading