always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue re-architecture of CP-SAT search

Browse Source
This commit is contained in:
Laurent Perron
2019-07-05 09:33:04 +02:00
parent afc4ad1214
commit 98b59bc5e2
7 changed files with 204 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ortools/sat/subsolver.cc
View File

@@ -41,6 +41,7 @@ int NextSubsolverToSchedule(
}
}
}
if (best != -1) VLOG(1) << "Scheduling " << subsolvers[best]->name();
return best;
}
@@ -169,11 +170,13 @@ void NonDeterministicLoop(
num_scheduled_and_not_done++;
}
std::function<void()> task = subsolvers[best]->GenerateTask(task_id++);
pool.Schedule([task, num_threads, &mutex, &num_scheduled_and_not_done,
const std::string name = subsolvers[best]->name();
pool.Schedule([task, num_threads, name, &mutex, &num_scheduled_and_not_done,
&thread_available_condition]() {
task();
absl::MutexLock mutex_lock(&mutex);
VLOG(1) << name << " done.";
num_scheduled_and_not_done--;
if (num_scheduled_and_not_done == num_threads - 1) {
thread_available_condition.SignalAll();