소스 검색

Merge from trunk @11519:11525

Marc Sergent 11 년 전
부모
커밋
bc01c15ee4
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 2
      examples/stencil/stencil-kernels.c
  2. 2 2
      src/core/perfmodel/perfmodel_history.c

+ 3 - 2
examples/stencil/stencil-kernels.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  *
  * Copyright (C) 2010-2013  Université de Bordeaux 1
  * Copyright (C) 2010-2013  Université de Bordeaux 1
- * Copyright (C) 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2012, 2013  Centre National de la Recherche Scientifique
  *
  *
  * StarPU is free software; you can redistribute it and/or modify
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * it under the terms of the GNU Lesser General Public License as published by
@@ -295,7 +295,8 @@ static void load_subblock_from_buffer_opencl(struct starpu_block_interface *bloc
 
 
         cl_command_queue cq;
         cl_command_queue cq;
         starpu_opencl_get_current_queue(&cq);
         starpu_opencl_get_current_queue(&cq);
-        clEnqueueCopyBuffer(cq, boundary_data, block_data, 0, offset, boundary_size, 0, NULL, &event);
+        cl_int ret = clEnqueueCopyBuffer(cq, boundary_data, block_data, 0, offset, boundary_size, 0, NULL, &event);
+	if (ret != CL_SUCCESS) STARPU_OPENCL_REPORT_ERROR(ret);
 
 
 	clWaitForEvents(1, &event);
 	clWaitForEvents(1, &event);
 	clReleaseEvent(event);
 	clReleaseEvent(event);

+ 2 - 2
src/core/perfmodel/perfmodel_history.c

@@ -1319,9 +1319,9 @@ void _starpu_update_perfmodel_history(struct _starpu_job *j, struct starpu_perfm
 			else
 			else
 			{
 			{
 				/* There is already an entry with the same footprint */
 				/* There is already an entry with the same footprint */
-				
+
 				double local_deviation = (measured/entry->mean)*100;
 				double local_deviation = (measured/entry->mean)*100;
-			
+				
 				if (entry->nsample && (local_deviation < (100 - HISTORYMAXERROR) || local_deviation > (100 + HISTORYMAXERROR)))
 				if (entry->nsample && (local_deviation < (100 - HISTORYMAXERROR) || local_deviation > (100 + HISTORYMAXERROR)))
 				{
 				{
 					entry->nerror++;
 					entry->nerror++;