Browse Source

bcsr and multiple memory nodes: assert false instead of silently discard issue

(cherry picked from commit 4e9c42e2d6740352173da787155f96a36c0ac302)
Samuel Thibault 5 years ago
parent
commit
1cc538371c
2 changed files with 2 additions and 4 deletions
  1. 1 3
      src/datawizard/interfaces/bcsr_filters.c
  2. 1 1
      tests/datawizard/bcsr.c

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

@@ -37,9 +37,7 @@ void starpu_bcsr_filter_vertical_block(void *father_interface, void *child_inter
 
 	bcsr_child->id = bcsr_father->id;
 
-	if (!bcsr_father->nzval)
-		/* Not supported yet */
-		return;
+	STARPU_ASSERT_MSG(bcsr_father->nzval, "multiple memory nodes is not supported yet\n");
 
 	starpu_filter_nparts_compute_chunk_size_and_offset(bcsr_father->nrow, nparts, 1, id, 1, &child_nrow, &child_rowoffset);
 

+ 1 - 1
tests/datawizard/bcsr.c

@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 	struct starpu_conf conf;
 	starpu_conf_init(&conf);
 
-	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0)
+	if (starpu_initialize(&conf, &argc, &argv) == -ENODEV || starpu_cpu_worker_get_count() == 0 || starpu_memory_nodes_get_count() > 1)
 		return STARPU_TEST_SKIPPED;
 
 	starpu_bcsr_data_register(&bcsr_handle,