|
@@ -267,6 +267,82 @@ static void run_cholesky_antidiagonal(starpu_data_handle_t **data_handles, int r
|
|
|
starpu_data_wont_use(data_handles[m][n]);
|
|
|
}
|
|
|
|
|
|
+/* TODO: generate from compiler polyhedral analysis of classical algorithm */
|
|
|
+static void run_cholesky_prio(starpu_data_handle_t **data_handles, int rank, int nodes)
|
|
|
+{
|
|
|
+ unsigned a;
|
|
|
+ int k, m, n;
|
|
|
+ unsigned unbound_prio = STARPU_MAX_PRIO == INT_MAX && STARPU_MIN_PRIO == INT_MIN;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * This is basically similar to above, except that we shift k according to the priorities set in the algorithm, so that prio ~ 2*a or 2*a+1
|
|
|
+ * double-antidiagonal number:
|
|
|
+ * - a=0 contains (0,0) plus (1,0)
|
|
|
+ * - a=1 contains (2,0), (1,1) plus (3,0), (2, 1)
|
|
|
+ * - etc.
|
|
|
+ */
|
|
|
+ for (a = 0; a < 4*nblocks; a++)
|
|
|
+ {
|
|
|
+ starpu_iteration_push(a);
|
|
|
+
|
|
|
+ for (k = 0; k < nblocks; k++)
|
|
|
+ {
|
|
|
+ n = k;
|
|
|
+ /* Should be m = a-k-n; for potrf and trsm to respect
|
|
|
+ priorities, but needs to be this for dependencies */
|
|
|
+ m = a-2*k-n;
|
|
|
+
|
|
|
+ if (m < 0 || m >= nblocks)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ if (m == n)
|
|
|
+ {
|
|
|
+ /* diagonal block, factorize */
|
|
|
+ starpu_mpi_task_insert(MPI_COMM_WORLD, &cl11,
|
|
|
+ STARPU_PRIORITY, noprio ? STARPU_DEFAULT_PRIO : unbound_prio ? (int)(2*nblocks - 2*k) : STARPU_MAX_PRIO,
|
|
|
+ STARPU_RW, data_handles[k][k],
|
|
|
+ 0);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ /* non-diagonal block, solve */
|
|
|
+ starpu_mpi_task_insert(MPI_COMM_WORLD, &cl21,
|
|
|
+ STARPU_PRIORITY, noprio ? STARPU_DEFAULT_PRIO : unbound_prio ? (int)(2*nblocks - 2*k - m) : (m == k+1)?STARPU_MAX_PRIO:STARPU_DEFAULT_PRIO,
|
|
|
+ STARPU_R, data_handles[k][k],
|
|
|
+ STARPU_RW, data_handles[m][k],
|
|
|
+ 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* column within antidiagonal for a */
|
|
|
+ for (n = k + 1; n < nblocks; n++)
|
|
|
+ {
|
|
|
+ /* row */
|
|
|
+ m = a-2*k-n;
|
|
|
+
|
|
|
+ if (m >= n && m < nblocks)
|
|
|
+ {
|
|
|
+ /* Update */
|
|
|
+ starpu_mpi_task_insert(MPI_COMM_WORLD, &cl22,
|
|
|
+ STARPU_PRIORITY, noprio ? STARPU_DEFAULT_PRIO : unbound_prio ? (int)(2*nblocks - 2*k - m - n) : ((n == k+1) && (m == k+1))?STARPU_MAX_PRIO:STARPU_DEFAULT_PRIO,
|
|
|
+ STARPU_R, data_handles[n][k],
|
|
|
+ STARPU_R, data_handles[m][k],
|
|
|
+ STARPU_RW | STARPU_COMMUTE, data_handles[m][n],
|
|
|
+ 0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ starpu_iteration_pop();
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Submit flushes, StarPU will fit them according to the progress */
|
|
|
+ starpu_mpi_cache_flush_all_data(MPI_COMM_WORLD);
|
|
|
+ for (m = 0; m < nblocks; m++)
|
|
|
+ for (n = 0; n < nblocks ; n++)
|
|
|
+ starpu_data_wont_use(data_handles[m][n]);
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* code to bootstrap the factorization
|
|
|
* and construct the DAG
|
|
@@ -321,6 +397,7 @@ void dw_cholesky(float ***matA, unsigned ld, int rank, int nodes, double *timing
|
|
|
case TRIANGLES: run_cholesky(data_handles, rank, nodes); break;
|
|
|
case COLUMNS: run_cholesky_column(data_handles, rank, nodes); break;
|
|
|
case ANTIDIAGONALS: run_cholesky_antidiagonal(data_handles, rank, nodes); break;
|
|
|
+ case PRIOS: run_cholesky_prio(data_handles, rank, nodes); break;
|
|
|
default: STARPU_ABORT();
|
|
|
}
|
|
|
|