Browse Source

mpi/examples/cholesky: always use pinned memory

Nathalie Furmento 14 years ago
parent
commit
bc626b1505
2 changed files with 5 additions and 16 deletions
  1. 3 9
      mpi/examples/cholesky/mpi_cholesky.c
  2. 2 7
      mpi/examples/cholesky/mpi_cholesky.h

+ 3 - 9
mpi/examples/cholesky/mpi_cholesky.c

@@ -159,19 +159,13 @@ static void dw_cholesky(float *matA, unsigned size, unsigned ld, unsigned nblock
 	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
 }
 
-void initialize_system(float **A, unsigned dim, unsigned pinned, int *rank, int *nodes)
+void initialize_system(float **A, unsigned dim, int *rank, int *nodes)
 {
 	starpu_init(NULL);
 	starpu_mpi_initialize_extended(1, rank, nodes);
 	starpu_helper_cublas_init();
 
-	if (pinned)
-	{
-		starpu_malloc((void **)A, (size_t)dim*dim*sizeof(float));
-	}
-	else {
-		*A = malloc(dim*dim*sizeof(float));
-	}
+	starpu_malloc((void **)A, (size_t)dim*dim*sizeof(float));
 }
 
 int main(int argc, char **argv)
@@ -186,7 +180,7 @@ int main(int argc, char **argv)
 
 	parse_args(argc, argv);
 	mat = malloc(size*size*sizeof(float));
-	initialize_system(&mat, size, pinned, &rank, &nodes);
+	initialize_system(&mat, size, &rank, &nodes);
 
 	unsigned i,j;
 	for (i = 0; i < size; i++)

+ 2 - 7
mpi/examples/cholesky/mpi_cholesky.h

@@ -70,7 +70,6 @@ typedef struct {
 static unsigned size = 4*1024;
 static unsigned nblocks = 16;
 static unsigned nbigblocks = 8;
-static unsigned pinned = 0;
 static unsigned noprio = 0;
 static unsigned display = 0;
 
@@ -84,7 +83,7 @@ void chol_cublas_codelet_update_u21(void *descr[], void *_args);
 void chol_cublas_codelet_update_u22(void *descr[], void *_args);
 #endif
 
-void initialize_system(float **A, unsigned dim, unsigned pinned, int *rank, int *nodes);
+void initialize_system(float **A, unsigned dim, int *rank, int *nodes);
 //void dw_cholesky(float *matA, unsigned size, unsigned ld, unsigned nblocks);
 
 extern struct starpu_perfmodel_t chol_model_11;
@@ -110,10 +109,6 @@ static void __attribute__((unused)) parse_args(int argc, char **argv)
 			nbigblocks = strtol(argv[++i], &argptr, 10);
 		}
 
-		if (strcmp(argv[i], "-pin") == 0) {
-			pinned = 1;
-		}
-
 		if (strcmp(argv[i], "-no-prio") == 0) {
 			noprio = 1;
 		}
@@ -123,7 +118,7 @@ static void __attribute__((unused)) parse_args(int argc, char **argv)
 		}
 
 		if (strcmp(argv[i], "-h") == 0) {
-			printf("usage : %s [-display] [-pin] [-size size] [-nblocks nblocks]\n", argv[0]);
+			printf("usage : %s [-display] [-size size] [-nblocks nblocks]\n", argv[0]);
 		}
 	}
 	if (nblocks > size) nblocks = size;