Skip to content

[MRG] Correct pointer overflow in EMD #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rflamary merged 10 commits into from
Jun 13, 2022
Merged

[MRG] Correct pointer overflow in EMD #381

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61131cc
avoid overflow on openmp version of emd solver
ncassereau Jun 3, 2022
4845d3b
monothread version updated
ncassereau Jun 7, 2022
a309ae9
Fixed typo in readme
ncassereau Jun 7, 2022
fd99173
added PR in releases
ncassereau Jun 7, 2022
af8f721
typo in releases.md
ncassereau Jun 7, 2022
c52aa33
added a precision to releases.md
ncassereau Jun 7, 2022
6c53b24
added a precision to releases.md
ncassereau Jun 7, 2022
6671bbb
correct readme
ncassereau Jun 8, 2022
43f743e
forgot to cast
ncassereau Jun 8, 2022
ee08444
lower error
ncassereau Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
avoid overflow on openmp version of emd solver
  • Loading branch information
@ncassereau
ncassereau committed Jun 3, 2022
commit 61131ccd32efffe2b721d0862fc94fc2d43b403d
18 changes: 9 additions & 9 deletions ot/lp/EMD_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ int EMD_wrap_omp(int n1, int n2, double *X, double *Y, double *D, double *G,
// beware M and C are stored in row major C style!!!

using namespace lemon_omp;
int n, m, cur;
uint64_t n, m, cur;

typedef FullBipartiteDigraph Digraph;
DIGRAPH_TYPEDEFS(Digraph);
Expand All @@ -153,15 +153,15 @@ int EMD_wrap_omp(int n1, int n2, double *X, double *Y, double *D, double *G,

// Define the graph

std::vector<int> indI(n), indJ(m);
std::vector<uint64_t> indI(n), indJ(m);
std::vector<double> weights1(n), weights2(m);
Digraph di(n, m);
NetworkSimplexSimple<Digraph,double,double, node_id_type> net(di, true, n+m, ((int64_t)n)*((int64_t)m), maxIter, numThreads);
NetworkSimplexSimple<Digraph,double,double, node_id_type> net(di, true, (int) (n + m), n * m, maxIter, numThreads);

// Set supply and demand, don't account for 0 values (faster)

cur=0;
for (int i=0; i<n1; i++) {
for (uint64_t i=0; i<n1; i++) {
double val=*(X+i);
if (val>0) {
weights1[ cur ] = val;
Expand All @@ -172,7 +172,7 @@ int EMD_wrap_omp(int n1, int n2, double *X, double *Y, double *D, double *G,
// Demand is actually negative supply...

cur=0;
for (int i=0; i<n2; i++) {
for (uint64_t i=0; i<n2; i++) {
double val=*(Y+i);
if (val>0) {
weights2[ cur ] = -val;
Expand All @@ -181,12 +181,12 @@ int EMD_wrap_omp(int n1, int n2, double *X, double *Y, double *D, double *G,
}


net.supplyMap(&weights1[0], n, &weights2[0], m);
net.supplyMap(&weights1[0], (int) n, &weights2[0], (int) m);

// Set the cost of each edge
int64_t idarc = 0;
for (int i=0; i<n; i++) {
for (int j=0; j<m; j++) {
for (uint64_t i=0; i<n; i++) {
for (uint64_t j=0; j<m; j++) {
double val=*(D+indI[i]*n2+indJ[j]);
net.setCost(di.arcFromId(idarc), val);
++idarc;
Expand All @@ -197,7 +197,7 @@ int EMD_wrap_omp(int n1, int n2, double *X, double *Y, double *D, double *G,
// Solve the problem with the network simplex algorithm

int ret=net.run();
int i, j;
uint64_t i, j;
if (ret==(int)net.OPTIMAL || ret==(int)net.MAX_ITER_REACHED) {
*cost = 0;
Arc a; di.first(a);
Expand Down