瀏覽代碼

fix build

Samuel Thibault 5 年之前
父節點
當前提交
3bc1857f51
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 3 3
      src/datawizard/interfaces/bcsr_interface.c
  2. 4 3
      src/datawizard/interfaces/csr_interface.c

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

@@ -341,7 +341,7 @@ static starpu_ssize_t allocate_bcsr_buffer_on_node(void *data_interface_, unsign
 	}
 	else
 	{
-		addr_nzval = addr_colind = NULL;
+		addr_nzval = addr_colind = 0;
 	}
 	addr_rowptr = starpu_malloc_on_node(dst_node, (nrow+1)*sizeof(uint32_t));
 	if (!addr_rowptr)
@@ -445,7 +445,7 @@ static int pack_data(starpu_data_handle_t handle, unsigned node, void **ptr, sta
 	{
 		*ptr = (void *)starpu_malloc_on_node_flags(node, *count, 0);
 		char *tmp = *ptr;
-		if (nnz)
+		if (bcsr->nnz)
 		{
 			memcpy(tmp, (void*)bcsr->colind, bcsr->nnz * sizeof(bcsr->colind[0]));
 			tmp += bcsr->nnz * sizeof(bcsr->colind[0]);
@@ -467,7 +467,7 @@ static int unpack_data(starpu_data_handle_t handle, unsigned node, void *ptr, si
 	STARPU_ASSERT(count == (bcsr->nnz * sizeof(bcsr->colind[0]))+((bcsr->nrow + 1) * sizeof(bcsr->rowptr[0]))+(bcsr->r * bcsr->c * bcsr->nnz * bcsr->elemsize));
 
 	char *tmp = ptr;
-	if (nnz)
+	if (bcsr->nnz)
 	{
 		memcpy((void*)bcsr->colind, tmp, bcsr->nnz * sizeof(bcsr->colind[0]));
 		tmp += bcsr->nnz * sizeof(bcsr->colind[0]);

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

@@ -286,7 +286,8 @@ static starpu_ssize_t allocate_csr_buffer_on_node(void *data_interface_, unsigne
 	}
 	else
 	{
-		addr_nzval = addr_colind = NULL;
+		addr_nzval = 0;
+		addr_colind = NULL;
 	}
 	addr_rowptr = (uint32_t*) starpu_malloc_on_node(dst_node, (nrow+1)*sizeof(uint32_t));
 	if (!addr_rowptr)
@@ -383,7 +384,7 @@ static int pack_data(starpu_data_handle_t handle, unsigned node, void **ptr, sta
 	{
 		*ptr = (void *)starpu_malloc_on_node_flags(node, *count, 0);
 		char *tmp = *ptr;
-		if (nnz)
+		if (csr->nnz)
 		{
 			memcpy(tmp, (void*)csr->colind, csr->nnz * sizeof(csr->colind[0]));
 			tmp += csr->nnz * sizeof(csr->colind[0]);
@@ -405,7 +406,7 @@ static int unpack_data(starpu_data_handle_t handle, unsigned node, void *ptr, si
 	STARPU_ASSERT(count == (csr->nnz * sizeof(csr->colind[0]))+((csr->nrow + 1) * sizeof(csr->rowptr[0]))+(csr->nnz * csr->elemsize));
 
 	char *tmp = ptr;
-	if (nnz)
+	if (csr->nnz)
 	{
 		memcpy((void*)csr->colind, tmp, csr->nnz * sizeof(csr->colind[0]));
 		tmp += csr->nnz * sizeof(csr->colind[0]);