Cédric Augonnet 15 anni fa
parent
commit
244863ee76

+ 1 - 6
src/datawizard/interfaces/bcsr_filters.c

@@ -37,11 +37,6 @@ void starpu_canonical_block_filter_bcsr(void *father_interface, void *child_inte
 	/* we create as many subdata as there are blocks ... */
 	nchunks = nnz;
 	
-	/* first allocate the children : it's a set of BLAS !*/
-	//starpu_data_create_children(root_handle, nchunks, &_starpu_interface_matrix_ops);
-
-	//STARPU_ASSERT(starpu_data_test_if_allocated_on_node(root_handle, 0));
-
 	uint32_t ptr_offset = c*r*id*elemsize;
 
 	matrix_child->nx = c;
@@ -49,7 +44,7 @@ void starpu_canonical_block_filter_bcsr(void *father_interface, void *child_inte
 	matrix_child->ld = c;
 	matrix_child->elemsize = elemsize;
 
-	if (bcsr_father->nzval != 0) {
+	if (bcsr_father->nzval) {
 	  uint8_t *nzval = (uint8_t *)(bcsr_father->nzval);
 	  matrix_child->ptr = (uintptr_t)&nzval[firstentry + ptr_offset];
 	}

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

@@ -44,7 +44,7 @@ void starpu_vertical_block_filter_func_csr(void *father_interface, void *child_i
 	csr_child->firstentry = local_firstentry;
 	csr_child->elemsize = elemsize;
 	
-	if (csr_father->nzval != 0) {
+	if (csr_father->nzval) {
 	  csr_child->rowptr = &csr_father->rowptr[first_index];
 	  csr_child->colind = &csr_father->colind[local_firstentry];
 	  csr_child->nzval = csr_father->nzval + local_firstentry * elemsize;

+ 2 - 2
src/datawizard/interfaces/matrix_filters.c

@@ -42,7 +42,7 @@ void starpu_block_filter_func(void *father_interface, void *child_interface, __a
 	matrix_child->elemsize = elemsize;
 	
 	/* is the information on this node valid ? */
-	if (matrix_father->ptr != 0) {
+	if (matrix_father->ptr) {
 	  matrix_child->ptr = matrix_father->ptr + offset;
 	  matrix_child->ld = matrix_father->ld;
 	  matrix_child->dev_handle = matrix_father->dev_handle;
@@ -68,7 +68,7 @@ void starpu_vertical_block_filter_func(void *father_interface, void *child_inter
 	matrix_child->elemsize = elemsize;
 
 	/* is the information on this node valid ? */
-	if (matrix_father->ptr != 0) {
+	if (matrix_father->ptr) {
 	  size_t offset = 
 	    (size_t)id*chunk_size*matrix_father->ld*elemsize;
 	  matrix_child->ptr = matrix_father->ptr + offset;

+ 4 - 4
src/datawizard/interfaces/vector_filters.c

@@ -36,7 +36,7 @@ void starpu_block_filter_func_vector(void *father_interface, void *child_interfa
 	vector_child->nx = child_nx;
 	vector_child->elemsize = elemsize;
 
-	if (vector_father->ptr != 0) {
+	if (vector_father->ptr) {
 	  vector_child->ptr = vector_father->ptr + offset;
 	  vector_child->dev_handle = vector_father->dev_handle;
 	  vector_child->offset = vector_father->offset + offset;
@@ -64,7 +64,7 @@ void starpu_vector_divide_in_2_filter_func(void *father_interface, void *child_i
 	  vector_child->nx = length_first;
 	  vector_child->elemsize = elemsize;
 
-	  if (vector_father->ptr != 0) {
+	  if (vector_father->ptr) {
 	    vector_child->ptr = vector_father->ptr;
 	    vector_child->offset = vector_father->offset;
 	    vector_child->dev_handle = vector_father->dev_handle;
@@ -76,7 +76,7 @@ void starpu_vector_divide_in_2_filter_func(void *father_interface, void *child_i
 	  vector_child->nx = nx - length_first;
 	  vector_child->elemsize = elemsize;
 
-	  if (vector_father->ptr != 0) {
+	  if (vector_father->ptr) {
 	    vector_child->ptr = vector_father->ptr + length_first*elemsize;
 	    vector_child->offset = vector_father->offset + length_first*elemsize;
 	    vector_child->dev_handle = vector_father->dev_handle;
@@ -101,7 +101,7 @@ void starpu_vector_list_filter_func(void *father_interface, void *child_interfac
 	vector_child->nx = chunk_size;
 	vector_child->elemsize = elemsize;
 	
-	if (vector_father->ptr != 0) {
+	if (vector_father->ptr) {
 	  /* compute the current position */
 	  unsigned i;
 	  for (i = 0; i <= id; i++)