Merge branch 'master' into partialfgw

Author: cedricvincentcuaz

CITATION.cff

@@ -0,0 +1,88 @@
+# CFF file for POT contributors
+
+cff-version: 1.2.0
+title: POT Python Optimal Transport
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Rémi
+    family-names: Flamary
+    affiliation: École Polytechnique
+    orcid: 'https://orcid.org/0000-0002-4212-6627'
+  - given-names: Cédric
+    family-names: Vincent-Cuaz
+    affiliation: EPFL
+  - given-names: Nicolas
+    family-names: Courty
+    affiliation: Université Bretagne Sud
+  - given-names: Alexandre
+    family-names: Gramfort
+    affiliation: INRIA
+  - given-names: Oleksii
+    family-names: Kachaiev
+    affiliation: Università degli Studi di Genova
+  - given-names: Huy
+    family-names: Quang Tran
+    affiliation: Université Bretagne Sud
+  - given-names: Laurène
+    family-names: David
+    affiliation: Institut Polytechnique de Paris
+  - given-names: Clément
+    family-names: Bonet
+    affiliation: ENSAE - CREST
+  - given-names: Nathan
+    family-names: Cassereau
+    affiliation: IDRIS-CNRS
+  - given-names: Théo
+    family-names: Gnassounou
+    affiliation: INRIA
+  - given-names: Eloi
+    family-names: Tanguy
+    affiliation: Université Paris-Cité
+  - given-names: Julie
+    family-names: Delon
+    affiliation: Université Paris-Cité
+  - given-names: Antoine
+    family-names: Collas
+    affiliation: INRIA
+  - given-names: Sonia
+    family-names: Mazelet
+    affiliation: Ecole Polytechnique
+  - given-names: Laetitia
+    family-names: Chapel
+    affiliation: Institut Agro Rennes-Angers, IRISA
+  - given-names: Tanguy
+    family-names: Kerdoncuff
+    affiliation: Université de Lyon
+  - given-names: Xizheng
+    family-names: Yu
+    affiliation: Brown University
+  - given-names: Matthew
+    family-names: Feickert
+    affiliation: University of Wisconsin-Madison
+  - given-names: Paul
+    family-names: Krzakala
+    affiliation: Telecom Paris
+  - given-names: Tianlin
+    family-names: Liu
+    affiliation: University of Basel
+  - given-names: Eduardo
+    family-names: Fernandes Montesuma
+    affiliation: Université Paris-Saclay & CEA-List
+    orcid: 'https://orcid.org/0000-0003-3850-4602'
+identifiers:
+  - type: url
+    value: 'https://github.com/PythonOT/POT'
+    description: Code
+repository-code: 'https://github.com/PythonOT/POT'
+url: 'https://pythonot.github.io/'
+keywords:
+  - optimal transport
+  - python
+  - sinkhorn
+  - wasserstein
+  - gromov-wasserstein
+license: MIT
+version: 0.9.5

README.md

@@ -72,16 +72,23 @@ Some other examples are available in the  [documentation](https://pythonot.githu
 #### Using and citing the toolbox
 
 If you use this toolbox in your research and find it useful, please cite POT
-using the following reference from our [JMLR paper](https://jmlr.org/papers/v22/20-451.html):
+using the following references from the current version and from our [JMLR
+paper](https://jmlr.org/papers/v22/20-451.html):
 
-    Rémi Flamary, Nicolas Courty, Alexandre Gramfort, Mokhtar Z. Alaya, Aurélie Boisbunon, Stanislas Chambon, Laetitia Chapel, Adrien Corenflos, Kilian Fatras, Nemo Fournier, Léo Gautheron, Nathalie T.H. Gayraud, Hicham Janati, Alain Rakotomamonjy, Ievgen Redko, Antoine Rolet, Antony Schutz, Vivien Seguy, Danica J. Sutherland, Romain Tavenard, Alexander Tong, Titouan Vayer,
-    POT Python Optimal Transport library,
-    Journal of Machine Learning Research, 22(78):1−8, 2021.
-    Website: https://pythonot.github.io/
+    Flamary R., Vincent-Cuaz C., Courty N., Gramfort A., Kachaiev O., Quang Tran H., David L., Bonet C., Cassereau N., Gnassounou T., Tanguy E., Delon J., Collas A., Mazelet S., Chapel L., Kerdoncuff T., Yu X., Feickert M., Krzakala P., Liu T., Fernandes Montesuma E. POT Python Optimal Transport (version 0.9.5). URL: https://github.com/PythonOT/POT
+
+    Rémi Flamary, Nicolas Courty, Alexandre Gramfort, Mokhtar Z. Alaya, Aurélie Boisbunon, Stanislas Chambon, Laetitia Chapel, Adrien Corenflos, Kilian Fatras, Nemo Fournier, Léo Gautheron, Nathalie T.H. Gayraud, Hicham Janati, Alain Rakotomamonjy, Ievgen Redko, Antoine Rolet, Antony Schutz, Vivien Seguy, Danica J. Sutherland, Romain Tavenard, Alexander Tong, Titouan Vayer, POT Python Optimal Transport library, Journal of Machine Learning Research, 22(78):1−8, 2021. URL: https://pythonot.github.io/
 
 In Bibtex format:
 
 ```bibtex
+@misc{flamary2024pot,
+  author = {Flamary, R{\'e}mi and Vincent-Cuaz, C{\'e}dric and Courty, Nicolas and Gramfort, Alexandre and Kachaiev, Oleksii and Quang Tran, Huy and David, Laurène and Bonet, Cl{\'e}ment and Cassereau, Nathan and Gnassounou, Th{\'e}o and Tanguy, Eloi and Delon, Julie and Collas, Antoine and Mazelet, Sonia and Chapel, Laetitia and Kerdoncuff, Tanguy and Yu, Xizheng and Feickert, Matthew and Krzakala, Paul and Liu, Tianlin and Fernandes Montesuma, Eduardo},
+  title = {POT Python Optimal Transport (version 0.9.5)},
+  url = {https://github.com/PythonOT/POT},
+  year = {2024}
+}
+
 @article{flamary2021pot,
   author  = {R{\'e}mi Flamary and Nicolas Courty and Alexandre Gramfort and Mokhtar Z. Alaya and Aur{\'e}lie Boisbunon and Stanislas Chambon and Laetitia Chapel and Adrien Corenflos and Kilian Fatras and Nemo Fournier and L{\'e}o Gautheron and Nathalie T.H. Gayraud and Hicham Janati and Alain Rakotomamonjy and Ievgen Redko and Antoine Rolet and Antony Schutz and Vivien Seguy and Danica J. Sutherland and Romain Tavenard and Alexander Tong and Titouan Vayer},
   title   = {POT: Python Optimal Transport},