summaryrefslogtreecommitdiff
path: root/ot
diff options
context:
space:
mode:
Diffstat (limited to 'ot')
-rw-r--r--ot/lp/__init__.py1
-rw-r--r--ot/lp/emd_wrap.pyx2
2 files changed, 1 insertions, 2 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py
index 9a0cb1c..ae5b08c 100644
--- a/ot/lp/__init__.py
+++ b/ot/lp/__init__.py
@@ -201,7 +201,6 @@ def emd2(a, b, M, processes=multiprocessing.cpu_count(), max_iter=100000, log=Fa
if len(b.shape) == 1:
return f(b)
nb = b.shape[1]
- # res = [emd2_c(a, b[:, i].copy(), M, numItermax) for i in range(nb)]
res = parmap(f, [b[:, i] for i in range(nb)], processes)
return res
diff --git a/ot/lp/emd_wrap.pyx b/ot/lp/emd_wrap.pyx
index 83ee6aa..2fcc0e4 100644
--- a/ot/lp/emd_wrap.pyx
+++ b/ot/lp/emd_wrap.pyx
@@ -29,7 +29,7 @@ def check_result(result_code):
elif result_code == UNBOUNDED:
message = "Problem unbounded"
elif result_code == MAX_ITER_REACHED:
- message = "numItermax reached before optimality. Try to increase numItermax."
+ message = "max_iter reached before optimality. Try to increase max_iter."
warnings.warn(message)
return message