Skip to content
Snippets Groups Projects
Commit 5ce41e31 authored by Ivan Tagliaferro's avatar Ivan Tagliaferro
Browse files

Fix some function calls

parent 8e517ef7
No related branches found
No related tags found
No related merge requests found
...@@ -353,7 +353,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i ...@@ -353,7 +353,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i
initRoot(&root, jobs); initRoot(&root, jobs);
SinglePool_ext pool; SinglePool_ext pool;
initSinglePool(&pool); initSinglePool_ext(&pool);
pushBack(&pool, root); pushBack(&pool, root);
...@@ -380,7 +380,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i ...@@ -380,7 +380,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i
*/ */
while (pool.size < numLocales*D*m) { while (pool.size < numLocales*D*m) {
int hasWork = 0; int hasWork = 0;
Node parent = popFront(&pool, &hasWork); Node parent = popFrontFree(&pool, &hasWork);
if (!hasWork) break; if (!hasWork) break;
decompose(jobs, lb, best, lbound1, lbound2, parent, exploredTree, exploredSol, &pool); decompose(jobs, lb, best, lbound1, lbound2, parent, exploredTree, exploredSol, &pool);
...@@ -420,7 +420,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i ...@@ -420,7 +420,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i
int eachBest[D]; int eachBest[D];
SinglePool_ext pool_lloc; SinglePool_ext pool_lloc;
initSinglePool(&pool_lloc); initSinglePool_ext(&pool_lloc);
// each locale gets its chunk (locID is the same as rank) // each locale gets its chunk (locID is the same as rank)
for (int i = 0; i < c; i++) { for (int i = 0; i < c; i++) {
...@@ -445,7 +445,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i ...@@ -445,7 +445,7 @@ void pfsp_search(const int inst, const int lb, const int m, const int M, const i
SinglePool_ext multiPool[D]; SinglePool_ext multiPool[D];
for (int i = 0; i < D; i++) for (int i = 0; i < D; i++)
initSinglePool(&multiPool[i]); initSinglePool_ext(&multiPool[i]);
// Boolean variables for termination detection // Boolean variables for termination detection
_Atomic bool allTasksIdleFlag = false; _Atomic bool allTasksIdleFlag = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment