Kaynağa Gözat

API change handle_t* into handle_t

Romain LION 4 yıl önce
ebeveyn
işleme
6242d9b207

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

@@ -481,7 +481,7 @@ void dw_cholesky(float ***matA, unsigned ld, int rank, int nodes, double *timing
 				starpu_data_set_coordinates(data_handles[m][n], 2, n, m);
 				starpu_mpi_data_register(data_handles[m][n], (m*nblocks)+n, mpi_rank);
 				if (m>=n)
-					starpu_mpi_checkpoint_template_add_entry(checkpoint_p, STARPU_R, &data_handles[m][n], backup_function(mpi_rank));
+					starpu_mpi_checkpoint_template_add_entry(checkpoint_p, STARPU_R, data_handles[m][n], backup_function(mpi_rank));
 			}
 		}
 	}

+ 12 - 12
mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint.c

@@ -135,7 +135,7 @@ void _send_cached_cp_internal_data_cb(void* _args)
 
 int starpu_mpi_submit_checkpoint_template(starpu_mpi_checkpoint_template_t cp_template)
 {
-	starpu_data_handle_t* handle;
+	starpu_data_handle_t handle;
 	struct _starpu_mpi_cp_ack_arg_cb* arg;
 	void* cpy_ptr;
 	struct _starpu_mpi_checkpoint_template_item* item;
@@ -180,36 +180,36 @@ int starpu_mpi_submit_checkpoint_template(starpu_mpi_checkpoint_template_t cp_te
 				}
 				break;
 			case STARPU_R:
-				handle = (starpu_data_handle_t*)item->ptr;
-				if (starpu_mpi_data_get_rank(*handle)==my_rank)
+				handle = (starpu_data_handle_t)item->ptr;
+				if (starpu_mpi_data_get_rank(handle)==my_rank)
 				{
-					_STARPU_MPI_DEBUG(0, "Submit CP: sending starPU data to %d (tag %d)\n", item->backupped_by, (int)starpu_mpi_data_get_tag(*handle));
+					_STARPU_MPI_DEBUG(0, "Submit CP: sending starPU data to %d (tag %d)\n", item->backupped_by, (int)starpu_mpi_data_get_tag(handle));
 					arg = calloc(1, sizeof(struct _starpu_mpi_cp_ack_arg_cb));
 					arg->rank = item->backupped_by;
-					arg->handle = *handle;
-					arg->tag = starpu_mpi_data_get_tag(*handle);
+					arg->handle = handle;
+					arg->tag = starpu_mpi_data_get_tag(handle);
 					arg->type = STARPU_R;
 					arg->count = item->count;
 					arg->msg.checkpoint_id = cp_template->cp_id;
 					arg->msg.checkpoint_instance = current_instance;
-					_starpu_mpi_isend_cache_aware(*handle, item->backupped_by, starpu_mpi_data_get_tag(*handle), MPI_COMM_WORLD, 1, 0, 0,
+					_starpu_mpi_isend_cache_aware(handle, item->backupped_by, starpu_mpi_data_get_tag(handle), MPI_COMM_WORLD, 1, 0, 0,
 					                              &_send_cp_internal_data_cb, (void*)arg,
 					                              &_send_cached_cp_internal_data_cb, (void*)arg, 1);
 					// the callbacks need to post ack recv. The cache one needs to release the handle.
 
 				}
-				else if (item->backup_of == starpu_mpi_data_get_rank(*handle))
+				else if (item->backup_of == starpu_mpi_data_get_rank(handle))
 				{
-					_STARPU_MPI_DEBUG(0, "Submit CP: receiving starPU data from %d (tag %d)\n", starpu_mpi_data_get_rank(*handle), (int)starpu_mpi_data_get_tag(*handle));
+					_STARPU_MPI_DEBUG(0, "Submit CP: receiving starPU data from %d (tag %d)\n", starpu_mpi_data_get_rank(handle), (int)starpu_mpi_data_get_tag(handle));
 					arg = calloc(1, sizeof(struct _starpu_mpi_cp_ack_arg_cb));
 					arg->rank = item->backup_of;
-					arg->handle = *handle;
-					arg->tag = starpu_mpi_data_get_tag(*handle);
+					arg->handle = handle;
+					arg->tag = starpu_mpi_data_get_tag(handle);
 					arg->type = STARPU_R;
 					arg->count = item->count;
 					arg->msg.checkpoint_id = cp_template->cp_id;
 					arg->msg.checkpoint_instance = current_instance;
-					_starpu_mpi_irecv_cache_aware(*handle, starpu_mpi_data_get_rank(*handle), starpu_mpi_data_get_tag(*handle), MPI_COMM_WORLD, 1, 0,
+					_starpu_mpi_irecv_cache_aware(handle, starpu_mpi_data_get_rank(handle), starpu_mpi_data_get_tag(handle), MPI_COMM_WORLD, 1, 0,
 					                              &_recv_cp_internal_data_cb, (void*)arg,
 					                              &_recv_cached_cp_internal_data_cb, (void*)arg, 1, 0, 1);
 					// The callback needs to do nothing. The cached one must release the handle.

+ 1 - 1
mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint_template.c

@@ -118,7 +118,7 @@ int _starpu_mpi_checkpoint_template_add_entry(starpu_mpi_checkpoint_template_t c
 			ptr          = va_arg(varg_list, void*);
 			count        = 1;
 			backupped_by = va_arg(varg_list, int);
-			data_rank    = starpu_mpi_data_get_rank(*(starpu_data_handle_t*)ptr);
+			data_rank    = starpu_mpi_data_get_rank((starpu_data_handle_t)ptr);
 			if (my_rank==data_rank)
 			{
 				return _starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, backupped_by, -1, -1);

+ 4 - 4
mpi/tests/checkpoints.c

@@ -94,14 +94,14 @@ int pseudotest_checkpoint_template_register(int argc, char* argv[])
 
 	starpu_mpi_checkpoint_template_register(&cp_template1, 123486, 0,
 	                                        STARPU_VALUE, &val, sizeof(int), 84, backup_of,
-	                                        STARPU_R, &h, 1,
+	                                        STARPU_R, h, 1,
 	                                        0);
 
 	FPRINTF(stderr, "registered!\n");
 	_starpu_mpi_checkpoint_template_print(cp_template1);
 
 	starpu_mpi_checkpoint_template_create(&cp_template2, 98765, 0);
-	starpu_mpi_checkpoint_template_add_entry(&cp_template2, STARPU_R, &h, 1);
+	starpu_mpi_checkpoint_template_add_entry(&cp_template2, STARPU_R, h, 1);
 	starpu_mpi_checkpoint_template_add_entry(&cp_template2, STARPU_VALUE, &val, sizeof(int), 84, backup_of);
 	starpu_mpi_checkpoint_template_freeze(&cp_template2);
 
@@ -141,8 +141,8 @@ int test_checkpoint_submit(int argc, char* argv[])
 
 	FPRINTF_MPI(stderr, "Registering\n");
 	starpu_mpi_checkpoint_template_register(&cp_template, 321, 0,
-			STARPU_R, &handle0, 1,
-			STARPU_R, &handle1, 0,
+			STARPU_R, handle0, 1,
+			STARPU_R, handle1, 0,
             STARPU_VALUE, &stage, sizeof(int), 300, &backup_of,
             STARPU_VALUE, &stage, sizeof(int), 301, &backup_of,
             STARPU_VALUE, &stage, sizeof(int), 302, &backup_of,