Browse Source

driver cpu: get rid off for now of variable STARPU_LIMIT_CPU_devid_MEM
as we do not take into account yet NUMA nodes

Nathalie Furmento 12 years ago
parent
commit
13e4291045
2 changed files with 5 additions and 9 deletions
  1. 2 3
      ChangeLog
  2. 3 6
      src/drivers/cpu/driver_cpu.c

+ 2 - 3
ChangeLog

@@ -92,9 +92,8 @@ New features:
     instead STARPU_LIMIT_CUDA_MEM and STARPU_LIMIT_OPENCL_MEM
   * Introduce new variables STARPU_LIMIT_CUDA_devid_MEM and
     STARPU_LIMIT_OPENCL_devid_MEM to limit memory per specific device
-  * Introduce new variables STARPU_LIMIT_CPU_MEM and
-    STARPU_LIMIT_CPU_devid_MEM to limit memory per all CPU or per
-    specific device
+  * Introduce new variable STARPU_LIMIT_CPU_MEM to limit memory for
+    the CPU devices
 
 Small features:
   * Add starpu_worker_get_by_type and starpu_worker_get_by_devid

+ 3 - 6
src/drivers/cpu/driver_cpu.c

@@ -193,14 +193,11 @@ static size_t _starpu_cpu_get_global_mem_size(int devid, struct _starpu_machine_
 {
 	ssize_t global_mem;
 	ssize_t limit;
-	char name[30];
 
 	limit = starpu_get_env_number("STARPU_LIMIT_CPU_MEM");
-	if (limit == -1)
-	{
-		sprintf(name, "STARPU_LIMIT_CPU_%u_MEM", devid);
-		limit = starpu_get_env_number(name);
-	}
+#ifdef STARPU_DEVEL
+#  warning TODO: take into account NUMA node and check STARPU_LIMIT_CPU_numanode_MEM
+#endif
 
 #if defined(STARPU_HAVE_HWLOC)
         int depth_node;