|
@@ -1,7 +1,7 @@
|
|
|
|
|
|
*
|
|
|
* Copyright (C) 2010, 2011, 2014, 2017 Université de Bordeaux
|
|
|
- * Copyright (C) 2010, 2012, 2013 CNRS
|
|
|
+ * Copyright (C) 2010, 2012, 2013, 2017 CNRS
|
|
|
*
|
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
@@ -156,7 +156,7 @@ static void receive_when_deps_are_done(unsigned ndeps, starpu_tag_t *deps_tags,
|
|
|
|
|
|
struct recv_when_done_callback_arg *arg =
|
|
|
malloc(sizeof(struct recv_when_done_callback_arg));
|
|
|
-
|
|
|
+
|
|
|
arg->source = source;
|
|
|
arg->mpi_tag = mpi_tag;
|
|
|
arg->handle = handle;
|
|
@@ -186,7 +186,7 @@ static void create_task_11_recv(unsigned k)
|
|
|
* 21(k-1)i with i,j >= k */
|
|
|
unsigned ndeps = 0;
|
|
|
starpu_tag_t tag_array[2*nblocks];
|
|
|
-
|
|
|
+
|
|
|
#ifdef SINGLE_TMP11
|
|
|
unsigned i, j;
|
|
|
if (k > 0)
|
|
@@ -203,7 +203,7 @@ static void create_task_11_recv(unsigned k)
|
|
|
tag_array[ndeps++] = TAG12(k-1, j);
|
|
|
}
|
|
|
#endif
|
|
|
-
|
|
|
+
|
|
|
int source = get_block_rank(k, k);
|
|
|
#ifdef SINGLE_TMP11
|
|
|
starpu_data_handle_t block_handle = STARPU_PLU(get_tmp_11_block_handle)();
|
|
@@ -254,7 +254,7 @@ static void callback_task_11_real(void *_arg)
|
|
|
starpu_tag_t tag = TAG11_SAVE(k);
|
|
|
int mpi_tag = MPI_TAG11(k);
|
|
|
send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
|
|
|
-
|
|
|
+
|
|
|
free(arg);
|
|
|
}
|
|
|
|
|
@@ -296,7 +296,7 @@ static void create_task_11(unsigned k)
|
|
|
if (get_block_rank(k, k) == rank)
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "CREATE real task 11(%d) (TAG11_SAVE(%d) = %lx) on node %d\n", k, k, TAG11_SAVE(k), rank);
|
|
|
+ fprintf(stderr, "CREATE real task 11(%u) (TAG11_SAVE(%u) = %lx) on node %d\n", k, k, TAG11_SAVE(k), rank);
|
|
|
#endif
|
|
|
create_task_11_real(k);
|
|
|
}
|
|
@@ -304,17 +304,17 @@ static void create_task_11(unsigned k)
|
|
|
|
|
|
int rank_mask[world_size];
|
|
|
find_nodes_using_11(k, rank_mask);
|
|
|
-
|
|
|
+
|
|
|
if (rank_mask[rank])
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "create RECV task 11(%d) on node %d\n", k, rank);
|
|
|
+ fprintf(stderr, "create RECV task 11(%u) on node %d\n", k, rank);
|
|
|
#endif
|
|
|
create_task_11_recv(k);
|
|
|
}
|
|
|
else {
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "Node %d needs not 11(%d)\n", rank, k);
|
|
|
+ fprintf(stderr, "Node %d needs not 11(%u)\n", rank, k);
|
|
|
#endif
|
|
|
}
|
|
|
}
|
|
@@ -338,7 +338,7 @@ static void create_task_12_recv(unsigned k, unsigned j)
|
|
|
* i >= k */
|
|
|
unsigned ndeps = 0;
|
|
|
starpu_tag_t tag_array[nblocks];
|
|
|
-
|
|
|
+
|
|
|
#ifdef SINGLE_TMP1221
|
|
|
if (k > 0)
|
|
|
for (i = (k-1)+1; i < nblocks; i++)
|
|
@@ -354,7 +354,7 @@ static void create_task_12_recv(unsigned k, unsigned j)
|
|
|
tag_array[ndeps++] = TAG22(k-2, i, j);
|
|
|
#endif
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
int source = get_block_rank(k, j);
|
|
|
#ifdef SINGLE_TMP1221
|
|
|
starpu_data_handle_t block_handle = STARPU_PLU(get_tmp_12_block_handle)(j);
|
|
@@ -398,14 +398,14 @@ static void callback_task_12_real(void *_arg)
|
|
|
starpu_tag_t tag = TAG12_SAVE(k, j);
|
|
|
int mpi_tag = MPI_TAG12(k, j);
|
|
|
send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
|
|
|
-
|
|
|
+
|
|
|
free(arg);
|
|
|
}
|
|
|
|
|
|
static void create_task_12_real(unsigned k, unsigned j)
|
|
|
{
|
|
|
struct starpu_task *task = create_task(TAG12(k, j));
|
|
|
-
|
|
|
+
|
|
|
#ifdef STARPU_DEVEL
|
|
|
#warning temporary fix :/
|
|
|
#endif
|
|
@@ -416,7 +416,7 @@ static void create_task_12_real(unsigned k, unsigned j)
|
|
|
|
|
|
unsigned diag_block_is_local = (get_block_rank(k, k) == rank);
|
|
|
|
|
|
- starpu_tag_t tag_11_dep;
|
|
|
+ starpu_tag_t tag_11_dep;
|
|
|
|
|
|
|
|
|
starpu_data_handle_t diag_block;
|
|
@@ -425,7 +425,7 @@ static void create_task_12_real(unsigned k, unsigned j)
|
|
|
diag_block = STARPU_PLU(get_block_handle)(k, k);
|
|
|
tag_11_dep = TAG11(k);
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
#ifdef SINGLE_TMP11
|
|
|
diag_block = STARPU_PLU(get_tmp_11_block_handle)();
|
|
@@ -435,8 +435,8 @@ static void create_task_12_real(unsigned k, unsigned j)
|
|
|
tag_11_dep = TAG11_SAVE(k);
|
|
|
}
|
|
|
|
|
|
- task->handles[0] = diag_block;
|
|
|
- task->handles[1] = STARPU_PLU(get_block_handle)(k, j);
|
|
|
+ task->handles[0] = diag_block;
|
|
|
+ task->handles[1] = STARPU_PLU(get_block_handle)(k, j);
|
|
|
|
|
|
STARPU_ASSERT(get_block_rank(k, j) == rank);
|
|
|
|
|
@@ -471,7 +471,7 @@ static void create_task_12(unsigned k, unsigned j)
|
|
|
if (get_block_rank(k, j) == rank)
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "CREATE real task 12(k = %d, j = %d) on node %d\n", k, j, rank);
|
|
|
+ fprintf(stderr, "CREATE real task 12(k = %u, j = %u) on node %d\n", k, j, rank);
|
|
|
#endif
|
|
|
create_task_12_real(k, j);
|
|
|
}
|
|
@@ -479,17 +479,17 @@ static void create_task_12(unsigned k, unsigned j)
|
|
|
|
|
|
int rank_mask[world_size];
|
|
|
find_nodes_using_12(k, j, rank_mask);
|
|
|
-
|
|
|
+
|
|
|
if (rank_mask[rank])
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "create RECV task 12(k = %d, j = %d) on node %d\n", k, j, rank);
|
|
|
+ fprintf(stderr, "create RECV task 12(k = %u, j = %u) on node %d\n", k, j, rank);
|
|
|
#endif
|
|
|
create_task_12_recv(k, j);
|
|
|
}
|
|
|
else {
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "Node %d needs not 12(k=%d, i=%d)\n", rank, k, j);
|
|
|
+ fprintf(stderr, "Node %d needs not 12(k=%u, i=%u)\n", rank, k, j);
|
|
|
#endif
|
|
|
}
|
|
|
}
|
|
@@ -511,7 +511,7 @@ static void create_task_21_recv(unsigned k, unsigned i)
|
|
|
* j >= k */
|
|
|
unsigned ndeps = 0;
|
|
|
starpu_tag_t tag_array[nblocks];
|
|
|
-
|
|
|
+
|
|
|
#ifdef SINGLE_TMP1221
|
|
|
if (k > 0)
|
|
|
for (j = (k-1)+1; j < nblocks; j++)
|
|
@@ -572,7 +572,7 @@ static void callback_task_21_real(void *_arg)
|
|
|
starpu_tag_t tag = TAG21_SAVE(k, i);
|
|
|
int mpi_tag = MPI_TAG21(k, i);
|
|
|
send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
|
|
|
-
|
|
|
+
|
|
|
free(arg);
|
|
|
}
|
|
|
|
|
@@ -581,7 +581,7 @@ static void create_task_21_real(unsigned k, unsigned i)
|
|
|
struct starpu_task *task = create_task(TAG21(k, i));
|
|
|
|
|
|
#ifdef STARPU_DEVEL
|
|
|
-#warning temporary fix
|
|
|
+#warning temporary fix
|
|
|
#endif
|
|
|
|
|
|
task->cl = &STARPU_PLU(cl12);
|
|
@@ -590,8 +590,8 @@ static void create_task_21_real(unsigned k, unsigned i)
|
|
|
|
|
|
unsigned diag_block_is_local = (get_block_rank(k, k) == rank);
|
|
|
|
|
|
- starpu_tag_t tag_11_dep;
|
|
|
-
|
|
|
+ starpu_tag_t tag_11_dep;
|
|
|
+
|
|
|
|
|
|
starpu_data_handle_t diag_block;
|
|
|
if (diag_block_is_local)
|
|
@@ -599,7 +599,7 @@ static void create_task_21_real(unsigned k, unsigned i)
|
|
|
diag_block = STARPU_PLU(get_block_handle)(k, k);
|
|
|
tag_11_dep = TAG11(k);
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
#ifdef SINGLE_TMP11
|
|
|
diag_block = STARPU_PLU(get_tmp_11_block_handle)();
|
|
@@ -609,7 +609,7 @@ static void create_task_21_real(unsigned k, unsigned i)
|
|
|
tag_11_dep = TAG11_SAVE(k);
|
|
|
}
|
|
|
|
|
|
- task->handles[0] = diag_block;
|
|
|
+ task->handles[0] = diag_block;
|
|
|
task->handles[1] = STARPU_PLU(get_block_handle)(i, k);
|
|
|
|
|
|
STARPU_ASSERT(task->handles[0] != STARPU_POISON_PTR);
|
|
@@ -643,7 +643,7 @@ static void create_task_21(unsigned k, unsigned i)
|
|
|
if (get_block_rank(i, k) == rank)
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "CREATE real task 21(k = %d, i = %d) on node %d\n", k, i, rank);
|
|
|
+ fprintf(stderr, "CREATE real task 21(k = %u, i = %u) on node %d\n", k, i, rank);
|
|
|
#endif
|
|
|
create_task_21_real(k, i);
|
|
|
}
|
|
@@ -651,17 +651,17 @@ static void create_task_21(unsigned k, unsigned i)
|
|
|
|
|
|
int rank_mask[world_size];
|
|
|
find_nodes_using_21(k, i, rank_mask);
|
|
|
-
|
|
|
+
|
|
|
if (rank_mask[rank])
|
|
|
{
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "create RECV task 21(k = %d, i = %d) on node %d\n", k, i, rank);
|
|
|
+ fprintf(stderr, "create RECV task 21(k = %u, i = %u) on node %d\n", k, i, rank);
|
|
|
#endif
|
|
|
create_task_21_recv(k, i);
|
|
|
}
|
|
|
else {
|
|
|
#ifdef VERBOSE_INIT
|
|
|
- fprintf(stderr, "Node %d needs not 21(k=%d, i=%d)\n", rank, k,i);
|
|
|
+ fprintf(stderr, "Node %d needs not 21(k=%u, i=%u)\n", rank, k,i);
|
|
|
#endif
|
|
|
}
|
|
|
}
|
|
@@ -683,7 +683,7 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
unsigned block21_is_local = (get_block_rank(i, k) == rank);
|
|
|
starpu_tag_t tag_21_dep;
|
|
|
|
|
@@ -693,7 +693,7 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
|
|
|
block21 = STARPU_PLU(get_block_handle)(i, k);
|
|
|
tag_21_dep = TAG21(k, i);
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
#ifdef SINGLE_TMP1221
|
|
|
block21 = STARPU_PLU(get_tmp_21_block_handle)(i);
|
|
@@ -714,7 +714,7 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
|
|
|
block12 = STARPU_PLU(get_block_handle)(k, j);
|
|
|
tag_12_dep = TAG12(k, j);
|
|
|
}
|
|
|
- else
|
|
|
+ else
|
|
|
{
|
|
|
#ifdef SINGLE_TMP1221
|
|
|
block12 = STARPU_PLU(get_tmp_12_block_handle)(j);
|
|
@@ -793,7 +793,7 @@ static void wait_termination(void)
|
|
|
starpu_data_handle_t diag_block = STARPU_PLU(get_block_handle)(k, k);
|
|
|
wait_tag_and_fetch_handle(TAG11_SAVE(k), diag_block);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
for (i = k + 1; i < nblocks; i++)
|
|
|
{
|
|
@@ -818,11 +818,11 @@ static void wait_termination(void)
|
|
|
wait_tag_and_fetch_handle(TAG12_SAVE(k, j), block12);
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
- * code to bootstrap the factorization
|
|
|
+ * code to bootstrap the factorization
|
|
|
*/
|
|
|
|
|
|
double STARPU_PLU(plu_main)(unsigned _nblocks, int _rank, int _world_size)
|
|
@@ -868,12 +868,12 @@ double STARPU_PLU(plu_main)(unsigned _nblocks, int _rank, int _world_size)
|
|
|
starpu_tag_notify_from_apps(STARPU_TAG_INIT);
|
|
|
|
|
|
wait_termination();
|
|
|
-
|
|
|
+
|
|
|
end = starpu_timing_now();
|
|
|
|
|
|
double timing = end - start;
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
return timing;
|
|
|
}
|