commit 4a054cc8eeb9a632029c54ae7b4ee9b20ea606ea
parent 2b8771d0f6aa76d020afa5f78c2638eb3fafa71c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 1 Dec 2021 15:26:23 +0100
Rename waiting_for_process_completiion and mpi_process_synchronize
Their are renamed in process_barrier and mpi_barrier respectively
Diffstat:
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/sdis.c b/src/sdis.c
@@ -418,14 +418,14 @@ print_progress_update
}
void
-waiting_for_process_completion(struct sdis_device* dev)
+process_barrier(struct sdis_device* dev)
{
#ifndef SDIS_ENABLE_MPI
(void)dev;
return;
#else
if(dev->use_mpi) {
- mpi_synchronise_processes(dev);
+ mpi_barrier(dev);
}
#endif
}
diff --git a/src/sdis_c.h b/src/sdis_c.h
@@ -120,10 +120,10 @@ print_progress_update
int32_t progress[],
const char* label); /* Text preceding the progress status */
-/* Waiting for the completion of concurrent processes. Without MPI this
- * function does nothing. With MPI it waits for MPI process synchronisation */
+/* Waiting for all processes. Without MPI this function does nothing. With MPI
+ * it waits for MPI process synchronisation */
extern LOCAL_SYM void
-waiting_for_process_completion
+process_barrier
(struct sdis_device* dev);
#endif /* SDIS_C_H */
diff --git a/src/sdis_mpi.c b/src/sdis_mpi.c
@@ -93,7 +93,7 @@ mpi_waiting_for_request(struct sdis_device* dev, MPI_Request* req)
}
void
-mpi_synchronise_processes(struct sdis_device* dev)
+mpi_barrier(struct sdis_device* dev)
{
MPI_Request req;
ASSERT(dev && dev->use_mpi);
diff --git a/src/sdis_mpi.h b/src/sdis_mpi.h
@@ -46,9 +46,8 @@ mpi_waiting_for_request
(struct sdis_device* dev,
MPI_Request* req);
-/* Waiting for process completion */
extern LOCAL_SYM void
-mpi_synchronise_processes
+mpi_barrier
(struct sdis_device* dev);
#endif /* SDIS_MPI_H */
diff --git a/src/sdis_solve_probe_Xd.h b/src/sdis_solve_probe_Xd.h
@@ -168,6 +168,9 @@ XD(solve_probe)
if(res != RES_OK) goto error;
}
+ /* Synchronise processes */
+ process_barrier(scn->dev);
+
print_progress(scn->dev, progress, "Solving probe temperature: ");
/* Begin time registration of the computation */
@@ -279,7 +282,7 @@ XD(solve_probe)
if(res != RES_OK) goto error;
/* Synchronise processes */
- waiting_for_process_completion(scn->dev);
+ process_barrier(scn->dev);
print_progress_update(scn->dev, progress, "Solving probe temperature: ");
log_info(scn->dev, "\n");
@@ -339,9 +342,6 @@ exit:
if(out_green) *out_green = green;
if(out_estimator) *out_estimator = estimator;
- /* Synchronise processes */
- waiting_for_process_completion(scn->dev);
-
return (res_T)res;
error:
if(green) {