Prechádzať zdrojové kódy

topology: do not use CPU_SET functions on windows systems

Nathalie Furmento 14 rokov pred
rodič
commit
6922124dd0
3 zmenil súbory, kde vykonal 10 pridanie a 0 odobranie
  1. 4 0
      src/core/combined_workers.c
  2. 2 0
      src/core/topology.c
  3. 4 0
      src/core/workers.h

+ 4 - 0
src/core/combined_workers.c

@@ -86,7 +86,9 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 	/* Save the list of combined workers */
 	memcpy(&combined_worker->combined_workerid, workerid_array, nworkers*sizeof(int));
 
+#ifndef STARPU_HAVE_WINDOWS
 	CPU_ZERO(&combined_worker->cpu_set);
+#endif /* STARPU_HAVE_WINDOWS */
 #ifdef STARPU_HAVE_HWLOC
 	combined_worker->hwloc_cpu_set = hwloc_cpuset_alloc();
 #endif
@@ -94,9 +96,11 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 	for (i = 0; i < nworkers; i++)
 	{
 		int id = workerid_array[i];
+#ifndef STARPU_HAVE_WINDOWS
 		CPU_OR(&combined_worker->cpu_set,
 			&combined_worker->cpu_set,
 			&config->workers[id].initial_cpu_set);
+#endif /* STARPU_HAVE_WINDOWS */
 
 #ifdef STARPU_HAVE_HWLOC
 		hwloc_cpuset_or(combined_worker->hwloc_cpu_set,

+ 2 - 0
src/core/topology.c

@@ -701,11 +701,13 @@ static void _starpu_init_workers_binding(struct starpu_machine_config_s *config)
 
 		workerarg->memory_node = memory_node;
 
+#ifndef STARPU_HAVE_WINDOWS
 		/* Save the initial cpuset */
 		CPU_ZERO(&workerarg->initial_cpu_set);
 		CPU_SET(workerarg->bindid, &workerarg->initial_cpu_set);
 		CPU_ZERO(&workerarg->current_cpu_set);
 		CPU_SET(workerarg->bindid, &workerarg->current_cpu_set);
+#endif /* STARPU_HAVE_WINDOWS */
 
 #ifdef STARPU_HAVE_HWLOC
 		/* Clear the cpu set and set the cpu */

+ 4 - 0
src/core/workers.h

@@ -81,8 +81,10 @@ struct starpu_worker_s {
 	starpu_worker_status status; /* what is the worker doing now ? (eg. CALLBACK) */
 	char name[32];
 
+#ifndef STARPU_HAVE_WINDOWS
 	cpu_set_t initial_cpu_set;
 	cpu_set_t current_cpu_set;
+#endif /* STARPU_HAVE_WINDOWS */
 #ifdef STARPU_HAVE_HWLOC
 	hwloc_cpuset_t initial_hwloc_cpu_set;
 	hwloc_cpuset_t current_hwloc_cpu_set;
@@ -96,7 +98,9 @@ struct starpu_combined_worker_s {
 	unsigned memory_node; /* which memory node is associated that worker to ? */
 	int combined_workerid[STARPU_NMAXWORKERS];
 
+#ifndef STARPU_HAVE_WINDOWS
 	cpu_set_t cpu_set;
+#endif /* STARPU_HAVE_WINDOWS */
 #ifdef STARPU_HAVE_HWLOC
 	hwloc_cpuset_t hwloc_cpu_set;
 #endif