瀏覽代碼

mpi/examples/matrix_decomposition: size and nblocks are global parameters

Nathalie Furmento 12 年之前
父節點
當前提交
66cb3a8c51

+ 2 - 2
mpi/examples/matrix_decomposition/mpi_cholesky.c

@@ -48,13 +48,13 @@ int main(int argc, char **argv)
 	matrix_init(&bmat, rank, nodes, 1);
 	matrix_display(bmat, rank);
 
-	dw_cholesky(bmat, size, size/nblocks, nblocks, rank, nodes, &timing, &flops);
+	dw_cholesky(bmat, size/nblocks, rank, nodes, &timing, &flops);
 
 	starpu_mpi_shutdown();
 
 	matrix_display(bmat, rank);
 
-	dw_cholesky_check_computation(bmat, size, rank, nodes, &correctness, &flops);
+	dw_cholesky_check_computation(bmat, rank, nodes, &correctness, &flops);
 
 	matrix_free(&bmat, rank, nodes, 1);
 	starpu_helper_cublas_shutdown();

+ 2 - 2
mpi/examples/matrix_decomposition/mpi_cholesky_codelets.c

@@ -64,7 +64,7 @@ static struct starpu_codelet cl22 =
  *	code to bootstrap the factorization
  *	and construct the DAG
  */
-void dw_cholesky(float ***matA, unsigned size, unsigned ld, unsigned nblocks, int rank, int nodes, double *timing, double *flops)
+void dw_cholesky(float ***matA, unsigned ld, int rank, int nodes, double *timing, double *flops)
 {
 	struct timeval start;
 	struct timeval end;
@@ -166,7 +166,7 @@ void dw_cholesky(float ***matA, unsigned size, unsigned ld, unsigned nblocks, in
 	}
 }
 
-void dw_cholesky_check_computation(float ***matA, unsigned size, int rank, int nodes, int *correctness, double *flops)
+void dw_cholesky_check_computation(float ***matA, int rank, int nodes, int *correctness, double *flops)
 {
 	unsigned i,j,x,y;
 	float *rmat = malloc(size*size*sizeof(float));

+ 2 - 2
mpi/examples/matrix_decomposition/mpi_cholesky_codelets.h

@@ -23,8 +23,8 @@
  *	code to bootstrap the factorization
  *	and construct the DAG
  */
-void dw_cholesky(float ***matA, unsigned size, unsigned ld, unsigned nblocks, int rank, int nodes, double *timing, double *flops);
+void dw_cholesky(float ***matA, unsigned ld, int rank, int nodes, double *timing, double *flops);
 
-void dw_cholesky_check_computation(float ***matA, unsigned size, int rank, int nodes, int *correctness, double *flops);
+void dw_cholesky_check_computation(float ***matA, int rank, int nodes, int *correctness, double *flops);
 
 #endif /* __MPI_CHOLESKY_CODELETS_H__ */

+ 1 - 1
mpi/examples/matrix_decomposition/mpi_cholesky_distributed.c

@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 
 	matrix_init(&bmat, rank, nodes, 0);
 
-	dw_cholesky(bmat, size, size/nblocks, nblocks, rank, nodes, &timing, &flops);
+	dw_cholesky(bmat, size/nblocks, rank, nodes, &timing, &flops);
 
 	starpu_mpi_shutdown();