diff options
| author | Nathan Cassereau <84033440+ncassereau-idris@users.noreply.github.com> | 2022-06-01 08:52:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 08:52:47 +0200 |
| commit | 1f307594244dd4c274b64d028823cbcfff302f37 (patch) | |
| tree | f3302cde2a26a8b5c3869d722269e91c23a3ae5b /ot/lp/EMD.h | |
| parent | 951209ac3f01c86b35d3beff4679ce47e47c0872 (diff) | |
[MRG] numItermax in 64 bits in EMD solver (#380)
* Correct test_mm_convergence for cupy
* Fix bug where number of iterations is limited to 2^31
* Update RELEASES.md
* Replace size_t with long long
* Use uint64_t instead of long long
Diffstat (limited to 'ot/lp/EMD.h')
| -rw-r--r-- | ot/lp/EMD.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ot/lp/EMD.h b/ot/lp/EMD.h index 8a1f9ac..b56f060 100644 --- a/ot/lp/EMD.h +++ b/ot/lp/EMD.h @@ -18,6 +18,7 @@ #include <iostream> #include <vector> +#include <cstdint> typedef unsigned int node_id_type; @@ -28,8 +29,8 @@ enum ProblemType { MAX_ITER_REACHED }; -int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, int maxIter); -int EMD_wrap_omp(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, int maxIter, int numThreads); +int EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, uint64_t maxIter); +int EMD_wrap_omp(int n1,int n2, double *X, double *Y,double *D, double *G, double* alpha, double* beta, double *cost, uint64_t maxIter, int numThreads); |