浏览代码

mpi: clearly identity TODOs and clear the ones which are done

Nathalie Furmento 12 年之前
父节点
当前提交
89c370626e

+ 3 - 6
mpi/examples/Makefile.am

@@ -51,17 +51,14 @@ examplebindir = $(libdir)/starpu/mpi
 examplebin_PROGRAMS =
 
 if STARPU_USE_CUDA
-# TODO define NVCCFLAGS
-NVCC ?= nvcc
-
-NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include
+NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ $(HWLOC_CFLAGS)
 
 .cu.cubin:
 	$(MKDIR_P) `dirname $@`
-	$(NVCC) -cubin $< -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS)
+	$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/  -I$(top_builddir)/include/
+	$(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS)

+ 1 - 1
mpi/examples/cholesky/mpi_cholesky_codelets.c

@@ -90,7 +90,7 @@ void dw_cholesky(float ***matA, unsigned size, unsigned ld, unsigned nblocks, in
 				starpu_matrix_data_register(&data_handles[x][y], 0, (uintptr_t)matA[x][y],
 						ld, size/nblocks, size/nblocks, sizeof(float));
 			}
-			/* TODO: make better test to only registering what is needed */
+#warning TODO: make better test to only register what is needed
 			else
 			{
 				/* I don't own that index, but will need it for my computations */

+ 4 - 3
mpi/src/starpu_mpi.c

@@ -24,8 +24,9 @@
 #include <starpu_mpi_stats.h>
 #include <starpu_mpi_insert_task.h>
 
-/* TODO find a better way to select the polling method (perhaps during the
- * configuration) */
+#ifdef STARPU_DEVEL
+#  warning TODO find a better way to select the polling method (perhaps during the configuration)
+#endif
 //#define USE_STARPU_ACTIVITY	1
 
 static void _starpu_mpi_submit_new_mpi_request(void *arg);
@@ -238,7 +239,7 @@ static void _starpu_mpi_irecv_size_callback(void *arg)
 {
 	struct _starpu_mpi_req *req = (struct _starpu_mpi_req *) arg;
 #ifdef STARPU_DEVEL
-#  warning are we sure that req->count can be used as we have not released count_handle?
+#  warning TODO: are we sure that req->count can be used as we have not released count_handle?
 #endif
 	req->ptr = malloc(req->count);
 	_starpu_mpi_irecv_data_func(req);

+ 2 - 2
mpi/src/starpu_mpi_collective.c

@@ -47,7 +47,7 @@ int starpu_mpi_scatter_detached(starpu_data_handle_t *data_handles, int count, i
 	MPI_Comm_rank(comm, &rank);
 
 #ifdef STARPU_DEVEL
-#warning callback_arg needs to be free-ed
+#warning TODO: callback_arg needs to be free-ed
 #endif
 	callback_func = _callback_collective;
 	callback_arg = malloc(sizeof(struct _callback_arg));
@@ -115,7 +115,7 @@ int starpu_mpi_gather_detached(starpu_data_handle_t *data_handles, int count, in
 	MPI_Comm_rank(comm, &rank);
 
 #ifdef STARPU_DEVEL
-#warning callback_arg needs to be free-ed
+#warning TODO: callback_arg needs to be free-ed
 #endif
 	callback_func = _callback_collective;
 	callback_arg = malloc(sizeof(struct _callback_arg));

+ 3 - 2
mpi/src/starpu_mpi_insert_task.c

@@ -293,8 +293,9 @@ void _starpu_mpi_clear_data_after_execution(starpu_data_handle_t data, enum star
 				HASH_FIND_PTR(received_data[mpi_rank], &data, already_received);
 				if (already_received)
 				{
-					/* Somebody else will write to the data, so discard our cached copy if any */
-					/* TODO: starpu_mpi could just remember itself. */
+#ifdef STARPU_DEVEL
+#  warning TODO: Somebody else will write to the data, so discard our cached copy if any. starpu_mpi could just remember itself.
+#endif
 					_STARPU_MPI_DEBUG("Clearing receive cache for data %p\n", data);
 					HASH_DEL(received_data[mpi_rank], already_received);
 					starpu_data_invalidate_submit(data);

+ 3 - 6
mpi/tests/Makefile.am

@@ -37,17 +37,14 @@ examplebindir = $(libdir)/starpu/examples/mpi
 examplebin_PROGRAMS =
 
 if STARPU_USE_CUDA
-# TODO define NVCCFLAGS
-NVCC ?= nvcc
-
-NVCCFLAGS += -I$(top_srcdir)/include/ -I$(top_builddir)/include
+NVCCFLAGS += --compiler-options -fno-strict-aliasing  -I$(top_srcdir)/include/ -I$(top_builddir)/include/ $(HWLOC_CFLAGS)
 
 .cu.cubin:
 	$(MKDIR_P) `dirname $@`
-	$(NVCC) -cubin $< -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS)
+	$(NVCC) -cubin $< -o $@ $(NVCCFLAGS)
 
 .cu.o:
-	$(NVCC) $< -c -o $@ --compiler-options -fno-strict-aliasing  $(NVCCFLAGS) -I$(top_srcdir)/include/  -I$(top_builddir)/include/
+	$(NVCC) $< -c -o $@ $(NVCCFLAGS)
 endif
 
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS)