summaryrefslogtreecommitdiff
path: root/ot/gpu/utils.py
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2018-09-28 09:41:22 +0200
committerRémi Flamary <remi.flamary@gmail.com>2018-09-28 09:41:22 +0200
commitee8ed4fa101861eec9e578f09aee4367af593af1 (patch)
tree1996b7edaafe5f671a5275a37d6fd5cf7bf2051a /ot/gpu/utils.py
parent5e7bfbcbc99ce5915873147677b434c0b1d10fc8 (diff)
update documentation
Diffstat (limited to 'ot/gpu/utils.py')
-rw-r--r--ot/gpu/utils.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/ot/gpu/utils.py b/ot/gpu/utils.py
index d349a6d..41e168a 100644
--- a/ot/gpu/utils.py
+++ b/ot/gpu/utils.py
@@ -16,19 +16,22 @@ import cupy as cp # cp used for cupy specific operations
def euclidean_distances(a, b, squared=False, to_numpy=True):
"""
Compute the pairwise euclidean distance between matrices a and b.
- Parameters
+
+ If the input matrix are in numpy format, they will be uploaded to the
+ GPU first which can incur significant time overhead.
+
+ Parameters
----------
a : np.ndarray (n, f)
first matrix
b : np.ndarray (m, f)
second matrix
- gpu : boolean, optional (default False)
- if True and the module cupy is available, the computation is done
- on the GPU and the type of the matrix returned is cupy.ndarray.
- Otherwise, compute on the CPU and returns np.ndarray.
+ to_numpy : boolean, optional (default True)
+ If true convert back the GPU array result to numpy format.
squared : boolean, optional (default False)
if True, return squared euclidean distance matrix
- Returns
+
+ Returns
-------
c : (n x m) np.ndarray or cupy.ndarray
pairwise euclidean distance distance matrix