Browse Source

minor changes

Nathalie Furmento 14 years ago
parent
commit
6b623cf026
2 changed files with 5 additions and 3 deletions
  1. 1 1
      mpi/Makefile.am
  2. 4 2
      mpi/starpu_mpi.c

+ 1 - 1
mpi/Makefile.am

@@ -58,7 +58,7 @@ NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include $(HWLOC_CFLAGS)
 	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/  -I$(top_builddir)/include/
 endif
 
-AM_CFLAGS = $(HWLOC_CFLAGS)
+AM_CFLAGS = $(HWLOC_CFLAGS) -Wall
 LIBS = $(top_builddir)/src/libstarpu.la $(HWLOC_LIBS) @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/mpi/ -I$(top_srcdir)/src/  -I$(top_srcdir)/examples/ -I$(top_builddir)/src -I$(top_builddir)/include
 

+ 4 - 2
mpi/starpu_mpi.c

@@ -151,7 +151,7 @@ static void starpu_mpi_irecv_func(struct starpu_mpi_req_s *req)
 
 	starpu_mpi_handle_to_datatype(req->data_handle, &req->datatype);
 
-	_STARPU_MPI_DEBUG("post MPI irecv tag %d src %d data %p ptr %p req %p datatype %d\n", req->mpi_tag, req->srcdst, req->data_handle, ptr, &req->request, req->datatype);
+	_STARPU_MPI_DEBUG2("post MPI irecv tag %d src %d data %p ptr %p req %p datatype %d\n", req->mpi_tag, req->srcdst, req->data_handle, ptr, &req->request, (int)req->datatype);
 
         req->ret = MPI_Irecv(ptr, 1, req->datatype, req->srcdst, req->mpi_tag, req->comm, &req->request);
         STARPU_ASSERT(req->ret == MPI_SUCCESS);
@@ -459,6 +459,7 @@ int starpu_mpi_barrier(MPI_Comm comm)
  *	Requests
  */
 
+#ifdef STARPU_MPI_VERBOSE
 static char *starpu_mpi_request_type(unsigned request_type)
 {
         switch (request_type)
@@ -471,6 +472,7 @@ static char *starpu_mpi_request_type(unsigned request_type)
                 default: return "unknown request type";
                 }
 }
+#endif
 
 static void handle_request_termination(struct starpu_mpi_req_s *req)
 {
@@ -742,7 +744,7 @@ int starpu_mpi_initialize_extended(int initialize_mpi, int *rank, int *world_siz
 
         PTHREAD_MUTEX_INIT(&mutex_posted_requests, NULL);
 
-	int ret = pthread_create(&progress_thread, NULL, progress_thread_func, (void *)&initialize_mpi);
+	pthread_create(&progress_thread, NULL, progress_thread_func, (void *)&initialize_mpi);
 
 	PTHREAD_MUTEX_LOCK(&mutex);
 	while (!running)