瀏覽代碼

Fix warnings

Samuel Thibault 13 年之前
父節點
當前提交
72bbb19ee6

+ 3 - 3
src/datawizard/interfaces/bcsr_interface.c

@@ -313,18 +313,18 @@ static ssize_t allocate_bcsr_buffer_on_node(void *data_interface_, uint32_t dst_
 		case STARPU_OPENCL_RAM:
 		{
 			int ret;
-			void *ptr;
+			cl_mem ptr;
 
 			ret = _starpu_opencl_allocate_memory(&ptr, nnz*r*c*elemsize, CL_MEM_READ_WRITE);
 			addr_nzval = (uintptr_t)ptr;
 			if (ret) goto fail_nzval;
 
 			ret = _starpu_opencl_allocate_memory(&ptr, nnz*sizeof(uint32_t), CL_MEM_READ_WRITE);
-			addr_colind = ptr;
+			addr_colind = (void*) ptr;
 			if (ret) goto fail_colind;
 
 			ret = _starpu_opencl_allocate_memory(&ptr, (nrow+1)*sizeof(uint32_t), CL_MEM_READ_WRITE);
-			addr_rowptr = ptr;
+			addr_rowptr = (void*) ptr;
 			if (ret) goto fail_rowptr;
 
 			break;

+ 3 - 3
src/datawizard/interfaces/csr_interface.c

@@ -287,18 +287,18 @@ static ssize_t allocate_csr_buffer_on_node(void *data_interface_, uint32_t dst_n
 	        case STARPU_OPENCL_RAM:
 			{
                                 int ret;
-                                void *ptr;
+				cl_mem ptr;
 
                                 ret = _starpu_opencl_allocate_memory(&ptr, nnz*elemsize, CL_MEM_READ_WRITE);
                                 addr_nzval = (uintptr_t)ptr;
 				if (ret) goto fail_nzval;
 
                                 ret = _starpu_opencl_allocate_memory(&ptr, nnz*sizeof(uint32_t), CL_MEM_READ_WRITE);
-                                addr_colind = ptr;
+                                addr_colind = (void*) ptr;
 				if (ret) goto fail_colind;
 
                                 ret = _starpu_opencl_allocate_memory(&ptr, (nrow+1)*sizeof(uint32_t), CL_MEM_READ_WRITE);
-                                addr_rowptr = ptr;
+                                addr_rowptr = (void*) ptr;
 				if (ret) goto fail_rowptr;
 
 				break;

+ 10 - 2
src/datawizard/interfaces/multiformat_interface.c

@@ -328,7 +328,7 @@ static ssize_t allocate_multiformat_buffer_on_node(void *data_interface_, uint32
 		case STARPU_OPENCL_RAM:
 			{
                                 int ret;
-                                void *ptr;
+				cl_mem ptr;
 				allocated_memory = multiformat_interface->nx * multiformat_interface->ops->opencl_elemsize;
                                 ret = _starpu_opencl_allocate_memory(&ptr, allocated_memory, CL_MEM_READ_WRITE);
                                 addr = (uintptr_t)ptr;
@@ -342,9 +342,17 @@ static ssize_t allocate_multiformat_buffer_on_node(void *data_interface_, uint32
 
 				}
 
-				_starpu_opencl_allocate_memory(&multiformat_interface->cpu_ptr,
+				ret = _starpu_opencl_allocate_memory(&ptr,
 							multiformat_interface->nx * multiformat_interface->ops->cpu_elemsize,
 							CL_MEM_READ_WRITE);
+				if (ret)
+				{
+					fail = 1;
+				}
+				else
+				{
+					multiformat_interface->cpu_ptr = (void *) addr;
+				}
 				
 				break;
 			}

+ 1 - 1
src/datawizard/interfaces/variable_interface.c

@@ -236,7 +236,7 @@ static ssize_t allocate_variable_buffer_on_node(void *data_interface_, uint32_t
 	        case STARPU_OPENCL_RAM:
 			{
                                 int ret;
-                                void *ptr;
+				cl_mem ptr;
                                 ret = _starpu_opencl_allocate_memory(&ptr, elemsize, CL_MEM_READ_WRITE);
                                 addr = (uintptr_t)ptr;
 				if (ret)