|
@@ -106,9 +106,17 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
|
|
|
{
|
|
|
int id = workerid_array[i];
|
|
|
#ifndef STARPU_HAVE_WINDOWS
|
|
|
+#ifdef CPU_OR
|
|
|
CPU_OR(&combined_worker->cpu_set,
|
|
|
&combined_worker->cpu_set,
|
|
|
&config->workers[id].initial_cpu_set);
|
|
|
+#else
|
|
|
+ int j;
|
|
|
+ for (j = 0; j < CPU_SETSIZE; j++) {
|
|
|
+ if (CPU_ISSET(j, &config->workers[id].initial_cpu_set))
|
|
|
+ CPU_SET(j, &combined_worker->cpu_set);
|
|
|
+ }
|
|
|
+#endif
|
|
|
#endif /* STARPU_HAVE_WINDOWS */
|
|
|
|
|
|
#ifdef STARPU_HAVE_HWLOC
|