diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-11-20 09:29:27 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2019-11-20 09:29:27 +0100 |
| commit | 7008061749a52e9717d550b44efe60173f4128b5 (patch) | |
| tree | f0d53c7a5cb849e3d12d03c45935673969cb4fcb /src/python/doc/installation.rst | |
| parent | 8227cd68d5aa7c9eeda5dd474f2536b896b6f491 (diff) | |
| parent | 445a217f4869c62888a20302491b085fbcaabd1b (diff) | |
Merge branch 'master' into persistence_graphical_tool_improvements
Diffstat (limited to 'src/python/doc/installation.rst')
| -rw-r--r-- | src/python/doc/installation.rst | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst index 77d9e8b3..7699a5bb 100644 --- a/src/python/doc/installation.rst +++ b/src/python/doc/installation.rst @@ -8,7 +8,7 @@ Installation Conda ***** The easiest way to install the Python version of GUDHI is using -`conda <https://gudhi.inria.fr/licensing/>`_. +`conda <https://gudhi.inria.fr/conda/>`_. Compiling ********* @@ -215,12 +215,20 @@ The following examples require the `Matplotlib <http://matplotlib.org>`_: * :download:`euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py <../example/euclidean_strong_witness_complex_diagram_persistence_from_off_file_example.py>` * :download:`euclidean_witness_complex_diagram_persistence_from_off_file_example.py <../example/euclidean_witness_complex_diagram_persistence_from_off_file_example.py>` +Python Optimal Transport +======================== + +The :doc:`Wasserstein distance </wasserstein_distance_user>` +module requires `POT <https://pot.readthedocs.io/>`_, a library that provides +several solvers for optimization problems related to Optimal Transport. + SciPy ===== -The :doc:`persistence graphical tools </persistence_graphical_tools_user>` -module requires `SciPy <http://scipy.org>`_, a Python-based ecosystem of -open-source software for mathematics, science, and engineering. +The :doc:`persistence graphical tools </persistence_graphical_tools_user>` and +:doc:`Wasserstein distance </wasserstein_distance_user>` modules require `SciPy +<http://scipy.org>`_, a Python-based ecosystem of open-source software for +mathematics, science, and engineering. Threading Building Blocks ========================= |