Nathalie Furmento лет назад: 10
Родитель
Сommit
bc6a89f84f
3 измененных файлов с 8 добавлено и 11 удалено
  1. 3 8
      mpi/tests/cache.c
  2. 3 3
      mpi/tests/cache_disable.c
  3. 2 0
      mpi/tests/policy_register.c

+ 3 - 8
mpi/tests/cache.c

@@ -48,14 +48,9 @@ void test(struct starpu_codelet *codelet, enum starpu_data_access_mode mode, sta
 {
 	void *ptr;
 	int ret;
-	struct starpu_task *task;
-
-	// We call starpu_mpi_task_build() and starpu_mpi_task_post_build() instead of
-	// starpu_mpi_task_insert() to avoid executing the codelet as we just want to test the cache mechanism
-	task = starpu_mpi_task_build(MPI_COMM_WORLD, codelet, mode, data, STARPU_EXECUTE_ON_NODE, 1, 0);
-	starpu_task_destroy(task);
-	ret = starpu_mpi_task_post_build(MPI_COMM_WORLD, codelet, mode, data, STARPU_EXECUTE_ON_NODE, 1, 0);
-	STARPU_CHECK_RETURN_VALUE(ret, "starpu_mpi_task_post_build");
+
+	ret = starpu_mpi_task_insert(MPI_COMM_WORLD, codelet, mode, data, STARPU_EXECUTE_ON_NODE, 1, 0);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_mpi_task_insert");
 
 	ptr = _starpu_mpi_cache_received_data_get(data, 0);
 

+ 3 - 3
mpi/tests/cache_disable.c

@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	ptr = _starpu_mpi_cache_received_data_get(data, 0);
 	if (rank == 1)
 	{
-	     STARPU_ASSERT_MSG(ptr != NULL, "Data should be in cache\n");
+		STARPU_ASSERT_MSG(ptr != NULL, "Data should be in cache\n");
 	}
 
 	// We clean the cache
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 	ptr = _starpu_mpi_cache_received_data_get(data, 0);
 	if (rank == 1)
 	{
-	     STARPU_ASSERT_MSG(ptr == NULL, "Data should NOT be in cache\n");
+		STARPU_ASSERT_MSG(ptr == NULL, "Data should NOT be in cache\n");
 	}
 
 	ret = starpu_mpi_task_insert(MPI_COMM_WORLD, &mycodelet_r, STARPU_R, data, STARPU_EXECUTE_ON_NODE, 1, 0);
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 	ptr = _starpu_mpi_cache_received_data_get(data, 0);
 	if (rank == 1)
 	{
-	     STARPU_ASSERT_MSG(ptr == NULL, "Data should NOT be in cache\n");
+		STARPU_ASSERT_MSG(ptr == NULL, "Data should NOT be in cache\n");
 	}
 
 	FPRINTF(stderr, "Waiting ...\n");

+ 2 - 0
mpi/tests/policy_register.c

@@ -98,6 +98,7 @@ int main(int argc, char **argv)
 	if (rank == 1)
 	{
 		STARPU_ASSERT_MSG(task, "Task should be executed by rank 1\n");
+		task->destroy = 0;
 		starpu_task_destroy(task);
 	}
 	else
@@ -114,6 +115,7 @@ int main(int argc, char **argv)
 	if (rank == 0)
 	{
 		STARPU_ASSERT_MSG(task, "Task should be executed by rank 0\n");
+		task->destroy = 0;
 		starpu_task_destroy(task);
 	}
 	else