Skip to content

GitLab

Commit 20237d79 authored by iker_martin's avatar iker_martin
Browse files

Added new header file (mam.h) for public usage. New file for internal... 

Added new header file (mam.h) for public usage. New file for internal configuration of methods. Reduced arguments in internal functions. WIP
parent 023318fb
Show whitespace changes
Inline Side-by-side
Codes/IOcodes/read_ini.c
View file @ 20237d79
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <string.h> #include <string.h>
#include "read_ini.h" #include "read_ini.h"
#include "ini.h" #include "ini.h"
#include "../malleability/spawn_methods/ProcessDist.h" #include "../malleability/malleabilityStates.h"
ext_functions_t *user_functions; ext_functions_t *user_functions;
......
Codes/Main/Main.c
View file @ 20237d79
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
#include "configuration.h" #include "configuration.h"
#include "../IOcodes/results.h" #include "../IOcodes/results.h"
#include "../malleability/CommDist.h" #include "../malleability/CommDist.h"
#include "../malleability/malleabilityManager.h" #include "../malleability/MAM.h"
#include "../malleability/malleabilityStates.h"
#define DR_MAX_SIZE 1000000000 #define DR_MAX_SIZE 1000000000
......
Codes/Main/configuration.c
View file @ 20237d79
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <mpi.h> #include <mpi.h>
#include "../IOcodes/read_ini.h" #include "../IOcodes/read_ini.h"
#include "configuration.h" #include "configuration.h"
#include "../malleability/spawn_methods/ProcessDist.h"
#include "../malleability/distribution_methods/block_distribution.h" #include "../malleability/distribution_methods/block_distribution.h"
void malloc_config_resizes(configuration *user_config); void malloc_config_resizes(configuration *user_config);
...@@ -149,7 +148,7 @@ void free_config(configuration *user_config) { ...@@ -149,7 +148,7 @@ void free_config(configuration *user_config) {
*/ */
void free_config_stage(iter_stage_t *stage, int *freed_ids, size_t *found_ids) { void free_config_stage(iter_stage_t *stage, int *freed_ids, size_t *found_ids) {
size_t i; size_t i;
int free_reqs; int mpi_index, free_reqs;
free_reqs = 1; free_reqs = 1;
if(stage->id > -1) { if(stage->id > -1) {
...@@ -178,10 +177,10 @@ void free_config_stage(iter_stage_t *stage, int *freed_ids, size_t *found_ids) { ...@@ -178,10 +177,10 @@ void free_config_stage(iter_stage_t *stage, int *freed_ids, size_t *found_ids) {
stage->double_array = NULL; stage->double_array = NULL;
} }
if(stage->reqs != NULL && free_reqs) { if(stage->reqs != NULL && free_reqs) {
for(i=0; i<stage->req_count; i++) { for(mpi_index=0; mpi_index<stage->req_count; mpi_index++) {
if(stage->reqs[i] != MPI_REQUEST_NULL) { if(stage->reqs[mpi_index] != MPI_REQUEST_NULL) {
MPI_Request_free(&(stage->reqs[i])); MPI_Request_free(&(stage->reqs[mpi_index]));
stage->reqs[i] = MPI_REQUEST_NULL; stage->reqs[mpi_index] = MPI_REQUEST_NULL;
} }
} }
free(stage->reqs); free(stage->reqs);
......
Codes/malleability/CommDist.c
View file @ 20237d79
...@@ -4,19 +4,20 @@ ...@@ -4,19 +4,20 @@
#include <string.h> #include <string.h>
#include "distribution_methods/block_distribution.h" #include "distribution_methods/block_distribution.h"
#include "CommDist.h" #include "CommDist.h"
#include "MAM_Configuration.h"
#include "malleabilityDataStructures.h" #include "malleabilityDataStructures.h"
//void prepare_redistribution(int qty, int myId, int numP, int numO, int is_children_group, int is_intercomm, char **recv, struct Counts *s_counts, struct Counts *r_counts); //void prepare_redistribution(int qty, int myId, int numP, int numO, int is_children_group, int is_intercomm, char **recv, struct Counts *s_counts, struct Counts *r_counts);
void prepare_redistribution(int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int is_intercomm, int is_sync, void **recv, struct Counts *s_counts, struct Counts *r_counts); //FIXME Choose name for is_sync void prepare_redistribution(int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int is_intercomm, int is_sync, void **recv, struct Counts *s_counts, struct Counts *r_counts); //FIXME Choose name for is_sync
void check_requests(struct Counts s_counts, struct Counts r_counts, int red_method, int red_strategies, MPI_Request **requests, size_t *request_qty); void check_requests(struct Counts s_counts, struct Counts r_counts, MPI_Request **requests, size_t *request_qty);
void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_intercomm, int myId, struct Counts s_counts, struct Counts r_counts, MPI_Comm comm); void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_intercomm, int myId, struct Counts s_counts, struct Counts r_counts, MPI_Comm comm);
void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, int red_method); void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm);
void sync_rma_lock(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win); void sync_rma_lock(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win);
void sync_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win); void sync_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win);
void async_point2point(void *send, void *recv, MPI_Datatype datatype, struct Counts s_counts, struct Counts r_counts, MPI_Comm comm, MPI_Request *requests); void async_point2point(void *send, void *recv, MPI_Datatype datatype, struct Counts s_counts, struct Counts r_counts, MPI_Comm comm, MPI_Request *requests);
void async_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, int red_method, MPI_Request *requests, MPI_Win *win); void async_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, MPI_Request *requests, MPI_Win *win);
void async_rma_lock(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win, MPI_Request *requests); void async_rma_lock(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win, MPI_Request *requests);
void async_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win, MPI_Request *requests); void async_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts, MPI_Win win, MPI_Request *requests);
...@@ -69,7 +70,7 @@ void malloc_comm_array(char **array, int qty, int myId, int numP) { ...@@ -69,7 +70,7 @@ void malloc_comm_array(char **array, int qty, int myId, int numP) {
* *
* returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE). //FIXME In this case is always true... * returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE). //FIXME In this case is always true...
*/ */
int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int red_method, MPI_Comm comm) { int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, MPI_Comm comm) {
int is_intercomm, aux_comm_used = 0; int is_intercomm, aux_comm_used = 0;
struct Counts s_counts, r_counts; struct Counts s_counts, r_counts;
struct Dist_data dist_data; struct Dist_data dist_data;
...@@ -89,9 +90,8 @@ int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, ...@@ -89,9 +90,8 @@ int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype,
} }
// FIXME END REFACTOR // FIXME END REFACTOR
/* PERFORM COMMUNICATION */ /* PERFORM COMMUNICATION */
switch(red_method) { switch(mall_conf->red_method) {
case MALL_RED_RMA_LOCKALL: case MALL_RED_RMA_LOCKALL:
case MALL_RED_RMA_LOCK: case MALL_RED_RMA_LOCK:
...@@ -100,7 +100,7 @@ int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, ...@@ -100,7 +100,7 @@ int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype,
} else { } else {
get_block_dist(qty, myId, numO, &dist_data); get_block_dist(qty, myId, numO, &dist_data);
} }
sync_rma(send, *recv, datatype, r_counts, dist_data.tamBl, aux_comm, red_method); sync_rma(send, *recv, datatype, r_counts, dist_data.tamBl, aux_comm);
break; break;
case MALL_RED_POINT: case MALL_RED_POINT:
...@@ -194,7 +194,6 @@ void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_inte ...@@ -194,7 +194,6 @@ void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_inte
* displacements. * displacements.
* - tamBl (IN): How many elements are stored in the parameter "send". * - tamBl (IN): How many elements are stored in the parameter "send".
* - comm (IN): Communicator to use to perform the redistribution. Must be an intracommunicator as MPI-RMA requirements. * - comm (IN): Communicator to use to perform the redistribution. Must be an intracommunicator as MPI-RMA requirements.
* - red_method (IN): Type of data redistribution to use. In this case indicates the RMA operation(Lock or LockAll).
* *
* FIXME: In libfabric one of these macros defines the maximum amount of BYTES that can be communicated in a SINGLE MPI_Get * FIXME: In libfabric one of these macros defines the maximum amount of BYTES that can be communicated in a SINGLE MPI_Get
* A window can have more bytes than the amount shown in those macros, therefore, if you want to read more than that amount * A window can have more bytes than the amount shown in those macros, therefore, if you want to read more than that amount
...@@ -203,7 +202,7 @@ void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_inte ...@@ -203,7 +202,7 @@ void sync_point2point(void *send, void *recv, MPI_Datatype datatype, int is_inte
* prov/psm3/psm3/ptl_am/am_config.h:62:#define PSMI_MQ_RV_THRESH_CMA 16000 * prov/psm3/psm3/ptl_am/am_config.h:62:#define PSMI_MQ_RV_THRESH_CMA 16000
* prov/psm3/psm3/ptl_am/am_config.h:65:#define PSMI_MQ_RV_THRESH_NO_KASSIST 16000 * prov/psm3/psm3/ptl_am/am_config.h:65:#define PSMI_MQ_RV_THRESH_NO_KASSIST 16000
*/ */
void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, int red_method) { void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm) {
int datasize; int datasize;
MPI_Win win; MPI_Win win;
MPI_Type_size(datatype, &datasize); MPI_Type_size(datatype, &datasize);
...@@ -212,7 +211,7 @@ void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_cou ...@@ -212,7 +211,7 @@ void sync_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_cou
#if USE_MAL_DEBUG >= 3 #if USE_MAL_DEBUG >= 3
DEBUG_FUNC("Created Window for synchronous RMA communication", mall->myId, mall->numP); fflush(stdout); MPI_Barrier(comm); DEBUG_FUNC("Created Window for synchronous RMA communication", mall->myId, mall->numP); fflush(stdout); MPI_Barrier(comm);
#endif #endif
switch(red_method) { switch(mall_conf->red_method) {
case MALL_RED_RMA_LOCKALL: case MALL_RED_RMA_LOCKALL:
sync_rma_lockall(recv, datatype, r_counts, win); sync_rma_lockall(recv, datatype, r_counts, win);
break; break;
...@@ -307,7 +306,7 @@ void sync_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts, ...@@ -307,7 +306,7 @@ void sync_rma_lockall(void *recv, MPI_Datatype datatype, struct Counts r_counts,
* *
* returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE). //FIXME In this case is always false... * returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE). //FIXME In this case is always false...
*/ */
int async_communication_start(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int red_method, int red_strategies, MPI_Comm comm, MPI_Request **requests, size_t *request_qty, MPI_Win *win) { int async_communication_start(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, MPI_Comm comm, MPI_Request **requests, size_t *request_qty, MPI_Win *win) {
int is_intercomm, aux_comm_used = 0; int is_intercomm, aux_comm_used = 0;
struct Counts s_counts, r_counts; struct Counts s_counts, r_counts;
struct Dist_data dist_data; struct Dist_data dist_data;
...@@ -325,10 +324,10 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat ...@@ -325,10 +324,10 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat
aux_comm = comm; aux_comm = comm;
} }
// FIXME END REFACTOR // FIXME END REFACTOR
check_requests(s_counts, r_counts, red_method, red_strategies, requests, request_qty); check_requests(s_counts, r_counts, requests, request_qty);
/* PERFORM COMMUNICATION */ /* PERFORM COMMUNICATION */
switch(red_method) { switch(mall_conf->red_method) {
case MALL_RED_RMA_LOCKALL: case MALL_RED_RMA_LOCKALL:
case MALL_RED_RMA_LOCK: case MALL_RED_RMA_LOCK:
...@@ -337,7 +336,7 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat ...@@ -337,7 +336,7 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat
} else { } else {
get_block_dist(qty, myId, numO, &dist_data); get_block_dist(qty, myId, numO, &dist_data);
} }
async_rma(send, *recv, datatype, r_counts, dist_data.tamBl, aux_comm, red_method, *requests, win); async_rma(send, *recv, datatype, r_counts, dist_data.tamBl, aux_comm, *requests, win);
break; break;
case MALL_RED_POINT: case MALL_RED_POINT:
async_point2point(send, *recv, datatype, s_counts, r_counts, aux_comm, *requests); async_point2point(send, *recv, datatype, s_counts, r_counts, aux_comm, *requests);
...@@ -349,7 +348,7 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat ...@@ -349,7 +348,7 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat
} }
/* POST REQUESTS CHECKS */ /* POST REQUESTS CHECKS */
if(malleability_red_contains_strat(red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
if(!is_children_group && (is_intercomm || myId >= numO)) { if(!is_children_group && (is_intercomm || myId >= numO)) {
MPI_Ibarrier(comm, &((*requests)[*request_qty-1]) ); //FIXME Not easy to read... MPI_Ibarrier(comm, &((*requests)[*request_qty-1]) ); //FIXME Not easy to read...
} }
...@@ -369,13 +368,12 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat ...@@ -369,13 +368,12 @@ int async_communication_start(void *send, void **recv, int qty, MPI_Datatype dat
* *
* - myId (IN): Rank of the MPI process in the local communicator. For the parents is not the rank obtained from "comm". * - myId (IN): Rank of the MPI process in the local communicator. For the parents is not the rank obtained from "comm".
* - is_children_group (IN): Indicates wether this MPI rank is a children(TRUE) or a parent(FALSE). * - is_children_group (IN): Indicates wether this MPI rank is a children(TRUE) or a parent(FALSE).
* - red_strategies (IN):
* - requests (IN): Pointer to array of requests to be used to determine if the communication has ended. * - requests (IN): Pointer to array of requests to be used to determine if the communication has ended.
* - request_qty (IN): Quantity of requests in "requests". * - request_qty (IN): Quantity of requests in "requests".
* *
* returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE). * returns: An integer indicating if the operation has been completed(TRUE) or not(FALSE).
*/ */
int async_communication_check(int myId, int is_children_group, int red_strategies, MPI_Comm comm, MPI_Request *requests, size_t request_qty) { int async_communication_check(int myId, int is_children_group, MPI_Comm comm, MPI_Request *requests, size_t request_qty) {
int completed, req_completed, all_req_null, test_err, aux_condition; int completed, req_completed, all_req_null, test_err, aux_condition;
size_t i; size_t i;
completed = 1; completed = 1;
...@@ -384,7 +382,7 @@ int async_communication_check(int myId, int is_children_group, int red_strategie ...@@ -384,7 +382,7 @@ int async_communication_check(int myId, int is_children_group, int red_strategie
if (is_children_group) return 1; //FIXME Deberia devolver un num negativo if (is_children_group) return 1; //FIXME Deberia devolver un num negativo
if(malleability_red_contains_strat(red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
// The Ibarrier should only be posted at this point if the process // The Ibarrier should only be posted at this point if the process
// has other requests which has not confirmed as completed yet, // has other requests which has not confirmed as completed yet,
...@@ -441,19 +439,17 @@ void async_communication_wait(MPI_Comm comm, MPI_Request *requests, size_t reque ...@@ -441,19 +439,17 @@ void async_communication_wait(MPI_Comm comm, MPI_Request *requests, size_t reque
* Frees Requests/Windows associated to a particular redistribution. * Frees Requests/Windows associated to a particular redistribution.
* Should be called for each output result of calling "async_communication_start". * Should be called for each output result of calling "async_communication_start".
* *
* - red_method (IN):
* - red_strategies (IN):
* - requests (IN): Pointer to array of requests to be used to determine if the communication has ended. * - requests (IN): Pointer to array of requests to be used to determine if the communication has ended.
* - request_qty (IN): Quantity of requests in "requests". * - request_qty (IN): Quantity of requests in "requests".
* - win (IN): Window to free. * - win (IN): Window to free.
*/ */
void async_communication_end(int red_method, int red_strategies, MPI_Request *requests, size_t request_qty, MPI_Win *win) { void async_communication_end(MPI_Request *requests, size_t request_qty, MPI_Win *win) {
//Para la desconexión de ambos grupos de procesos es necesario indicar a MPI que esta comm //Para la desconexión de ambos grupos de procesos es necesario indicar a MPI que esta comm
//ha terminado, aunque solo se pueda llegar a este punto cuando ha terminado //ha terminado, aunque solo se pueda llegar a este punto cuando ha terminado
if(malleability_red_contains_strat(red_strategies, MALL_RED_IBARRIER, NULL)) { MPI_Waitall(request_qty, requests, MPI_STATUSES_IGNORE); } if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) { MPI_Waitall(request_qty, requests, MPI_STATUSES_IGNORE); }
if(red_method == MALL_RED_RMA_LOCKALL || red_method == MALL_RED_RMA_LOCK) { MPI_Win_free(win); } if(mall_conf->red_method == MALL_RED_RMA_LOCKALL || mall_conf->red_method == MALL_RED_RMA_LOCK) { MPI_Win_free(win); }
} }
/* /*
...@@ -500,17 +496,16 @@ void async_point2point(void *send, void *recv, MPI_Datatype datatype, struct Cou ...@@ -500,17 +496,16 @@ void async_point2point(void *send, void *recv, MPI_Datatype datatype, struct Cou
* displacements. * displacements.
* - tamBl (IN): How many elements are stored in the parameter "send". * - tamBl (IN): How many elements are stored in the parameter "send".
* - comm (IN): Communicator to use to perform the redistribution. Must be an intracommunicator as MPI-RMA requirements. * - comm (IN): Communicator to use to perform the redistribution. Must be an intracommunicator as MPI-RMA requirements.
* - red_method (IN): Type of data redistribution to use. In this case indicates the RMA operation(Lock or LockAll).
* - window (OUT): Pointer to a window object used for the RMA operations. * - window (OUT): Pointer to a window object used for the RMA operations.
* - requests (OUT): Pointer to array of requests to be used to determine if the communication has ended. * - requests (OUT): Pointer to array of requests to be used to determine if the communication has ended.
* *
*/ */
void async_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, int red_method, MPI_Request *requests, MPI_Win *win) { void async_rma(void *send, void *recv, MPI_Datatype datatype, struct Counts r_counts, int tamBl, MPI_Comm comm, MPI_Request *requests, MPI_Win *win) {
int datasize; int datasize;
MPI_Type_size(datatype, &datasize); MPI_Type_size(datatype, &datasize);
MPI_Win_create(send, (MPI_Aint)tamBl * datasize, datasize, MPI_INFO_NULL, comm, win); MPI_Win_create(send, (MPI_Aint)tamBl * datasize, datasize, MPI_INFO_NULL, comm, win);
switch(red_method) { switch(mall_conf->red_method) {
case MALL_RED_RMA_LOCKALL: case MALL_RED_RMA_LOCKALL:
async_rma_lockall(recv, datatype, r_counts, *win, requests); async_rma_lockall(recv, datatype, r_counts, *win, requests);
break; break;
...@@ -651,11 +646,11 @@ void prepare_redistribution(int qty, MPI_Datatype datatype, int myId, int numP, ...@@ -651,11 +646,11 @@ void prepare_redistribution(int qty, MPI_Datatype datatype, int myId, int numP,
* - request_qty (IN/OUT): Quantity of requests to be used. If the value is smaller than the amount of communication * - request_qty (IN/OUT): Quantity of requests to be used. If the value is smaller than the amount of communication
* functions to perform, it is modified to the minimum value. * functions to perform, it is modified to the minimum value.
*/ */
void check_requests(struct Counts s_counts, struct Counts r_counts, int red_method, int red_strategies, MPI_Request **requests, size_t *request_qty) { void check_requests(struct Counts s_counts, struct Counts r_counts, MPI_Request **requests, size_t *request_qty) {
size_t i, sum; size_t i, sum;
MPI_Request *aux; MPI_Request *aux;
switch(red_method) { switch(mall_conf->red_method) {
case MALL_RED_BASELINE: case MALL_RED_BASELINE:
sum = 1; sum = 1;
break; break;
...@@ -665,7 +660,7 @@ void check_requests(struct Counts s_counts, struct Counts r_counts, int red_meth ...@@ -665,7 +660,7 @@ void check_requests(struct Counts s_counts, struct Counts r_counts, int red_meth
sum += (size_t) r_counts.idE - r_counts.idI; sum += (size_t) r_counts.idE - r_counts.idI;
break; break;
} }
if(malleability_red_contains_strat(red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
sum++; sum++;
} }
...@@ -688,29 +683,3 @@ void check_requests(struct Counts s_counts, struct Counts r_counts, int red_meth ...@@ -688,29 +683,3 @@ void check_requests(struct Counts s_counts, struct Counts r_counts, int red_meth
} }
*request_qty = sum; *request_qty = sum;
} }
/*
* Función para obtener si entre las estrategias elegidas, se utiliza
* la estrategia pasada como segundo argumento.
*
* Devuelve en "result" 1(Verdadero) si utiliza la estrategia, 0(Falso) en caso
* contrario.
*/
int malleability_red_contains_strat(int comm_strategies, int strategy, int *result) {
int value = comm_strategies % strategy ? 0 : 1;
if(result != NULL) *result = value;
return value;
}
/*
* Función para anyadir una estrategia a un conjunto.
*
* Devuelve en "result" 1(Verdadero) si se ha anyadido, 0(Falso) en caso
* contrario.
*/
int malleability_red_add_strat(int *comm_strategies, int strategy) {
if(malleability_red_contains_strat(*comm_strategies, strategy, NULL)) return 1;
*comm_strategies = *comm_strategies * strategy;
return 1;
}
Codes/malleability/CommDist.h
View file @ 20237d79
...@@ -6,20 +6,14 @@ ...@@ -6,20 +6,14 @@
#include <mpi.h> #include <mpi.h>
#include <string.h> #include <string.h>
#include "malleabilityStates.h" #include "malleabilityStates.h"
#include "malleabilityDataStructures.h"
int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int comm_type, MPI_Comm comm); int sync_communication(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, MPI_Comm comm);
//int async_communication(char *send, char **recv, int qty, int myId, int numP, int numO, int is_children_group, int red_method, int red_strategies, MPI_Comm comm, MPI_Request **requests, size_t *request_qty);
int async_communication_start(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, int red_method, int red_strategies, MPI_Comm comm, MPI_Request **requests, size_t *request_qty, MPI_Win *win); int async_communication_start(void *send, void **recv, int qty, MPI_Datatype datatype, int myId, int numP, int numO, int is_children_group, MPI_Comm comm, MPI_Request **requests, size_t *request_qty, MPI_Win *win);
int async_communication_check(int myId, int is_children_group, int red_strategies, MPI_Comm comm, MPI_Request *requests, size_t request_qty); int async_communication_check(int myId, int is_children_group, MPI_Comm comm, MPI_Request *requests, size_t request_qty);
void async_communication_wait(MPI_Comm comm, MPI_Request *requests, size_t request_qty, int post_ibarrier); void async_communication_wait(MPI_Comm comm, MPI_Request *requests, size_t request_qty, int post_ibarrier);
void async_communication_end(int red_method, int red_strategies, MPI_Request *requests, size_t request_qty, MPI_Win *win); void async_communication_end(MPI_Request *requests, size_t request_qty, MPI_Win *win);
//int send_async(char *array, int qty, int myId, int numP, MPI_Comm intercomm, int numP_child, MPI_Request **comm_req, int red_method, int red_strategies);
//void recv_async(char **array, int qty, int myId, int numP, MPI_Comm intercomm, int numP_parents, int red_method, int red_strategies);
void malloc_comm_array(char **array, int qty, int myId, int numP); void malloc_comm_array(char **array, int qty, int myId, int numP);
int malleability_red_contains_strat(int comm_strategies, int strategy, int *result);
int malleability_red_add_strat(int *comm_strategies, int strategy);
#endif #endif
Codes/malleability/MAM.h 0 → 100644
View file @ 20237d79
#ifndef MAM_H
#define MAM_H
#include "malleabilityStates.h"
#include "malleabilityManager.h"
#include "MAM_Configuration.h"
#endif
Codes/malleability/MAM_Configuration.c 0 → 100644
View file @ 20237d79
#include "MAM_Configuration.h"
#include "MAM_Init_Configuration.h"
#include "malleabilityDataStructures.h"
#include <limits.h>
typedef struct {
unsigned int *value, default_value;
int config_max_length;
int (*set_config_function)(unsigned int, unsigned int *);
char *env_name;
} mam_config_setting_t;
int MAM_I_set_method(unsigned int new_method, unsigned int *method);
int MAM_I_set_spawn_strat(unsigned int strategy, unsigned int *strategies);
int MAM_I_set_red_strat(unsigned int strategy, unsigned int *strategies);
int MAM_I_set_target_number(unsigned int new_numC, unsigned int *numC);
int MAM_I_configuration_get_info();
int MAM_I_contains_strat(unsigned int comm_strategies, unsigned int strategy, int *result);
int MAM_I_add_strat(unsigned int *comm_strategies, unsigned int strategy);
int MAM_I_remove_strat(unsigned int *comm_strategies, unsigned int strategy);
mam_config_setting_t configSettings[] = {
{NULL, MALL_SPAWN_MERGE, MAM_METHODS_SPAWN_LEN, MAM_I_set_method, MAM_SPAWN_METHOD_ENV},
{NULL, MAM_STRAT_SPAWN_CLEAR, MAM_STRATS_SPAWN_LEN, MAM_I_set_spawn_strat, MAM_SPAWN_STRATS_ENV},
{NULL, MALL_DIST_COMPACT, MAM_METHODS_PHYSICAL_DISTRIBUTION_LEN, MAM_I_set_method, MAM_PHYSICAL_DISTRIBUTION_METHOD_ENV},
{NULL, MALL_RED_BASELINE, MAM_METHODS_RED_LEN, MAM_I_set_method, MAM_RED_METHOD_ENV},
{NULL, MAM_STRAT_RED_CLEAR, MAM_STRATS_RED_LEN, MAM_I_set_red_strat, MAM_RED_STRATS_ENV},
{NULL, 1, INT_MAX, MAM_I_set_target_number, MAM_NUM_TARGETS_ENV}
};
/**
* @brief Set configuration parameters for MAM.
*
* This function allows setting various configuration parameters for MAM
* such as spawn method, spawn strategies, spawn physical distribution,
* redistribution method, and red strategies.
*
* @param spawn_method The spawn method reconfiguration.
* @param spawn_strategies The spawn strategies reconfiguration.
* @param spawn_dist The spawn physical distribution method reconfiguration.
* @param red_method The redistribution method reconfiguration.
* @param red_strategies The redesitribution strategy for reconfiguration.
*/
void MAM_Set_configuration(int spawn_method, int spawn_strategies, int spawn_dist, int red_method, int red_strategies) {
int i, aux;
int aux_array[] = {spawn_method, spawn_strategies, spawn_dist, red_method, red_strategies};
if(state > MALL_NOT_STARTED) return;
mam_config_setting_t *config = NULL;
for (i = 0; i < MAM_KEY_COUNT-1; i++) { //FIXME Numero magico para no cambiar num_targets
aux = aux_array[i];
config = &configSettings[i];
if (0 <= aux && aux < config->config_max_length) {
config->set_config_function(aux, config->value);
}
}
}
/*
* @brief Set the configuration value for a specific key in MAM.
*
* Modifies the configuration value associated with the given key
* to the specified "required" value. The final value set is returned in the
* "provided" parameter.
*
* @param key The key for which the configuration value is to be modified.
* @param required The required value to set for the specified key.
* @param provided Pointer to an integer where the final value set will be stored.
* This parameter is updated with the actual value after modification.
* For strategy keys the value is "MAM_STRATS_ADDED" if "required" has
* been added, or "MAM_STRATS_MODIFIED" if multiple strategies of the
* key have been modified.
*/
void MAM_Set_key_configuration(int key, int required, int *provided) {
int i, aux;
if(provided == NULL) provided = &aux;
*provided = MALL_DENIED;
if(required < 0 || state > MALL_NOT_STARTED) return;
mam_config_setting_t *config = NULL;
for (i = 0; i < MAM_KEY_COUNT; i++) {
if (key == i) {
config = &configSettings[i];
break;
}
}
if (config != NULL) {
if (required < config->config_max_length) {
*provided = config->set_config_function(required, config->value);
} else {*provided = *(config->value); }
} else { printf("MAM: Key %d does not exist\n", key); }
//FIXME Si cambia esto no se indica...
if(!MAM_I_contains_strat(mall_conf->red_strategies, MAM_STRAT_RED_WAIT_TARGETS, &aux) &&
(mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL)) {
MAM_I_set_red_strat(MAM_STRAT_RED_WAIT_TARGETS, &mall_conf->red_strategies);
}
}
/*
* Retorna si una estrategia aparece o no
*/
int MAM_Contains_strat(int key, unsigned int strategy, int *result) {
int strategies, aux;
switch(key) {
case MAM_SPAWN_STRATEGIES:
if(strategy < MAM_STRATS_SPAWN_LEN) {
strategies = mall_conf->spawn_strategies;
}
break;
case MAM_RED_STRATEGIES:
if(strategy < MAM_STRATS_RED_LEN) {
strategies = mall_conf->red_strategies;
}
break;
default:
aux = MALL_DENIED;
break;
}
if(aux != MALL_DENIED) {
MAM_I_contains_strat(strategies, strategy, &aux);
}
if(result != NULL) *result = aux;
return aux;
}
/*
* //TODO
* Tiene que ser llamado despues de setear la config
*/
int MAM_Set_target_number(unsigned int numC){
return MAM_I_set_target_number(numC, NULL);
}
//======================================================||
//===============MAM_INIT FUNCTIONS=====================||
//======================================================||
//======================================================||
void MAM_Init_configuration() {
if(mall == NULL || mall_conf == NULL) {
printf("MAM FATAL ERROR: Setting initial config without previous mallocs\n");
fflush(stdout);
MPI_Abort(MPI_COMM_WORLD, -50);
}
configSettings[MAM_SPAWN_METHOD].value = &mall_conf->spawn_method;
configSettings[MAM_SPAWN_STRATEGIES].value = &mall_conf->spawn_strategies;
configSettings[MAM_PHYSICAL_DISTRIBUTION].value = &mall_conf->spawn_dist;
configSettings[MAM_RED_METHOD].value = &mall_conf->red_method;
configSettings[MAM_RED_STRATEGIES].value = &mall_conf->red_strategies;
}
void MAM_Check_configuration() {
int not_filled = 1;
not_filled = MAM_I_configuration_get_info();
if(not_filled) {
if(mall->myId == mall->root) printf("MAM WARNING: Starting configuration not set\n");
fflush(stdout);
MPI_Abort(mall->comm, -50);
}
#if USE_MAL_DEBUG >= 2
if(mall->myId == mall->root) {
DEBUG_FUNC("Initial configuration settled", mall->myId, mall->numP);
fflush(stdout);
}
#endif
}
//======================================================||
//================PRIVATE FUNCTIONS=====================||
//================?????????????????=====================||
//======================================================||
//======================================================||
int MAM_I_configuration_get_info() {
size_t i;
int set_value;
char *tmp = NULL;
mam_config_setting_t *config = NULL;
for (i = 0; i < MAM_KEY_COUNT; i++) {
config = &configSettings[i];
tmp = getenv(config->env_name);
if(tmp != NULL) {
set_value = atoi(tmp);
} else {
set_value = config->default_value;
}
if (0 <= set_value && set_value < config->config_max_length) {
config->set_config_function(set_value, config->value);
}
tmp = NULL;
}
return 0;
}
int MAM_I_set_method(unsigned int new_method, unsigned int *method) {
*method = new_method;
return *method;
}
int MAM_I_set_spawn_strat(unsigned int strategy, unsigned int *strategies) {
int result = 0;
int strat_removed = 0;
switch(strategy) {
case MAM_STRAT_SPAWN_CLEAR:
*strategies = MAM_STRAT_CLEAR_VALUE;
result = MAM_STRATS_MODIFIED;
break;
case MAM_STRAT_SPAWN_PTHREAD:
result = MAM_I_add_strat(strategies, MAM_MASK_PTHREAD);
break;
case MAM_STRAT_SPAWN_SINGLE:
result = MAM_I_add_strat(strategies, MAM_MASK_SPAWN_SINGLE);
break;
default:
//Unkown strategy
result = MALL_DENIED;
break;
}
if(strat_removed) {
result = MAM_STRATS_MODIFIED;
}
return result;
}
int MAM_I_set_red_strat(unsigned int strategy, unsigned int *strategies) {
int result = 0;
int strat_removed = 0;
switch(strategy) {
case MAM_STRAT_RED_CLEAR:
*strategies = MAM_STRAT_CLEAR_VALUE;
result = MAM_STRATS_MODIFIED;
break;
case MAM_STRAT_RED_PTHREAD:
result = MAM_I_add_strat(strategies, MAM_MASK_PTHREAD);
if(result == MAM_STRATS_ADDED) {
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_RED_WAIT_SOURCES);
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_RED_WAIT_TARGETS);
}
break;
case MAM_STRAT_RED_WAIT_SOURCES:
result = MAM_I_add_strat(strategies, MAM_MASK_RED_WAIT_SOURCES);
if(result == MAM_STRATS_ADDED) {
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_RED_WAIT_TARGETS);
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_PTHREAD);
}
break;
case MAM_STRAT_RED_WAIT_TARGETS:
result = MAM_I_add_strat(strategies, MAM_MASK_RED_WAIT_TARGETS);
if(result == MAM_STRATS_ADDED) {
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_RED_WAIT_SOURCES);
strat_removed += MAM_I_remove_strat(strategies, MAM_MASK_PTHREAD);
}
break;
default:
//Unkown strategy
result = MALL_DENIED;
break;
}
if(strat_removed) {
result = MAM_STRATS_MODIFIED;
}
return result;
}
int MAM_I_set_target_number(unsigned int new_numC, unsigned int *numC) {
int provided;
if(state > MALL_NOT_STARTED || new_numC == 0) return MALL_DENIED;
mall->numC = (int) new_numC;
if(mall->numC == mall->numP) { // Migrar
MAM_Set_key_configuration(MAM_SPAWN_METHOD, MALL_SPAWN_BASELINE, &provided);
}
return new_numC;
}
/*
* Returns 1 if strategy is applied, 0 otherwise
*/
int MAM_I_contains_strat(unsigned int comm_strategies, unsigned int strategy, int *result) {
*result = comm_strategies & strategy;
return *result;
}
int MAM_I_add_strat(unsigned int *comm_strategies, unsigned int strategy) {
if(MAM_I_contains_strat(*comm_strategies, strategy, NULL)) return MAM_OK;
*comm_strategies |= strategy;
return MAM_STRATS_ADDED;
}
int MAM_I_remove_strat(unsigned int *comm_strategies, unsigned int strategy) {
if(!MAM_I_contains_strat(*comm_strategies, strategy, NULL)) return MAM_OK;
*comm_strategies &= ~strategy;
return MAM_STRATS_MODIFIED;
}
Codes/malleability/MAM_Configuration.h 0 → 100644
View file @ 20237d79
#ifndef MAM_CONFIGURATION_H
#define MAM_CONFIGURATION_H
#include <mpi.h>
#include "malleabilityStates.h"
#define MAM_STRAT_CLEAR_VALUE 0
#define MAM_STRATS_ADDED 1
#define MAM_STRATS_MODIFIED 2
#define MAM_MASK_PTHREAD 0x01
#define MAM_MASK_SPAWN_SINGLE 0x02
#define MAM_MASK_RED_WAIT_SOURCES 0x02
#define MAM_MASK_RED_WAIT_TARGETS 0x04
int MAM_Contains_strat(int key, unsigned int strategy, int *result);
void MAM_Set_configuration(int spawn_method, int spawn_strategies, int spawn_dist, int red_method, int red_strategies);
void MAM_Set_key_configuration(int key, int required, int *provided);
int MAM_Set_target_number(unsigned int numC);
#endif
Codes/malleability/MAM_Init_Configuration.h 0 → 100644
View file @ 20237d79
#ifndef MAM_INIT_CONFIGURATION_H
#define MAM_INIT_CONFIGURATION_H
#include <mpi.h>
#include "malleabilityStates.h"
void MAM_Init_configuration();
void MAM_Check_configuration();
#endif
Codes/malleability/malleabilityDataStructures.c
View file @ 20237d79
#include "malleabilityDataStructures.h" #include "malleabilityDataStructures.h"
int state = MALL_UNRESERVED;
const char *mam_key_names[] = {
MAM_SPAWN_METHOD,
MAM_SPAWN_STRATEGIES,
MAM_PHYSICAL_DISTRIBUTION,
MAM_RED_METHOD,
MAM_RED_STRATEGIES
};
/* /*
* Crea un tipo derivado para mandar las dos estructuras principales * Crea un tipo derivado para mandar las dos estructuras principales
......
Codes/malleability/malleabilityDataStructures.h
View file @ 20237d79
...@@ -10,15 +10,12 @@ ...@@ -10,15 +10,12 @@
#include <pthread.h> #include <pthread.h>
#include "malleabilityStates.h" #include "malleabilityStates.h"
#define DEBUG_FUNC(debug_string, rank, numP) printf("MaM [P%d/%d]: %s -- %s:%s:%d\n", rank, numP, debug_string, __FILE__, __func__, __LINE__) #define DEBUG_FUNC(debug_string, rank, numP) printf("MaM [P%d/%d]: %s -- %s:%s:%d\n", rank, numP, debug_string, __FILE__, __func__, __LINE__)
/* --- PHYSICAL DIST STRUCTURE --- */ /* --- PHYSICAL DIST STRUCTURE --- */
struct physical_dist { struct physical_dist {
int num_cpus, num_nodes;
char *nodelist;
int target_qty, already_created; int target_qty, already_created;
int dist_type, info_type; int info_type;
}; };
/* --- SPAWN STRUCTURE --- */ /* --- SPAWN STRUCTURE --- */
...@@ -48,17 +45,17 @@ typedef struct { ...@@ -48,17 +45,17 @@ typedef struct {
/* --- GLOBAL STRUCTURES --- */ /* --- GLOBAL STRUCTURES --- */
typedef struct { typedef struct {
int spawn_method; unsigned int spawn_method;
int spawn_dist; unsigned int spawn_dist;
int spawn_strategies; unsigned int spawn_strategies;
int red_method; unsigned int red_method;
int red_strategies; unsigned int red_strategies;
malleability_times_t *times; malleability_times_t *times;
} malleability_config_t; } malleability_config_t;
typedef struct { //FIXME numC_spawned no se esta usando typedef struct { //FIXME numC_spawned no se esta usando
int myId, numP, numC, numC_spawned, root, root_parents, zombie; int myId, numP, numC, root, root_parents, zombie;
int is_intercomm; int is_intercomm;
pthread_t async_thread; pthread_t async_thread;
MPI_Comm comm, thread_comm; MPI_Comm comm, thread_comm;
...@@ -73,9 +70,7 @@ typedef struct { //FIXME numC_spawned no se esta usando ...@@ -73,9 +70,7 @@ typedef struct { //FIXME numC_spawned no se esta usando
/* --- VARIABLES --- */ /* --- VARIABLES --- */
malleability_config_t *mall_conf; malleability_config_t *mall_conf;
malleability_t *mall; malleability_t *mall;
extern int state;
extern const char *mam_key_names[];
enum mam_key_values{MAM_SPAWN_METHOD_VALUE=0, MAM_SPAWN_STRATEGIES_VALUE, MAM_PHYSICAL_DISTRIBUTION_VALUE, MAM_PYHSICAL_DISTRIBUTION_VALUE, MAM_RED_METHOD_VALUE, MAM_RED_STRATEGIES_VALUE, MAM_KEY_COUNT};
/* --- FUNCTIONS --- */ /* --- FUNCTIONS --- */
void MAM_Def_main_datatype(); void MAM_Def_main_datatype();
......
Codes/malleability/malleabilityManager.c
View file @ 20237d79
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include "malleabilityManager.h" //#include "malleabilityManager.h"
#include "MAM.h"
#include "malleabilityStates.h" #include "malleabilityStates.h"
#include "malleabilityDataStructures.h" #include "malleabilityDataStructures.h"
#include "malleabilityTypes.h" #include "malleabilityTypes.h"
#include "malleabilityZombies.h" #include "malleabilityZombies.h"
#include "malleabilityTimes.h" #include "malleabilityTimes.h"
#include "malleabilityRMS.h" #include "malleabilityRMS.h"
#include "MAM_Init_Configuration.h"
#include "spawn_methods/GenericSpawn.h" #include "spawn_methods/GenericSpawn.h"
#include "CommDist.h" #include "CommDist.h"
...@@ -49,8 +51,6 @@ void malleability_comms_update(MPI_Comm comm); ...@@ -49,8 +51,6 @@ void malleability_comms_update(MPI_Comm comm);
int MAM_I_convert_key(char *key); int MAM_I_convert_key(char *key);
void MAM_I_create_user_struct(int is_children_group); void MAM_I_create_user_struct(int is_children_group);
int state = MALL_UNRESERVED; //FIXME Mover a otro lado
malleability_data_t *rep_s_data; malleability_data_t *rep_s_data;
malleability_data_t *dist_s_data; malleability_data_t *dist_s_data;
malleability_data_t *rep_a_data; malleability_data_t *rep_a_data;
...@@ -110,6 +110,7 @@ int MAM_Init(int root, MPI_Comm *comm, char *name_exec, void (*user_function)(vo ...@@ -110,6 +110,7 @@ int MAM_Init(int root, MPI_Comm *comm, char *name_exec, void (*user_function)(vo
state = MALL_NOT_STARTED; state = MALL_NOT_STARTED;
MAM_Init_configuration();
zombies_service_init(); zombies_service_init();
init_malleability_times(); init_malleability_times();
MAM_Def_main_datatype(); MAM_Def_main_datatype();
...@@ -120,8 +121,9 @@ int MAM_Init(int root, MPI_Comm *comm, char *name_exec, void (*user_function)(vo ...@@ -120,8 +121,9 @@ int MAM_Init(int root, MPI_Comm *comm, char *name_exec, void (*user_function)(vo
Children_init(user_function, user_args); Children_init(user_function, user_args);
return MALLEABILITY_CHILDREN; return MALLEABILITY_CHILDREN;
} }
MAM_check_hosts();
MAM_check_hosts();
MAM_Check_configuration();
#if USE_MAL_BARRIERS && USE_MAL_DEBUG #if USE_MAL_BARRIERS && USE_MAL_DEBUG
if(mall->myId == mall->root) if(mall->myId == mall->root)
...@@ -308,75 +310,6 @@ void MAM_Retrieve_times(double *sp_time, double *sy_time, double *asy_time, doub ...@@ -308,75 +310,6 @@ void MAM_Retrieve_times(double *sp_time, double *sy_time, double *asy_time, doub
MAM_I_retrieve_times(sp_time, sy_time, asy_time, mall_time); MAM_I_retrieve_times(sp_time, sy_time, asy_time, mall_time);
} }
void MAM_Set_configuration(int spawn_method, int spawn_strategies, int spawn_dist, int red_method, int red_strategies) {
if(state > MALL_NOT_STARTED) return;
mall_conf->spawn_method = spawn_method;
mall_conf->spawn_strategies = spawn_strategies;
mall_conf->spawn_dist = spawn_dist;
mall_conf->red_method = red_method;
mall_conf->red_strategies = red_strategies;
if(!malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL) &&
(mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL)) {
malleability_red_add_strat(&(mall_conf->red_strategies), MALL_RED_IBARRIER);
}
}
void MAM_Set_key_configuration(char *key, int required, int *provided) {
int value = MAM_I_convert_key(key);
*provided = required;
switch(value) { //TODO Comprobar si required existe para key
case MAM_SPAWN_METHOD_VALUE:
mall_conf->spawn_method = required;
break;
case MAM_SPAWN_STRATEGIES_VALUE:
malleability_spawn_add_strat(&(mall_conf->spawn_strategies), required);
*provided = mall_conf->spawn_strategies;
break;
case MAM_PHYSICAL_DISTRIBUTION_VALUE:
mall_conf->spawn_dist = required;
break;
case MAM_RED_METHOD_VALUE:
mall_conf->red_method = required;
break;
case MAM_RED_STRATEGIES_VALUE:
malleability_red_add_strat(&(mall_conf->red_strategies), required);
*provided = mall_conf->red_strategies;
break;
case MALL_DENIED:
default:
printf("MAM: Key %s does not exist\n", key);
*provided = MALL_DENIED;
break;
}
if(!malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL) &&
(mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL)) {
malleability_red_add_strat(&(mall_conf->red_strategies), MALL_RED_IBARRIER);
}
}
/*
* Tiene que ser llamado despues de setear la config
*/
void MAM_Set_target_number(int numC){
if(state > MALL_NOT_STARTED) return;
if((mall_conf->spawn_method == MALL_SPAWN_MERGE) && (numC >= mall->numP)) {
mall->numC = numC;
mall->numC_spawned = numC - mall->numP;
if(numC == mall->numP) { // Migrar
mall->numC_spawned = numC;
mall_conf->spawn_method = MALL_SPAWN_BASELINE;
}
} else {
mall->numC = numC;
mall->numC_spawned = numC;
}
}
/* /*
* Anyade a la estructura concreta de datos elegida * Anyade a la estructura concreta de datos elegida
* el nuevo set de datos "data" de un total de "total_qty" elementos. * el nuevo set de datos "data" de un total de "total_qty" elementos.
...@@ -399,7 +332,7 @@ void malleability_add_data(void *data, size_t total_qty, MPI_Datatype type, int ...@@ -399,7 +332,7 @@ void malleability_add_data(void *data, size_t total_qty, MPI_Datatype type, int
} else if(mall_conf->red_method == MALL_RED_POINT || mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL) { } else if(mall_conf->red_method == MALL_RED_POINT || mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL) {
total_reqs = mall->numC; total_reqs = mall->numC;
} }
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
total_reqs++; total_reqs++;
} }
...@@ -435,7 +368,7 @@ void malleability_modify_data(void *data, size_t index, size_t total_qty, MPI_Da ...@@ -435,7 +368,7 @@ void malleability_modify_data(void *data, size_t index, size_t total_qty, MPI_Da
} else if(mall_conf->red_method == MALL_RED_POINT || mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL) { } else if(mall_conf->red_method == MALL_RED_POINT || mall_conf->red_method == MALL_RED_RMA_LOCK || mall_conf->red_method == MALL_RED_RMA_LOCKALL) {
total_reqs = mall->numC; total_reqs = mall->numC;
} }
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
total_reqs++; total_reqs++;
} }
...@@ -518,15 +451,15 @@ void send_data(int numP_children, malleability_data_t *data_struct, int is_async ...@@ -518,15 +451,15 @@ void send_data(int numP_children, malleability_data_t *data_struct, int is_async
for(i=0; i < data_struct->entries; i++) { for(i=0; i < data_struct->entries; i++) {
aux_send = data_struct->arrays[i]; aux_send = data_struct->arrays[i];
aux_recv = NULL; aux_recv = NULL;
async_communication_start(aux_send, &aux_recv, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_children, MALLEABILITY_NOT_CHILDREN, mall_conf->red_method, async_communication_start(aux_send, &aux_recv, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_children, MALLEABILITY_NOT_CHILDREN,
mall_conf->red_strategies, mall->intercomm, &(data_struct->requests[i]), &(data_struct->request_qty[i]), &(data_struct->windows[i])); mall->intercomm, &(data_struct->requests[i]), &(data_struct->request_qty[i]), &(data_struct->windows[i]));
if(aux_recv != NULL) data_struct->arrays[i] = aux_recv; if(aux_recv != NULL) data_struct->arrays[i] = aux_recv;
} }
} else { } else {
for(i=0; i < data_struct->entries; i++) { for(i=0; i < data_struct->entries; i++) {
aux_send = data_struct->arrays[i]; aux_send = data_struct->arrays[i];
aux_recv = NULL; aux_recv = NULL;
sync_communication(aux_send, &aux_recv, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_children, MALLEABILITY_NOT_CHILDREN, mall_conf->red_method, mall->intercomm); sync_communication(aux_send, &aux_recv, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_children, MALLEABILITY_NOT_CHILDREN, mall->intercomm);
if(aux_recv != NULL) data_struct->arrays[i] = aux_recv; if(aux_recv != NULL) data_struct->arrays[i] = aux_recv;
} }
} }
...@@ -544,14 +477,14 @@ void recv_data(int numP_parents, malleability_data_t *data_struct, int is_asynch ...@@ -544,14 +477,14 @@ void recv_data(int numP_parents, malleability_data_t *data_struct, int is_asynch
if(is_asynchronous) { if(is_asynchronous) {
for(i=0; i < data_struct->entries; i++) { for(i=0; i < data_struct->entries; i++) {
aux = data_struct->arrays[i]; aux = data_struct->arrays[i];
async_communication_start(aux_s, &aux, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_parents, MALLEABILITY_CHILDREN, mall_conf->red_method, mall_conf->red_strategies, async_communication_start(aux_s, &aux, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_parents, MALLEABILITY_CHILDREN,
mall->intercomm, &(data_struct->requests[i]), &(data_struct->request_qty[i]), &(data_struct->windows[i])); mall->intercomm, &(data_struct->requests[i]), &(data_struct->request_qty[i]), &(data_struct->windows[i]));
data_struct->arrays[i] = aux; data_struct->arrays[i] = aux;
} }
} else { } else {
for(i=0; i < data_struct->entries; i++) { for(i=0; i < data_struct->entries; i++) {
aux = data_struct->arrays[i]; aux = data_struct->arrays[i];
sync_communication(aux_s, &aux, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_parents, MALLEABILITY_CHILDREN, mall_conf->red_method, mall->intercomm); sync_communication(aux_s, &aux, data_struct->qty[i], data_struct->types[i], mall->myId, mall->numP, numP_parents, MALLEABILITY_CHILDREN, mall->intercomm);
data_struct->arrays[i] = aux; data_struct->arrays[i] = aux;
} }
} }
...@@ -608,7 +541,7 @@ int MAM_St_red_start() { ...@@ -608,7 +541,7 @@ int MAM_St_red_start() {
} }
int MAM_St_red_pending(int *mam_state, int wait_completed) { int MAM_St_red_pending(int *mam_state, int wait_completed) {
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_THREAD, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_PTHREAD, NULL)) {
state = thread_check(wait_completed); state = thread_check(wait_completed);
} else { } else {
state = check_redistribution(wait_completed); state = check_redistribution(wait_completed);
...@@ -663,7 +596,7 @@ int MAM_St_spawn_adapt_pending(int wait_completed) { ...@@ -663,7 +596,7 @@ int MAM_St_spawn_adapt_pending(int wait_completed) {
unset_spawn_postpone_flag(state); unset_spawn_postpone_flag(state);
state = check_spawn_state(&(mall->intercomm), mall->comm, wait_completed); state = check_spawn_state(&(mall->intercomm), mall->comm, wait_completed);
if(!malleability_spawn_contains_strat(mall_conf->spawn_strategies, MALL_SPAWN_PTHREAD, NULL)) { if(!MAM_Contains_strat(MAM_SPAWN_STRATEGIES, MAM_STRAT_SPAWN_PTHREAD, NULL)) {
#if USE_MAL_BARRIERS #if USE_MAL_BARRIERS
MPI_Barrier(mall->comm); MPI_Barrier(mall->comm);
#endif #endif
...@@ -727,7 +660,7 @@ void Children_init(void (*user_function)(void *), void *user_args) { ...@@ -727,7 +660,7 @@ void Children_init(void (*user_function)(void *), void *user_args) {
MPI_Barrier(mall->intercomm); MPI_Barrier(mall->intercomm);
#endif #endif
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_THREAD, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_PTHREAD, NULL)) {
recv_data(numP_parents, dist_a_data, MALLEABILITY_USE_SYNCHRONOUS); recv_data(numP_parents, dist_a_data, MALLEABILITY_USE_SYNCHRONOUS);
for(i=0; i<rep_a_data->entries; i++) { for(i=0; i<rep_a_data->entries; i++) {
MPI_Bcast(rep_a_data->arrays[i], rep_a_data->qty[i], rep_a_data->types[i], mall->root_parents, mall->intercomm); MPI_Bcast(rep_a_data->arrays[i], rep_a_data->qty[i], rep_a_data->types[i], mall->root_parents, mall->intercomm);
...@@ -747,7 +680,7 @@ void Children_init(void (*user_function)(void *), void *user_args) { ...@@ -747,7 +680,7 @@ void Children_init(void (*user_function)(void *), void *user_args) {
for(i=0; i<rep_a_data->entries; i++) { for(i=0; i<rep_a_data->entries; i++) {
async_communication_wait(mall->intercomm, rep_a_data->requests[i], rep_a_data->request_qty[i], post_ibarrier); async_communication_wait(mall->intercomm, rep_a_data->requests[i], rep_a_data->request_qty[i], post_ibarrier);
} }
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL)) { post_ibarrier=1; } if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) { post_ibarrier=1; }
for(i=0; i<dist_a_data->entries; i++) { for(i=0; i<dist_a_data->entries; i++) {
async_communication_wait(mall->intercomm, dist_a_data->requests[i], dist_a_data->request_qty[i], post_ibarrier); async_communication_wait(mall->intercomm, dist_a_data->requests[i], dist_a_data->request_qty[i], post_ibarrier);
} }
...@@ -755,10 +688,10 @@ void Children_init(void (*user_function)(void *), void *user_args) { ...@@ -755,10 +688,10 @@ void Children_init(void (*user_function)(void *), void *user_args) {
DEBUG_FUNC("Targets waited for all asynchronous redistributions", mall->myId, mall->numP); fflush(stdout); MPI_Barrier(MPI_COMM_WORLD); DEBUG_FUNC("Targets waited for all asynchronous redistributions", mall->myId, mall->numP); fflush(stdout); MPI_Barrier(MPI_COMM_WORLD);
#endif #endif
for(i=0; i<dist_a_data->entries; i++) { for(i=0; i<dist_a_data->entries; i++) {
async_communication_end(mall_conf->red_method, mall_conf->red_strategies, dist_a_data->requests[i], dist_a_data->request_qty[i], &(dist_a_data->windows[i])); async_communication_end(dist_a_data->requests[i], dist_a_data->request_qty[i], &(dist_a_data->windows[i]));
} }
for(i=0; i<rep_a_data->entries; i++) { for(i=0; i<rep_a_data->entries; i++) {
async_communication_end(mall_conf->red_method, mall_conf->red_strategies, rep_a_data->requests[i], rep_a_data->request_qty[i], &(rep_a_data->windows[i])); async_communication_end(rep_a_data->requests[i], rep_a_data->request_qty[i], &(rep_a_data->windows[i]));
} }
} }
...@@ -826,9 +759,9 @@ int spawn_step(){ ...@@ -826,9 +759,9 @@ int spawn_step(){
#endif #endif
mall_conf->times->spawn_start = MPI_Wtime(); mall_conf->times->spawn_start = MPI_Wtime();
state = init_spawn(mall->name_exec, mall->num_cpus, mall->num_nodes, mall->nodelist, mall->myId, mall->numP, mall->numC, mall->root, mall_conf->spawn_dist, mall_conf->spawn_method, mall_conf->spawn_strategies, mall->thread_comm, &(mall->intercomm)); state = init_spawn(mall->name_exec, mall->myId, mall->numP, mall->numC, mall->root, mall->thread_comm, &(mall->intercomm));
if(!malleability_spawn_contains_strat(mall_conf->spawn_strategies, MALL_SPAWN_PTHREAD, NULL)) { if(!MAM_Contains_strat(MAM_SPAWN_STRATEGIES, MAM_STRAT_SPAWN_PTHREAD, NULL)) {
#if USE_MAL_BARRIERS #if USE_MAL_BARRIERS
MPI_Barrier(mall->comm); MPI_Barrier(mall->comm);
#endif #endif
...@@ -879,7 +812,7 @@ int start_redistribution() { ...@@ -879,7 +812,7 @@ int start_redistribution() {
MPI_Barrier(mall->intercomm); MPI_Barrier(mall->intercomm);
#endif #endif
mall_conf->times->async_start = MPI_Wtime(); mall_conf->times->async_start = MPI_Wtime();
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_THREAD, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_PTHREAD, NULL)) {
return thread_creation(); return thread_creation();
} else { } else {
send_data(mall->numC, dist_a_data, MALLEABILITY_USE_ASYNCHRONOUS); send_data(mall->numC, dist_a_data, MALLEABILITY_USE_ASYNCHRONOUS);
...@@ -919,7 +852,7 @@ int check_redistribution(int wait_completed) { ...@@ -919,7 +852,7 @@ int check_redistribution(int wait_completed) {
#endif #endif
if(wait_completed) { if(wait_completed) {
if(malleability_red_contains_strat(mall_conf->red_strategies, MALL_RED_IBARRIER, NULL)) { if(MAM_Contains_strat(MAM_RED_STRATEGIES, MAM_STRAT_RED_WAIT_TARGETS, NULL)) {
if( mall->is_intercomm || mall->myId >= mall->numC) { if( mall->is_intercomm || mall->myId >= mall->numC) {
post_ibarrier=1; post_ibarrier=1;
} }
...@@ -938,13 +871,13 @@ int check_redistribution(int wait_completed) { ...@@ -938,13 +871,13 @@ int check_redistribution(int wait_completed) {
for(i=0; i<dist_a_data->entries; i++) { for(i=0; i<dist_a_data->entries; i++) {
req_completed = dist_a_data->requests[i]; req_completed = dist_a_data->requests[i];
req_qty = dist_a_data->request_qty[i]; req_qty = dist_a_data->request_qty[i];
completed = async_communication_check(mall->myId, MALLEABILITY_NOT_CHILDREN, mall_conf->red_strategies, mall->intercomm, req_completed, req_qty); completed = async_communication_check(mall->myId, MALLEABILITY_NOT_CHILDREN, mall->intercomm, req_completed, req_qty);
local_completed = local_completed && completed; local_completed = local_completed && completed;
} }
for(i=0; i<rep_a_data->entries; i++) { //FIXME Ibarrier does not work with rep_a_data for(i=0; i<rep_a_data->entries; i++) { //FIXME Ibarrier does not work with rep_a_data
req_completed = rep_a_data->requests[i]; req_completed = rep_a_data->requests[i];
req_qty = rep_a_data->request_qty[i]; req_qty = rep_a_data->request_qty[i];
completed = async_communication_check(mall->myId, MALLEABILITY_NOT_CHILDREN, mall_conf->red_strategies, mall->intercomm, req_completed, req_qty); completed = async_communication_check(mall->myId, MALLEABILITY_NOT_CHILDREN, mall->intercomm, req_completed, req_qty);
local_completed = local_completed && completed; local_completed = local_completed && completed;
} }
#if USE_MAL_DEBUG >= 2 #if USE_MAL_DEBUG >= 2
...@@ -963,13 +896,13 @@ int check_redistribution(int wait_completed) { ...@@ -963,13 +896,13 @@ int check_redistribution(int wait_completed) {
req_completed = dist_a_data->requests[i]; req_completed = dist_a_data->requests[i];
req_qty = dist_a_data->request_qty[i]; req_qty = dist_a_data->request_qty[i];
window = dist_a_data->windows[i]; window = dist_a_data->windows[i];
async_communication_end(mall_conf->red_method, mall_conf->red_strategies, req_completed, req_qty, &window); async_communication_end(req_completed, req_qty, &window);
} }
for(i=0; i<rep_a_data->entries; i++) { for(i=0; i<rep_a_data->entries; i++) {
req_completed = rep_a_data->requests[i]; req_completed = rep_a_data->requests[i];
req_qty = rep_a_data->request_qty[i]; req_qty = rep_a_data->request_qty[i];
window = rep_a_data->windows[i]; window = rep_a_data->windows[i];
async_communication_end(mall_conf->red_method, mall_conf->red_strategies, req_completed, req_qty, &window); async_communication_end(req_completed, req_qty, &window);
} }
#if USE_MAL_BARRIERS #if USE_MAL_BARRIERS
...@@ -1143,20 +1076,6 @@ void malleability_comms_update(MPI_Comm comm) { ...@@ -1143,20 +1076,6 @@ void malleability_comms_update(MPI_Comm comm) {
MPI_Comm_set_name(mall->comm, "MAM_MAIN"); MPI_Comm_set_name(mall->comm, "MAM_MAIN");
} }
/*
* Converts the name of a Key to its value version
*/
int MAM_I_convert_key(char *key) {
size_t i;
for(i=0; i<MAM_KEY_COUNT; i++) {
if(strcmp(key, mam_key_names[i]) == 0) { // Equal
return i;
}
}
return MALL_DENIED;
}
/* /*
* TODO Por hacer * TODO Por hacer
*/ */
......
Codes/malleability/malleabilityManager.h
View file @ 20237d79
...@@ -22,9 +22,6 @@ void MAM_Resume_redistribution(int *mam_state); ...@@ -22,9 +22,6 @@ void MAM_Resume_redistribution(int *mam_state);
int MAM_Get_Reconf_Info(mam_user_reconf_t *reconf_info); int MAM_Get_Reconf_Info(mam_user_reconf_t *reconf_info);
void MAM_Set_configuration(int spawn_method, int spawn_strategies, int spawn_dist, int red_method, int red_strategies);
void MAM_Set_key_configuration(char *key, int required, int *provided);
void MAM_Set_target_number(int numC); // TODO TO BE DEPRECATED
void malleability_add_data(void *data, size_t total_qty, MPI_Datatype type, int is_replicated, int is_constant); void malleability_add_data(void *data, size_t total_qty, MPI_Datatype type, int is_replicated, int is_constant);
void malleability_modify_data(void *data, size_t index, size_t total_qty, MPI_Datatype type, int is_replicated, int is_constant); void malleability_modify_data(void *data, size_t index, size_t total_qty, MPI_Datatype type, int is_replicated, int is_constant);
......
Codes/malleability/malleabilityRMS.c
View file @ 20237d79
#define _GNU_SOURCE #define _GNU_SOURCE
#include "malleabilityRMS.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sched.h> #include <sched.h>
#include <mpi.h>
#include "malleabilityRMS.h"
#include "malleabilityDataStructures.h"
#if USE_MAL_SLURM #if USE_MAL_SLURM
......
Codes/malleability/malleabilityRMS.h
View file @ 20237d79
#ifndef MALLEABILITY_RMS_H #ifndef MALLEABILITY_RMS_H
#define MALLEABILITY_RMS_H #define MALLEABILITY_RMS_H
#include <mpi.h>
#include "malleabilityDataStructures.h"
void MAM_check_hosts(); void MAM_check_hosts();
#endif #endif
Codes/malleability/malleabilityStates.h
View file @ 20237d79
...@@ -6,25 +6,31 @@ ...@@ -6,25 +6,31 @@
//States //States
#define MALL_DENIED -1 #define MALL_DENIED -1
#define MAM_OK 0
enum mall_inner_states{MALL_UNRESERVED, MALL_NOT_STARTED, MALL_RMS_COMPLETED, MALL_SPAWN_PENDING, MALL_SPAWN_SINGLE_PENDING, enum mall_inner_states{MALL_UNRESERVED, MALL_NOT_STARTED, MALL_RMS_COMPLETED, MALL_SPAWN_PENDING, MALL_SPAWN_SINGLE_PENDING,
MALL_SPAWN_SINGLE_COMPLETED, MALL_SPAWN_ADAPT_POSTPONE, MALL_SPAWN_COMPLETED, MALL_DIST_PENDING, MALL_DIST_COMPLETED, MALL_SPAWN_SINGLE_COMPLETED, MALL_SPAWN_ADAPT_POSTPONE, MALL_SPAWN_COMPLETED, MALL_DIST_PENDING, MALL_DIST_COMPLETED,
MALL_SPAWN_ADAPT_PENDING, MALL_USER_PENDING, MALL_USER_COMPLETED, MALL_SPAWN_ADAPTED, MALL_COMPLETED}; MALL_SPAWN_ADAPT_PENDING, MALL_USER_PENDING, MALL_USER_COMPLETED, MALL_SPAWN_ADAPTED, MALL_COMPLETED};
enum mam_states{MAM_UNRESERVED, MAM_NOT_STARTED, MAM_PENDING, MAM_USER_PENDING, MAM_COMPLETED}; enum mam_states{MAM_UNRESERVED, MAM_NOT_STARTED, MAM_PENDING, MAM_USER_PENDING, MAM_COMPLETED};
enum mam_proc_states{MAM_PROC_CONTINUE, MAM_PROC_NEW_RANK, MAM_PROC_ZOMBIE}; enum mam_proc_states{MAM_PROC_CONTINUE, MAM_PROC_NEW_RANK, MAM_PROC_ZOMBIE};
enum mall_spawn_methods{MALL_SPAWN_BASELINE, MALL_SPAWN_MERGE};
#define MALL_SPAWN_PTHREAD 2
#define MALL_SPAWN_SINGLE 3
enum mall_redistribution_methods{MALL_RED_BASELINE, MALL_RED_POINT, MALL_RED_RMA_LOCK, MALL_RED_RMA_LOCKALL};
#define MALL_RED_THREAD 2 enum mall_spawn_methods{MALL_SPAWN_BASELINE, MALL_SPAWN_MERGE, MAM_METHODS_SPAWN_LEN};
#define MALL_RED_IBARRIER 3 enum mam_spawn_strategies{MAM_STRAT_SPAWN_CLEAR, MAM_STRAT_SPAWN_PTHREAD, MAM_STRAT_SPAWN_SINGLE, MAM_STRATS_SPAWN_LEN};
enum mam_phy_dist_methods{MALL_DIST_SPREAD = 1, MALL_DIST_COMPACT, MAM_METHODS_PHYSICAL_DISTRIBUTION_LEN}; //FIXME Cambiar nombres a PHY_DIST?
enum mam_phy_info_methods{MALL_DIST_STRING = 1, MALL_DIST_HOSTFILE}; //FIXME Cambiar nombres a PHY_DIST?
enum mall_redistribution_methods{MALL_RED_BASELINE, MALL_RED_POINT, MALL_RED_RMA_LOCK, MALL_RED_RMA_LOCKALL, MAM_METHODS_RED_LEN};
enum mam_red_strategies{MAM_STRAT_RED_CLEAR, MAM_STRAT_RED_PTHREAD, MAM_STRAT_RED_WAIT_SOURCES, MAM_STRAT_RED_WAIT_TARGETS, MAM_STRATS_RED_LEN};
/* KEYS & VALUES for config*/ /* KEYS & VALUES for config*/
#define MAM_SPAWN_METHOD "MAM_SPAWN_METHOD" enum mam_key_values{MAM_SPAWN_METHOD=0, MAM_SPAWN_STRATEGIES, MAM_PHYSICAL_DISTRIBUTION, MAM_RED_METHOD, MAM_RED_STRATEGIES, MAM_NUM_TARGETS, MAM_KEY_COUNT};
#define MAM_SPAWN_STRATEGIES "MAM_SPAWN_STRATEGIES" #define MAM_SPAWN_METHOD_ENV "MAM_SPAWN_METHOD"
#define MAM_PHYSICAL_DISTRIBUTION "MAM_PHYSICAL_DISTRIBUTION" #define MAM_SPAWN_STRATS_ENV "MAM_SPAWN_STRATS"
#define MAM_RED_METHOD "MAM_RED_METHOD" #define MAM_PHYSICAL_DISTRIBUTION_METHOD_ENV "MAM_PHYSICAL_DISTRIBUTION_METHOD"
#define MAM_RED_STRATEGIES "MAM_RED_STRATEGIES" #define MAM_RED_METHOD_ENV "MAM_RED_METHOD"
#define MAM_RED_STRATS_ENV "MAM_RED_STRATS"
#define MAM_NUM_TARGETS_ENV "MAM_NUM_TARGETS"
#define MALLEABILITY_ROOT 0 #define MALLEABILITY_ROOT 0
......
Codes/malleability/malleabilityTimes.c
View file @ 20237d79
#include "malleabilityTimes.h" #include "malleabilityTimes.h"
#include "malleabilityDataStructures.h"
void def_malleability_times(MPI_Datatype *new_type); void def_malleability_times(MPI_Datatype *new_type);
......
Codes/malleability/malleabilityTimes.h
View file @ 20237d79
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#define MALLEABILITY_TIMES_H #define MALLEABILITY_TIMES_H
#include <mpi.h> #include <mpi.h>
#include "malleabilityDataStructures.h"
void init_malleability_times(); void init_malleability_times();
void reset_malleability_times(); void reset_malleability_times();
......
Codes/malleability/spawn_methods/GenericSpawn.c
View file @ 20237d79
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <string.h> #include <string.h>
#include "../malleabilityStates.h" #include "../malleabilityStates.h"
#include "../malleabilityDataStructures.h" #include "../malleabilityDataStructures.h"
#include "../MAM_Configuration.h"
#include "ProcessDist.h" #include "ProcessDist.h"
#include "GenericSpawn.h" #include "GenericSpawn.h"
#include "Baseline.h" #include "Baseline.h"
...@@ -21,7 +22,7 @@ pthread_t spawn_thread; ...@@ -21,7 +22,7 @@ pthread_t spawn_thread;
MPI_Comm *returned_comm; MPI_Comm *returned_comm;
//--------------PRIVATE CONFIGURATION DECLARATIONS---------------// //--------------PRIVATE CONFIGURATION DECLARATIONS---------------//
void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodelist, int myId, int root, int initial_qty, int target_qty, int type_dist, int spawn_method, int spawn_strategies, MPI_Comm comm); void set_spawn_configuration(char *cmd, int myId, int root, int initial_qty, int target_qty, MPI_Comm comm);
void set_basic_spawn_dtype(); void set_basic_spawn_dtype();
void deallocate_spawn_data(); void deallocate_spawn_data();
...@@ -54,9 +55,9 @@ void* thread_work(); ...@@ -54,9 +55,9 @@ void* thread_work();
* Devuelve el estado de el procedimiento. Si no devuelve "MALL_SPAWN_COMPLETED", es necesario llamar a * Devuelve el estado de el procedimiento. Si no devuelve "MALL_SPAWN_COMPLETED", es necesario llamar a
* "check_spawn_state()". * "check_spawn_state()".
*/ */
int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId, int initial_qty, int target_qty, int root, int type_dist, int spawn_method, int spawn_strategies, MPI_Comm comm, MPI_Comm *child) { int init_spawn(char *argv, int myId, int initial_qty, int target_qty, int root, MPI_Comm comm, MPI_Comm *child) {
int local_state; int local_state;
set_spawn_configuration(argv, num_cpus, num_nodes, nodelist, myId, root, initial_qty, target_qty, type_dist, spawn_method, spawn_strategies, comm); set_spawn_configuration(argv, myId, root, initial_qty, target_qty, comm);
if(!spawn_data->spawn_is_async) { if(!spawn_data->spawn_is_async) {
generic_spawn(child, MALL_NOT_STARTED); generic_spawn(child, MALL_NOT_STARTED);
...@@ -67,7 +68,7 @@ int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId ...@@ -67,7 +68,7 @@ int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId
} else { } else {
local_state = spawn_data->spawn_is_single ? local_state = spawn_data->spawn_is_single ?
MALL_SPAWN_SINGLE_PENDING : MALL_SPAWN_PENDING; MALL_SPAWN_SINGLE_PENDING : MALL_SPAWN_PENDING;
local_state = spawn_data->spawn_method == MALL_SPAWN_MERGE && spawn_data->initial_qty > spawn_data->target_qty ? local_state = mall_conf->spawn_method == MALL_SPAWN_MERGE && spawn_data->initial_qty > spawn_data->target_qty ?
MALL_SPAWN_ADAPT_POSTPONE : local_state; MALL_SPAWN_ADAPT_POSTPONE : local_state;
set_spawn_state(local_state, 0); set_spawn_state(local_state, 0);
if((spawn_data->spawn_is_single && myId == root) || !spawn_data->spawn_is_single) { if((spawn_data->spawn_is_single && myId == root) || !spawn_data->spawn_is_single) {
...@@ -103,7 +104,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed) { ...@@ -103,7 +104,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed) {
MPI_Abort(MPI_COMM_WORLD, -1); MPI_Abort(MPI_COMM_WORLD, -1);
return -10; return -10;
} }
} else if(spawn_data->spawn_method == MALL_SPAWN_MERGE){ // Start Merge shrink Sync } else if(mall_conf->spawn_method == MALL_SPAWN_MERGE){ // Start Merge shrink Sync
generic_spawn(child, MALL_DIST_COMPLETED); generic_spawn(child, MALL_DIST_COMPLETED);
global_state = get_spawn_state(spawn_data->spawn_is_async); global_state = get_spawn_state(spawn_data->spawn_is_async);
} }
...@@ -125,7 +126,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed) { ...@@ -125,7 +126,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed) {
void unset_spawn_postpone_flag(int outside_state) { void unset_spawn_postpone_flag(int outside_state) {
int local_state = get_spawn_state(spawn_data->spawn_is_async); int local_state = get_spawn_state(spawn_data->spawn_is_async);
if(local_state == MALL_SPAWN_ADAPT_POSTPONE && outside_state == MALL_SPAWN_ADAPT_PENDING && spawn_data->spawn_is_async) { if(local_state == MALL_SPAWN_ADAPT_POSTPONE && outside_state == MALL_SPAWN_ADAPT_PENDING && spawn_data->spawn_is_async) {
set_spawn_state(MALL_SPAWN_PENDING, MALL_SPAWN_PTHREAD); set_spawn_state(MALL_SPAWN_PENDING, spawn_data->spawn_is_async);
wakeup_redistribution(); wakeup_redistribution();
} }
} }
...@@ -166,31 +167,12 @@ void malleability_connect_children(int myId, int numP, int root, MPI_Comm comm, ...@@ -166,31 +167,12 @@ void malleability_connect_children(int myId, int numP, int root, MPI_Comm comm,
free(spawn_data); free(spawn_data);
} }
/*
* Función para obtener si entre las estrategias elegidas, se utiliza
* la estrategia pasada como segundo argumento.
*
* Devuelve en "result" 1(Verdadero) si utiliza la estrategia, 0(Falso) en caso
* contrario.
*/
int malleability_spawn_contains_strat(int spawn_strategies, int strategy, int *result) {
int value = spawn_strategies % strategy ? 0 : 1;
if(result != NULL) *result = value;
return value;
}
int malleability_spawn_add_strat(int *spawn_strategies, int strategy) {
if(malleability_spawn_contains_strat(*spawn_strategies, strategy, NULL)) return 1;
*spawn_strategies = *spawn_strategies * strategy;
return 1;
}
//--------------PRIVATE CONFIGURATION FUNCTIONS---------------// //--------------PRIVATE CONFIGURATION FUNCTIONS---------------//
/* /*
* Agrupa en una sola estructura todos los datos de configuración necesarios * Agrupa en una sola estructura todos los datos de configuración necesarios
* e inicializa las estructuras necesarias. * e inicializa las estructuras necesarias.
*/ */
void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodelist, int myId, int root, int initial_qty, int target_qty, int type_dist, int spawn_method, int spawn_strategies, MPI_Comm comm) { void set_spawn_configuration(char *cmd, int myId, int root, int initial_qty, int target_qty, MPI_Comm comm) {
spawn_data = (Spawn_data *) malloc(sizeof(Spawn_data)); spawn_data = (Spawn_data *) malloc(sizeof(Spawn_data));
spawn_data->myId = myId; spawn_data->myId = myId;
...@@ -198,14 +180,14 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel ...@@ -198,14 +180,14 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel
spawn_data->root_parents = root; spawn_data->root_parents = root;
spawn_data->initial_qty = initial_qty; spawn_data->initial_qty = initial_qty;
spawn_data->target_qty = target_qty; spawn_data->target_qty = target_qty;
spawn_data->spawn_method = spawn_method; spawn_data->spawn_method = mall_conf->spawn_method;
malleability_spawn_contains_strat(spawn_strategies, MALL_SPAWN_SINGLE, &(spawn_data->spawn_is_single)); MAM_Contains_strat(MAM_SPAWN_STRATEGIES, MAM_STRAT_SPAWN_SINGLE, &(spawn_data->spawn_is_single)); //FIXME Realmente es necesario spawn_is_single? Mejor usar la funcion?
malleability_spawn_contains_strat(spawn_strategies, MALL_SPAWN_PTHREAD, &(spawn_data->spawn_is_async)); MAM_Contains_strat(MAM_SPAWN_STRATEGIES, MAM_STRAT_SPAWN_PTHREAD, &(spawn_data->spawn_is_async));
spawn_data->comm = comm; spawn_data->comm = comm;
set_basic_spawn_dtype(); set_basic_spawn_dtype();
switch(spawn_data->spawn_method) { switch(mall_conf->spawn_method) {
case MALL_SPAWN_BASELINE: case MALL_SPAWN_BASELINE:
spawn_data->spawn_qty = spawn_data->target_qty; spawn_data->spawn_qty = spawn_data->target_qty;
spawn_data->already_created = 0; spawn_data->already_created = 0;
...@@ -222,7 +204,7 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel ...@@ -222,7 +204,7 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel
spawn_data->mapping = MPI_INFO_NULL; spawn_data->mapping = MPI_INFO_NULL;
if(spawn_data->myId == spawn_data->root) { if(spawn_data->myId == spawn_data->root) {
physical_struct_create(target_qty, spawn_data->already_created, num_cpus, num_nodes, nodelist, type_dist, MALL_DIST_STRING, &(spawn_data->dist)); physical_struct_create(target_qty, spawn_data->already_created, MALL_DIST_STRING, &(spawn_data->dist));
//COPY PROGRAM NAME //COPY PROGRAM NAME
spawn_data->cmd = malloc((strlen(cmd)+1) * sizeof(char)); spawn_data->cmd = malloc((strlen(cmd)+1) * sizeof(char));
...@@ -301,7 +283,7 @@ void generic_spawn(MPI_Comm *child, int data_stage) { ...@@ -301,7 +283,7 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
if(spawn_data->myId == spawn_data->root && spawn_data->spawn_qty > 0) { //SET MAPPING FOR NEW PROCESSES if(spawn_data->myId == spawn_data->root && spawn_data->spawn_qty > 0) { //SET MAPPING FOR NEW PROCESSES
processes_dist(spawn_data->dist, &(spawn_data->mapping)); processes_dist(spawn_data->dist, &(spawn_data->mapping));
} }
switch(spawn_data->spawn_method) { switch(mall_conf->spawn_method) {
case MALL_SPAWN_BASELINE: case MALL_SPAWN_BASELINE:
local_state = baseline(*spawn_data, child); local_state = baseline(*spawn_data, child);
break; break;
...@@ -351,7 +333,7 @@ void* thread_work() { ...@@ -351,7 +333,7 @@ void* thread_work() {
generic_spawn(returned_comm, MALL_NOT_STARTED); generic_spawn(returned_comm, MALL_NOT_STARTED);
local_state = get_spawn_state(MALL_SPAWN_PTHREAD); local_state = get_spawn_state(spawn_data->spawn_is_async);
if(local_state == MALL_SPAWN_ADAPT_POSTPONE || local_state == MALL_SPAWN_PENDING) { if(local_state == MALL_SPAWN_ADAPT_POSTPONE || local_state == MALL_SPAWN_PENDING) {
// El grupo de procesos se terminara de juntar tras la redistribucion de datos // El grupo de procesos se terminara de juntar tras la redistribucion de datos
...@@ -383,7 +365,7 @@ int check_single_state(MPI_Comm comm, int global_state, int wait_completed) { ...@@ -383,7 +365,7 @@ int check_single_state(MPI_Comm comm, int global_state, int wait_completed) {
// They also must join if the application has ended its work // They also must join if the application has ended its work
if(global_state == MALL_SPAWN_SINGLE_COMPLETED) { if(global_state == MALL_SPAWN_SINGLE_COMPLETED) {
global_state = MALL_SPAWN_PENDING; global_state = MALL_SPAWN_PENDING;
set_spawn_state(global_state, MALL_SPAWN_PTHREAD); set_spawn_state(global_state, spawn_data->spawn_is_async);
if(spawn_data->myId != spawn_data->root) { if(spawn_data->myId != spawn_data->root) {
allocate_thread_spawn(spawn_data); allocate_thread_spawn(spawn_data);
...@@ -408,7 +390,7 @@ int check_generic_state(MPI_Comm comm, MPI_Comm *child, int local_state, int wai ...@@ -408,7 +390,7 @@ int check_generic_state(MPI_Comm comm, MPI_Comm *child, int local_state, int wai
MPI_Allreduce(&local_state, &global_state, 1, MPI_INT, MPI_MIN, comm); MPI_Allreduce(&local_state, &global_state, 1, MPI_INT, MPI_MIN, comm);
if(global_state == MALL_SPAWN_COMPLETED || global_state == MALL_SPAWN_ADAPTED) { if(global_state == MALL_SPAWN_COMPLETED || global_state == MALL_SPAWN_ADAPTED) {
set_spawn_state(global_state, MALL_SPAWN_PTHREAD); set_spawn_state(global_state, spawn_data->spawn_is_async);
*child = *returned_comm; *child = *returned_comm;
deallocate_spawn_data(); deallocate_spawn_data();
} }
......
Codes/malleability/spawn_methods/GenericSpawn.h
View file @ 20237d79
...@@ -4,15 +4,12 @@ ...@@ -4,15 +4,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <mpi.h> #include <mpi.h>
#include "../malleabilityDataStructures.h"
int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId, int initial_qty, int target_qty, int root, int type_dist, int spawn_method, int spawn_strategies, MPI_Comm comm, MPI_Comm *child); int init_spawn(char *argv, int myId, int initial_qty, int target_qty, int root, MPI_Comm comm, MPI_Comm *child);
int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed); int check_spawn_state(MPI_Comm *child, MPI_Comm comm, int wait_completed);
void malleability_connect_children(int myId, int numP, int root, MPI_Comm comm, int *numP_parents, int *root_parents, MPI_Comm *parents); void malleability_connect_children(int myId, int numP, int root, MPI_Comm comm, int *numP_parents, int *root_parents, MPI_Comm *parents);
void unset_spawn_postpone_flag(int outside_state); void unset_spawn_postpone_flag(int outside_state);
int malleability_spawn_contains_strat(int spawn_strategies, int strategy, int *result);
int malleability_spawn_add_strat(int *spawn_strategies, int strategy);
#endif #endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment