소스 검색

src/drivers/cpu/driver_cpu.c: fix unit for limited memory size

Nathalie Furmento 12 년 전
부모
커밋
0e7dedf3a9
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/drivers/cpu/driver_cpu.c

+ 2 - 2
src/drivers/cpu/driver_cpu.c

@@ -222,12 +222,12 @@ static size_t _starpu_cpu_get_global_mem_size(int devid, struct _starpu_machine_
 	if (limit == -1)
 	if (limit == -1)
 		// No limit is defined, we return the global memory size
 		// No limit is defined, we return the global memory size
 		return global_mem;
 		return global_mem;
-	else if (limit > global_mem)
+	else if (limit*1024*1024 > global_mem)
 		// The requested limit is higher than what is available, we return the global memory size
 		// The requested limit is higher than what is available, we return the global memory size
 		return global_mem;
 		return global_mem;
 	else
 	else
 		// We limit the memory
 		// We limit the memory
-		return limit;
+		return limit*1024*1024;
 }
 }
 
 
 int _starpu_cpu_driver_init(struct starpu_driver *d)
 int _starpu_cpu_driver_init(struct starpu_driver *d)