Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Iker Martín Álvarez
Malleable_CG
Commits
e466e997
Commit
e466e997
authored
Feb 21, 2024
by
iker_martin
Browse files
Updated maleable CG to use the new MaM interface
parent
b7bcaffe
Changes
35
Hide whitespace changes
Inline
Side-by-side
malleability/malleabilityTypes.c
View file @
e466e997
#include "malleabilityTypes.h"
#include "malleabilityTypes.h"
#include "malleabilityDataStructures.h"
#include "MAM_Configuration.h"
void
init_malleability_data_struct
(
malleability_data_t
*
data_struct
,
size_t
size
);
void
init_malleability_data_struct
(
malleability_data_t
*
data_struct
,
size_t
size
);
...
@@ -20,7 +22,7 @@ void def_malleability_qty_type(malleability_data_t *data_struct_rep, malleabilit
...
@@ -20,7 +22,7 @@ void def_malleability_qty_type(malleability_data_t *data_struct_rep, malleabilit
* todos los padres. La nueva serie "data" solo representa los datos
* todos los padres. La nueva serie "data" solo representa los datos
* que tiene este padre.
* que tiene este padre.
*/
*/
void
add_data
(
void
*
data
,
size_t
total_qty
,
int
type
,
int
dependency
,
size_t
request_qty
,
malleability_data_t
*
data_struct
)
{
void
add_data
(
void
*
data
,
size_t
total_qty
,
MPI_Datatype
type
,
size_t
request_qty
,
malleability_data_t
*
data_struct
)
{
size_t
i
;
size_t
i
;
if
(
data_struct
->
entries
==
0
)
{
if
(
data_struct
->
entries
==
0
)
{
...
@@ -31,7 +33,6 @@ void add_data(void *data, size_t total_qty, int type, int dependency, size_t req
...
@@ -31,7 +33,6 @@ void add_data(void *data, size_t total_qty, int type, int dependency, size_t req
data_struct
->
qty
[
data_struct
->
entries
]
=
total_qty
;
data_struct
->
qty
[
data_struct
->
entries
]
=
total_qty
;
data_struct
->
types
[
data_struct
->
entries
]
=
type
;
data_struct
->
types
[
data_struct
->
entries
]
=
type
;
data_struct
->
dependencies
[
data_struct
->
entries
]
=
dependency
;
data_struct
->
arrays
[
data_struct
->
entries
]
=
data
;
data_struct
->
arrays
[
data_struct
->
entries
]
=
data
;
data_struct
->
request_qty
[
data_struct
->
entries
]
=
request_qty
;
data_struct
->
request_qty
[
data_struct
->
entries
]
=
request_qty
;
...
@@ -50,7 +51,7 @@ void add_data(void *data, size_t total_qty, int type, int dependency, size_t req
...
@@ -50,7 +51,7 @@ void add_data(void *data, size_t total_qty, int type, int dependency, size_t req
* todos los padres. La nueva serie "data" solo representa los datos
* todos los padres. La nueva serie "data" solo representa los datos
* que tiene este padre.
* que tiene este padre.
*/
*/
void
modify_data
(
void
*
data
,
size_t
index
,
size_t
total_qty
,
int
type
,
int
dependency
,
size_t
request_qty
,
malleability_data_t
*
data_struct
)
{
void
modify_data
(
void
*
data
,
size_t
index
,
size_t
total_qty
,
MPI_Datatype
type
,
size_t
request_qty
,
malleability_data_t
*
data_struct
)
{
size_t
i
;
size_t
i
;
if
(
data_struct
->
entries
<
index
)
{
// Index does not exist
if
(
data_struct
->
entries
<
index
)
{
// Index does not exist
...
@@ -63,7 +64,6 @@ void modify_data(void *data, size_t index, size_t total_qty, int type, int depen
...
@@ -63,7 +64,6 @@ void modify_data(void *data, size_t index, size_t total_qty, int type, int depen
data_struct
->
qty
[
index
]
=
total_qty
;
data_struct
->
qty
[
index
]
=
total_qty
;
data_struct
->
types
[
index
]
=
type
;
data_struct
->
types
[
index
]
=
type
;
data_struct
->
dependencies
[
index
]
=
dependency
;
data_struct
->
arrays
[
index
]
=
data
;
data_struct
->
arrays
[
index
]
=
data
;
data_struct
->
request_qty
[
index
]
=
request_qty
;
data_struct
->
request_qty
[
index
]
=
request_qty
;
...
@@ -82,21 +82,14 @@ void modify_data(void *data, size_t index, size_t total_qty, int type, int depen
...
@@ -82,21 +82,14 @@ void modify_data(void *data, size_t index, size_t total_qty, int type, int depen
* En el argumento "root" todos tienen que indicar quien es el proceso raiz de los padres
* En el argumento "root" todos tienen que indicar quien es el proceso raiz de los padres
* unicamente.
* unicamente.
*/
*/
void
comm_data_info
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
int
is_children_group
,
int
myId
,
int
root
,
MPI_Comm
intercomm
)
{
void
comm_data_info
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
int
is_children_group
)
{
int
is_intercomm
,
rootBcast
=
MPI_PROC_NULL
;
int
type_size
;
size_t
i
,
j
;
size_t
i
,
j
;
MPI_Datatype
entries_type
,
struct_type
;
MPI_Datatype
entries_type
,
struct_type
;
MPI_Comm_test_inter
(
intercomm
,
&
is_intercomm
);
if
(
is_intercomm
&&
!
is_children_group
)
{
rootBcast
=
myId
==
root
?
MPI_ROOT
:
MPI_PROC_NULL
;
}
else
{
rootBcast
=
root
;
}
// Mandar primero numero de entradas
// Mandar primero numero de entradas
def_malleability_entries
(
data_struct_dist
,
data_struct_rep
,
&
entries_type
);
def_malleability_entries
(
data_struct_dist
,
data_struct_rep
,
&
entries_type
);
MPI_Bcast
(
MPI_BOTTOM
,
1
,
entries_type
,
rootBcast
,
intercomm
);
MPI_Bcast
(
MPI_BOTTOM
,
1
,
entries_type
,
mall
->
root_collectives
,
mall
->
intercomm
);
if
(
is_children_group
&&
(
data_struct_rep
->
entries
!=
0
||
data_struct_dist
->
entries
!=
0
))
{
if
(
is_children_group
&&
(
data_struct_rep
->
entries
!=
0
||
data_struct_dist
->
entries
!=
0
))
{
init_malleability_data_struct
(
data_struct_rep
,
data_struct_rep
->
entries
);
init_malleability_data_struct
(
data_struct_rep
,
data_struct_rep
->
entries
);
...
@@ -104,28 +97,19 @@ void comm_data_info(malleability_data_t *data_struct_rep, malleability_data_t *d
...
@@ -104,28 +97,19 @@ void comm_data_info(malleability_data_t *data_struct_rep, malleability_data_t *d
}
}
def_malleability_qty_type
(
data_struct_dist
,
data_struct_rep
,
&
struct_type
);
def_malleability_qty_type
(
data_struct_dist
,
data_struct_rep
,
&
struct_type
);
MPI_Bcast
(
MPI_BOTTOM
,
1
,
struct_type
,
rootBcast
,
intercomm
);
MPI_Bcast
(
MPI_BOTTOM
,
1
,
struct_type
,
mall
->
root_collectives
,
mall
->
intercomm
);
if
(
is_children_group
)
{
if
(
is_children_group
)
{
for
(
i
=
0
;
i
<
data_struct_rep
->
entries
;
i
++
)
{
for
(
i
=
0
;
i
<
data_struct_rep
->
entries
;
i
++
)
{
if
(
data_struct_rep
->
types
[
i
]
==
MAL_INT
)
{
MPI_Type_size
(
data_struct_rep
->
types
[
i
],
&
type_size
);
data_struct_rep
->
arrays
[
i
]
=
(
void
*
)
malloc
(
data_struct_rep
->
qty
[
i
]
*
sizeof
(
int
));
data_struct_rep
->
arrays
[
i
]
=
(
void
*
)
malloc
(
data_struct_rep
->
qty
[
i
]
*
type_size
);
}
else
if
(
data_struct_rep
->
types
[
i
]
==
MAL_DOUBLE
)
{
data_struct_rep
->
arrays
[
i
]
=
(
void
*
)
malloc
(
data_struct_rep
->
qty
[
i
]
*
sizeof
(
double
));
}
else
if
(
data_struct_rep
->
types
[
i
]
==
MAL_CHAR
)
{
data_struct_rep
->
arrays
[
i
]
=
(
void
*
)
malloc
(
data_struct_rep
->
qty
[
i
]
*
sizeof
(
char
));
}
else
{
printf
(
"Malleability -- Redistribution data array type not recognised
\n
"
);
MPI_Abort
(
MPI_COMM_WORLD
,
-
1
);
}
data_struct_rep
->
requests
[
i
]
=
(
MPI_Request
*
)
malloc
(
data_struct_rep
->
request_qty
[
i
]
*
sizeof
(
MPI_Request
));
data_struct_rep
->
requests
[
i
]
=
(
MPI_Request
*
)
malloc
(
data_struct_rep
->
request_qty
[
i
]
*
sizeof
(
MPI_Request
));
for
(
j
=
0
;
j
<
data_struct_rep
->
request_qty
[
i
];
j
++
)
{
for
(
j
=
0
;
j
<
data_struct_rep
->
request_qty
[
i
];
j
++
)
{
data_struct_rep
->
requests
[
i
][
j
]
=
MPI_REQUEST_NULL
;
data_struct_rep
->
requests
[
i
][
j
]
=
MPI_REQUEST_NULL
;
}
}
}
}
for
(
i
=
0
;
i
<
data_struct_dist
->
entries
;
i
++
)
{
for
(
i
=
0
;
i
<
data_struct_dist
->
entries
;
i
++
)
{
data_struct_dist
->
arrays
[
i
]
=
(
void
*
)
NULL
;
data_struct_dist
->
arrays
[
i
]
=
(
void
*
)
NULL
;
// TODO Se podria inicializar aqui?
data_struct_dist
->
requests
[
i
]
=
(
MPI_Request
*
)
malloc
(
data_struct_dist
->
request_qty
[
i
]
*
sizeof
(
MPI_Request
));
data_struct_dist
->
requests
[
i
]
=
(
MPI_Request
*
)
malloc
(
data_struct_dist
->
request_qty
[
i
]
*
sizeof
(
MPI_Request
));
for
(
j
=
0
;
j
<
data_struct_dist
->
request_qty
[
i
];
j
++
)
{
for
(
j
=
0
;
j
<
data_struct_dist
->
request_qty
[
i
];
j
++
)
{
data_struct_dist
->
requests
[
i
][
j
]
=
MPI_REQUEST_NULL
;
data_struct_dist
->
requests
[
i
][
j
]
=
MPI_REQUEST_NULL
;
...
@@ -153,10 +137,10 @@ void init_malleability_data_struct(malleability_data_t *data_struct, size_t size
...
@@ -153,10 +137,10 @@ void init_malleability_data_struct(malleability_data_t *data_struct, size_t size
data_struct
->
max_entries
=
size
;
data_struct
->
max_entries
=
size
;
data_struct
->
qty
=
(
size_t
*
)
malloc
(
size
*
sizeof
(
size_t
));
data_struct
->
qty
=
(
size_t
*
)
malloc
(
size
*
sizeof
(
size_t
));
data_struct
->
types
=
(
int
*
)
malloc
(
size
*
sizeof
(
int
));
data_struct
->
types
=
(
MPI_Datatype
*
)
malloc
(
size
*
sizeof
(
MPI_Datatype
));
data_struct
->
dependencies
=
(
int
*
)
malloc
(
size
*
sizeof
(
int
));
data_struct
->
request_qty
=
(
size_t
*
)
malloc
(
size
*
sizeof
(
size_t
));
data_struct
->
request_qty
=
(
size_t
*
)
malloc
(
size
*
sizeof
(
size_t
));
data_struct
->
requests
=
(
MPI_Request
**
)
malloc
(
size
*
sizeof
(
MPI_Request
*
));
data_struct
->
requests
=
(
MPI_Request
**
)
malloc
(
size
*
sizeof
(
MPI_Request
*
));
data_struct
->
windows
=
(
MPI_Win
*
)
malloc
(
size
*
sizeof
(
MPI_Win
));
data_struct
->
arrays
=
(
void
**
)
malloc
(
size
*
sizeof
(
void
*
));
data_struct
->
arrays
=
(
void
**
)
malloc
(
size
*
sizeof
(
void
*
));
for
(
i
=
0
;
i
<
size
;
i
++
)
{
//calloc and memset does not ensure a NULL value
for
(
i
=
0
;
i
<
size
;
i
++
)
{
//calloc and memset does not ensure a NULL value
...
@@ -172,33 +156,42 @@ void init_malleability_data_struct(malleability_data_t *data_struct, size_t size
...
@@ -172,33 +156,42 @@ void init_malleability_data_struct(malleability_data_t *data_struct, size_t size
*/
*/
void
realloc_malleability_data_struct
(
malleability_data_t
*
data_struct
,
size_t
qty_to_add
)
{
void
realloc_malleability_data_struct
(
malleability_data_t
*
data_struct
,
size_t
qty_to_add
)
{
size_t
i
,
needed
,
*
qty_aux
,
*
request_qty_aux
;
size_t
i
,
needed
,
*
qty_aux
,
*
request_qty_aux
;
int
*
types_aux
,
*
dependencies_aux
;
MPI_Datatype
*
types_aux
;
MPI_Win
*
windows_aux
;
MPI_Request
**
requests_aux
;
MPI_Request
**
requests_aux
;
void
**
arrays_aux
;
void
**
arrays_aux
;
needed
=
data_struct
->
max_entries
+
qty_to_add
;
needed
=
data_struct
->
max_entries
+
qty_to_add
;
qty_aux
=
(
size_t
*
)
realloc
(
data_struct
->
qty
,
needed
*
sizeof
(
int
));
qty_aux
=
(
size_t
*
)
realloc
(
data_struct
->
qty
,
needed
*
sizeof
(
int
));
types_aux
=
(
int
*
)
realloc
(
data_struct
->
types
,
needed
*
sizeof
(
int
));
types_aux
=
(
MPI_Datatype
*
)
realloc
(
data_struct
->
types
,
needed
*
sizeof
(
MPI_Datatype
));
dependencies_aux
=
(
int
*
)
realloc
(
data_struct
->
dependencies
,
needed
*
sizeof
(
int
));
request_qty_aux
=
(
size_t
*
)
realloc
(
data_struct
->
request_qty
,
needed
*
sizeof
(
int
));
request_qty_aux
=
(
size_t
*
)
realloc
(
data_struct
->
request_qty
,
needed
*
sizeof
(
int
));
requests_aux
=
(
MPI_Request
**
)
realloc
(
data_struct
->
requests
,
needed
*
sizeof
(
MPI_Request
*
));
requests_aux
=
(
MPI_Request
**
)
realloc
(
data_struct
->
requests
,
needed
*
sizeof
(
MPI_Request
*
));
windows_aux
=
(
MPI_Win
*
)
realloc
(
data_struct
->
windows
,
needed
*
sizeof
(
MPI_Win
));
arrays_aux
=
(
void
**
)
realloc
(
data_struct
->
arrays
,
needed
*
sizeof
(
void
*
));
arrays_aux
=
(
void
**
)
realloc
(
data_struct
->
arrays
,
needed
*
sizeof
(
void
*
));
if
(
qty_aux
==
NULL
||
arrays_aux
==
NULL
||
requests_aux
==
NULL
||
types_aux
==
NULL
||
dependencies
_aux
==
NULL
||
request_qty
_aux
==
NULL
)
{
if
(
qty_aux
==
NULL
||
arrays_aux
==
NULL
||
requests_aux
==
NULL
||
types_aux
==
NULL
||
request_qty
_aux
==
NULL
||
windows
_aux
==
NULL
)
{
fprintf
(
stderr
,
"Fatal error - No se ha podido realojar la memoria constante de datos a redistribuir/comunicar
\n
"
);
fprintf
(
stderr
,
"Fatal error - No se ha podido realojar la memoria constante de datos a redistribuir/comunicar
\n
"
);
MPI_Abort
(
MPI_COMM_WORLD
,
1
);
MPI_Abort
(
MPI_COMM_WORLD
,
1
);
}
}
for
(
i
=
data_struct
->
max_entries
;
i
<
needed
;
i
++
)
{
//
c
alloc
and memset
does not ensure a NULL value
for
(
i
=
data_struct
->
max_entries
;
i
<
needed
;
i
++
)
{
//
re
alloc does not ensure a NULL value
requests_aux
[
i
]
=
NULL
;
requests_aux
[
i
]
=
NULL
;
arrays_aux
[
i
]
=
NULL
;
arrays_aux
[
i
]
=
NULL
;
}
}
// Check if old array can be freed
if
(
data_struct
->
qty
!=
qty_aux
&&
data_struct
->
qty
!=
NULL
)
free
(
data_struct
->
qty
);
if
(
data_struct
->
types
!=
types_aux
&&
data_struct
->
types
!=
NULL
)
free
(
data_struct
->
types
);
if
(
data_struct
->
request_qty
!=
request_qty_aux
&&
data_struct
->
request_qty
!=
NULL
)
free
(
data_struct
->
request_qty
);
if
(
data_struct
->
requests
!=
requests_aux
&&
data_struct
->
requests
!=
NULL
)
free
(
data_struct
->
requests
);
if
(
data_struct
->
windows
!=
windows_aux
&&
data_struct
->
windows
!=
NULL
)
free
(
data_struct
->
windows
);
if
(
data_struct
->
arrays
!=
arrays_aux
&&
data_struct
->
arrays
!=
NULL
)
free
(
data_struct
->
arrays
);
data_struct
->
qty
=
qty_aux
;
data_struct
->
qty
=
qty_aux
;
data_struct
->
types
=
types_aux
;
data_struct
->
types
=
types_aux
;
data_struct
->
dependencies
=
dependencies_aux
;
data_struct
->
request_qty
=
request_qty_aux
;
data_struct
->
request_qty
=
request_qty_aux
;
data_struct
->
requests
=
requests_aux
;
data_struct
->
requests
=
requests_aux
;
data_struct
->
windows
=
windows_aux
;
data_struct
->
arrays
=
arrays_aux
;
data_struct
->
arrays
=
arrays_aux
;
data_struct
->
max_entries
=
needed
;
data_struct
->
max_entries
=
needed
;
}
}
...
@@ -208,19 +201,12 @@ void free_malleability_data_struct(malleability_data_t *data_struct) {
...
@@ -208,19 +201,12 @@ void free_malleability_data_struct(malleability_data_t *data_struct) {
max
=
data_struct
->
entries
;
max
=
data_struct
->
entries
;
if
(
max
!=
0
)
{
if
(
max
!=
0
)
{
for
(
i
=
0
;
i
<
max
;
i
++
)
{
//free(data_struct->arrays[i]); //FIXME Valores alojados con 1 elemento no se liberan?
}
if
(
data_struct
->
qty
!=
NULL
)
{
if
(
data_struct
->
qty
!=
NULL
)
{
free
(
data_struct
->
qty
);
free
(
data_struct
->
qty
);
}
}
if
(
data_struct
->
types
!=
NULL
)
{
if
(
data_struct
->
types
!=
NULL
)
{
free
(
data_struct
->
types
);
free
(
data_struct
->
types
);
}
}
if
(
data_struct
->
dependencies
!=
NULL
)
{
free
(
data_struct
->
dependencies
);
}
if
(
data_struct
->
requests
!=
NULL
&&
data_struct
->
request_qty
!=
NULL
)
{
if
(
data_struct
->
requests
!=
NULL
&&
data_struct
->
request_qty
!=
NULL
)
{
for
(
i
=
0
;
i
<
max
;
i
++
)
{
for
(
i
=
0
;
i
<
max
;
i
++
)
{
if
(
data_struct
->
requests
[
i
]
!=
NULL
)
{
if
(
data_struct
->
requests
[
i
]
!=
NULL
)
{
...
@@ -237,6 +223,10 @@ void free_malleability_data_struct(malleability_data_t *data_struct) {
...
@@ -237,6 +223,10 @@ void free_malleability_data_struct(malleability_data_t *data_struct) {
free
(
data_struct
->
requests
);
free
(
data_struct
->
requests
);
}
}
if
(
data_struct
->
windows
!=
NULL
)
{
free
(
data_struct
->
windows
);
}
if
(
data_struct
->
arrays
!=
NULL
)
{
if
(
data_struct
->
arrays
!=
NULL
)
{
free
(
data_struct
->
arrays
);
free
(
data_struct
->
arrays
);
}
}
...
@@ -257,10 +247,11 @@ void def_malleability_entries(malleability_data_t *data_struct_rep, malleability
...
@@ -257,10 +247,11 @@ void def_malleability_entries(malleability_data_t *data_struct_rep, malleability
int
counts
=
2
;
int
counts
=
2
;
int
blocklengths
[
counts
];
int
blocklengths
[
counts
];
MPI_Aint
displs
[
counts
];
MPI_Aint
displs
[
counts
];
MPI_Datatype
types
[
counts
];
MPI_Datatype
types
[
counts
],
type_size_t
;
MPI_Type_match_size
(
MPI_TYPECLASS_INTEGER
,
sizeof
(
size_t
),
&
type_size_t
);
blocklengths
[
0
]
=
blocklengths
[
1
]
=
1
;
blocklengths
[
0
]
=
blocklengths
[
1
]
=
1
;
types
[
0
]
=
types
[
1
]
=
MPI_UNSIGNED_LONG
;
types
[
0
]
=
types
[
1
]
=
type_size_t
;
// Obtener direccion base
// Obtener direccion base
MPI_Get_address
(
&
(
data_struct_rep
->
entries
),
&
displs
[
0
]);
MPI_Get_address
(
&
(
data_struct_rep
->
entries
),
&
displs
[
0
]);
...
@@ -278,25 +269,27 @@ void def_malleability_entries(malleability_data_t *data_struct_rep, malleability
...
@@ -278,25 +269,27 @@ void def_malleability_entries(malleability_data_t *data_struct_rep, malleability
* TODO Refactor?
* TODO Refactor?
*/
*/
void
def_malleability_qty_type
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
MPI_Datatype
*
new_type
)
{
void
def_malleability_qty_type
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
MPI_Datatype
*
new_type
)
{
int
counts
=
8
;
int
counts
=
6
;
int
blocklengths
[
counts
];
int
blocklengths
[
counts
];
MPI_Aint
displs
[
counts
];
MPI_Aint
displs
[
counts
];
MPI_Datatype
types
[
counts
];
MPI_Datatype
types
[
counts
],
type_size_t
;
MPI_Type_match_size
(
MPI_TYPECLASS_INTEGER
,
sizeof
(
size_t
),
&
type_size_t
);
types
[
0
]
=
types
[
1
]
=
types
[
4
]
=
types
[
5
]
=
MPI_UNSIGNED_LONG
;
types
[
0
]
=
types
[
1
]
=
types
[
3
]
=
types
[
4
]
=
type_size_t
;
types
[
2
]
=
types
[
3
]
=
types
[
6
]
=
types
[
7
]
=
MPI_INT
;
types
[
2
]
=
types
[
5
]
=
MPI_INT
;
blocklengths
[
0
]
=
blocklengths
[
1
]
=
blocklengths
[
2
]
=
blocklengths
[
3
]
=
data_struct_rep
->
entries
;
blocklengths
[
0
]
=
blocklengths
[
1
]
=
blocklengths
[
2
]
=
data_struct_rep
->
entries
;
blocklengths
[
4
]
=
blocklengths
[
5
]
=
blocklengths
[
6
]
=
blocklengths
[
7
]
=
data_struct_dist
->
entries
;
blocklengths
[
3
]
=
blocklengths
[
4
]
=
blocklengths
[
5
]
=
data_struct_dist
->
entries
;
MPI_Get_address
((
data_struct_rep
->
qty
),
&
displs
[
0
]);
MPI_Get_address
((
data_struct_rep
->
qty
),
&
displs
[
0
]);
MPI_Get_address
((
data_struct_rep
->
request_qty
),
&
displs
[
1
]);
MPI_Get_address
((
data_struct_rep
->
request_qty
),
&
displs
[
1
]);
MPI_Get_address
((
data_struct_rep
->
types
),
&
displs
[
2
]);
MPI_Get_address
((
data_struct_rep
->
types
),
&
displs
[
2
]);
// MPI_Datatype uses typedef int to be declared
MPI_Get_address
((
data_struct_rep
->
dependencies
),
&
displs
[
3
]);
MPI_Get_address
((
data_struct_dist
->
qty
),
&
displs
[
3
]);
MPI_Get_address
((
data_struct_dist
->
qty
),
&
displs
[
4
]);
MPI_Get_address
((
data_struct_dist
->
request_qty
),
&
displs
[
4
]);
MPI_Get_address
((
data_struct_dist
->
request_qty
),
&
displs
[
5
]);
MPI_Get_address
((
data_struct_dist
->
types
),
&
displs
[
5
]);
// MPI_Datatype uses typedef int to be declared
MPI_Get_address
((
data_struct_dist
->
types
),
&
displs
[
6
]);
MPI_Get_address
((
data_struct_dist
->
dependencies
),
&
displs
[
7
]);
MPI_Type_create_struct
(
counts
,
blocklengths
,
displs
,
types
,
new_type
);
MPI_Type_create_struct
(
counts
,
blocklengths
,
displs
,
types
,
new_type
);
MPI_Type_commit
(
new_type
);
MPI_Type_commit
(
new_type
);
}
}
malleability/malleabilityTypes.h
View file @
e466e997
...
@@ -14,20 +14,20 @@ typedef struct {
...
@@ -14,20 +14,20 @@ typedef struct {
size_t
entries
;
// Indica numero de vectores a comunicar (replicated data)
size_t
entries
;
// Indica numero de vectores a comunicar (replicated data)
size_t
max_entries
;
size_t
max_entries
;
size_t
*
qty
;
// Indica numero de elementos en cada subvector de sync_array
size_t
*
qty
;
// Indica numero de elementos en cada subvector de sync_array
int
*
types
;
MPI_Datatype
*
types
;
int
*
dependencies
;
// Vector de vectores de request. En cada elemento superior se indican los requests a comprobar para dar por finalizada
// Vector de vectores de request. En cada elemento superior se indican los requests a comprobar para dar por finalizada
// la comunicacion de ese dato
// la comunicacion de ese dato
size_t
*
request_qty
;
size_t
*
request_qty
;
MPI_Request
**
requests
;
MPI_Request
**
requests
;
MPI_Win
*
windows
;
void
**
arrays
;
// Cada subvector es una serie de datos a comunicar
void
**
arrays
;
// Cada subvector es una serie de datos a comunicar
}
malleability_data_t
;
}
malleability_data_t
;
void
add_data
(
void
*
data
,
size_t
total_qty
,
int
type
,
int
dependency
,
size_t
request_qty
,
malleability_data_t
*
data_struct
);
void
add_data
(
void
*
data
,
size_t
total_qty
,
MPI_Datatype
type
,
size_t
request_qty
,
malleability_data_t
*
data_struct
);
void
modify_data
(
void
*
data
,
size_t
index
,
size_t
total_qty
,
int
type
,
int
dependency
,
size_t
request_qty
,
malleability_data_t
*
data_struct
);
void
modify_data
(
void
*
data
,
size_t
index
,
size_t
total_qty
,
MPI_Datatype
type
,
size_t
request_qty
,
malleability_data_t
*
data_struct
);
void
comm_data_info
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
int
is_children_group
,
int
myId
,
int
root
,
MPI_Comm
intercomm
);
void
comm_data_info
(
malleability_data_t
*
data_struct_rep
,
malleability_data_t
*
data_struct_dist
,
int
is_children_group
);
void
free_malleability_data_struct
(
malleability_data_t
*
data_struct
);
void
free_malleability_data_struct
(
malleability_data_t
*
data_struct
);
#endif
#endif
malleability/malleabilityZombies.c
View file @
e466e997
...
@@ -16,30 +16,34 @@ int offset_pids, *pids = NULL;
...
@@ -16,30 +16,34 @@ int offset_pids, *pids = NULL;
void
gestor_usr2
()
{}
void
gestor_usr2
()
{}
void
zombies_collect_suspended
(
MPI_Comm
comm
,
int
myId
,
int
numP
,
int
numC
,
int
root
)
{
void
zombies_collect_suspended
(
MPI_Comm
comm
)
{
int
pid
=
getpid
();
int
pid
=
getpid
();
int
*
pids_counts
=
malloc
(
numP
*
sizeof
(
int
));
int
*
pids_counts
=
malloc
(
mall
->
numP
*
sizeof
(
int
));
int
*
pids_displs
=
malloc
(
numP
*
sizeof
(
int
));
int
*
pids_displs
=
malloc
(
mall
->
numP
*
sizeof
(
int
));
int
i
,
count
=
1
;
int
i
,
count
=
1
;
if
(
myId
<
numC
)
{
#if USE_MAL_DEBUG > 2
if
(
mall
->
myId
==
mall
->
root
){
DEBUG_FUNC
(
"Collecting zombies"
,
mall
->
myId
,
mall
->
numP
);
}
fflush
(
stdout
);
#endif
if
(
mall
->
myId
<
mall
->
numC
)
{
count
=
0
;
count
=
0
;
if
(
myId
==
root
)
{
if
(
mall
->
myId
==
mall
->
root
)
{
for
(
i
=
0
;
i
<
numC
;
i
++
)
{
for
(
i
=
0
;
i
<
mall
->
numC
;
i
++
)
{
pids_counts
[
i
]
=
0
;
pids_counts
[
i
]
=
0
;
}
}
for
(
i
=
numC
;
i
<
numP
;
i
++
)
{
for
(
i
=
mall
->
numC
;
i
<
mall
->
numP
;
i
++
)
{
pids_counts
[
i
]
=
1
;
pids_counts
[
i
]
=
1
;
pids_displs
[
i
]
=
(
i
+
offset_pids
)
-
numC
;
pids_displs
[
i
]
=
(
i
-
mall
->
numC
)
+
offset_pids
;
}
}
offset_pids
+=
numP
-
numC
;
offset_pids
+=
mall
->
numP
-
mall
->
numC
;
}
}
}
}
MPI_Gatherv
(
&
pid
,
count
,
MPI_INT
,
pids
,
pids_counts
,
pids_displs
,
MPI_INT
,
root
,
comm
);
MPI_Gatherv
(
&
pid
,
count
,
MPI_INT
,
pids
,
pids_counts
,
pids_displs
,
MPI_INT
,
mall
->
root
,
comm
);
free
(
pids_counts
);
free
(
pids_counts
);
free
(
pids_displs
);
free
(
pids_displs
);
if
(
myId
>=
numC
)
{
if
(
mall
->
myId
>=
mall
->
numC
)
{
zombies_suspend
();
zombies_suspend
();
}
}
}
}
...
...
malleability/malleabilityZombies.h
View file @
e466e997
...
@@ -8,8 +8,9 @@
...
@@ -8,8 +8,9 @@
#include <unistd.h>
#include <unistd.h>
#include <mpi.h>
#include <mpi.h>
#include <signal.h>
#include <signal.h>
#include "malleabilityDataStructures.h"
void
zombies_collect_suspended
(
MPI_Comm
comm
,
int
myId
,
int
numP
,
int
numC
,
int
root
);
void
zombies_collect_suspended
(
MPI_Comm
comm
);
void
zombies_service_init
();
void
zombies_service_init
();
void
zombies_service_free
();
void
zombies_service_free
();
void
zombies_awake
();
void
zombies_awake
();
...
...
malleability/spawn_methods/Baseline.c
View file @
e466e997
...
@@ -2,13 +2,14 @@
...
@@ -2,13 +2,14 @@
#include <stdlib.h>
#include <stdlib.h>
#include <mpi.h>
#include <mpi.h>
#include "../malleabilityStates.h"
#include "../malleabilityStates.h"
#include "../malleabilityDataStructures.h"
#include "Baseline.h"
#include "Baseline.h"
#include "Spawn_state.h"
#include "Spawn_state.h"
//--------------PRIVATE DECLARATIONS---------------//
//--------------PRIVATE DECLARATIONS---------------//
int
baseline_spawn
(
Spawn_data
spawn_data
,
MPI_Comm
comm
,
MPI_Comm
*
child
);
int
baseline_spawn
(
Spawn_data
spawn_data
,
MPI_Comm
comm
,
MPI_Comm
*
child
);
int
single_strat_parents
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
);
int
single_strat_parents
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
);
void
single_strat_children
(
int
myId
,
int
root
,
MPI_Comm
*
parents
);
void
single_strat_children
(
MPI_Comm
*
parents
);
//--------------PUBLIC FUNCTIONS---------------//
//--------------PUBLIC FUNCTIONS---------------//
...
@@ -27,8 +28,9 @@ int baseline(Spawn_data spawn_data, MPI_Comm *child) { //TODO Tratamiento de err
...
@@ -27,8 +28,9 @@ int baseline(Spawn_data spawn_data, MPI_Comm *child) { //TODO Tratamiento de err
baseline_spawn
(
spawn_data
,
spawn_data
.
comm
,
child
);
baseline_spawn
(
spawn_data
,
spawn_data
.
comm
,
child
);
}
}
}
else
if
(
spawn_data
.
spawn_is_single
)
{
// Children path
}
else
if
(
spawn_data
.
spawn_is_single
)
{
// Children path
single_strat_children
(
spawn_data
.
myId
,
spawn_data
.
root
,
child
);
single_strat_children
(
child
);
}
}
return
MALL_SPAWN_COMPLETED
;
return
MALL_SPAWN_COMPLETED
;
}
}
...
@@ -38,20 +40,16 @@ int baseline(Spawn_data spawn_data, MPI_Comm *child) { //TODO Tratamiento de err
...
@@ -38,20 +40,16 @@ int baseline(Spawn_data spawn_data, MPI_Comm *child) { //TODO Tratamiento de err
* "processes_dist()".
* "processes_dist()".
*/
*/
int
baseline_spawn
(
Spawn_data
spawn_data
,
MPI_Comm
comm
,
MPI_Comm
*
child
)
{
int
baseline_spawn
(
Spawn_data
spawn_data
,
MPI_Comm
comm
,
MPI_Comm
*
child
)
{
int
rootBcast
=
MPI_PROC_NULL
;
int
rootBcast
=
MPI_PROC_NULL
;
if
(
spawn_data
.
myId
==
spawn_data
.
root
)
rootBcast
=
MPI_ROOT
;
if
(
mall
->
myId
==
mall
->
root
)
rootBcast
=
MPI_ROOT
;
// WORK
int
spawn_err
=
MPI_Comm_spawn
(
mall
->
name_exec
,
MPI_ARGV_NULL
,
spawn_data
.
spawn_qty
,
spawn_data
.
mapping
,
mall
->
root
,
comm
,
child
,
MPI_ERRCODES_IGNORE
);
int
spawn_err
=
MPI_Comm_spawn
(
spawn_data
.
cmd
,
MPI_ARGV_NULL
,
spawn_data
.
spawn_qty
,
spawn_data
.
mapping
,
spawn_data
.
root
,
comm
,
child
,
MPI_ERRCODES_IGNORE
);
MPI_Comm_set_name
(
*
child
,
"MPI_COMM_MALL_RESIZE"
);
MPI_Comm_set_name
(
*
child
,
"MPI_COMM_MALL_RESIZE"
);
// END WORK
if
(
spawn_err
!=
MPI_SUCCESS
)
{
if
(
spawn_err
!=
MPI_SUCCESS
)
{
printf
(
"Error creating new set of %d procs.
\n
"
,
spawn_data
.
spawn_qty
);
printf
(
"Error creating new set of %d procs.
\n
"
,
spawn_data
.
spawn_qty
);
}
}
M
PI_Bcast
(
&
spawn_data
,
1
,
spawn_data
.
dtype
,
rootBcast
,
*
child
);
M
AM_Comm_main_structures
(
rootBcast
);
return
spawn_err
;
return
spawn_err
;
}
}
...
@@ -65,21 +63,21 @@ int single_strat_parents(Spawn_data spawn_data, MPI_Comm *child) {
...
@@ -65,21 +63,21 @@ int single_strat_parents(Spawn_data spawn_data, MPI_Comm *child) {
char
*
port_name
;
char
*
port_name
;
MPI_Comm
newintercomm
;
MPI_Comm
newintercomm
;
if
(
spawn_data
.
myId
==
spawn_data
.
root
)
{
if
(
mall
->
myId
==
mall
->
root
)
{
spawn_err
=
baseline_spawn
(
spawn_data
,
MPI_COMM_SELF
,
child
);
spawn_err
=
baseline_spawn
(
spawn_data
,
MPI_COMM_SELF
,
child
);
port_name
=
(
char
*
)
malloc
(
MPI_MAX_PORT_NAME
*
sizeof
(
char
));
port_name
=
(
char
*
)
malloc
(
MPI_MAX_PORT_NAME
*
sizeof
(
char
));
MPI_Recv
(
port_name
,
MPI_MAX_PORT_NAME
,
MPI_CHAR
,
spawn_data
.
root
,
130
,
*
child
,
MPI_STATUS_IGNORE
);
MPI_Recv
(
port_name
,
MPI_MAX_PORT_NAME
,
MPI_CHAR
,
MPI_ANY_SOURCE
,
130
,
*
child
,
MPI_STATUS_IGNORE
);
set_spawn_state
(
MALL_SPAWN_SINGLE_COMPLETED
,
spawn_data
.
spawn_is_async
);
// Indicate other processes to join root to end spawn procedure
set_spawn_state
(
MALL_SPAWN_SINGLE_COMPLETED
,
spawn_data
.
spawn_is_async
);
// Indicate other processes to join root to end spawn procedure
wakeup_completion
();
}
else
{
}
else
{
port_name
=
malloc
(
1
);
port_name
=
malloc
(
1
);
}
}
MPI_Comm_connect
(
port_name
,
MPI_INFO_NULL
,
spawn_data
.
root
,
spawn_data
.
comm
,
&
newintercomm
);
MPI_Comm_connect
(
port_name
,
MPI_INFO_NULL
,
mall
->
root
,
spawn_data
.
comm
,
&
newintercomm
);
if
(
spawn_data
.
myId
==
spawn_data
.
root
)
if
(
mall
->
myId
==
mall
->
root
)
MPI_Comm_free
(
child
);
MPI_Comm_free
(
child
);
free
(
port_name
);
free
(
port_name
);
*
child
=
newintercomm
;
*
child
=
newintercomm
;
...
@@ -94,21 +92,21 @@ int single_strat_parents(Spawn_data spawn_data, MPI_Comm *child) {
...
@@ -94,21 +92,21 @@ int single_strat_parents(Spawn_data spawn_data, MPI_Comm *child) {
* Solo se utiliza cuando la creación de los procesos ha sido
* Solo se utiliza cuando la creación de los procesos ha sido
* realizada por un solo proceso padre
* realizada por un solo proceso padre
*/
*/
void
single_strat_children
(
int
myId
,
int
root
,
MPI_Comm
*
parents
)
{
void
single_strat_children
(
MPI_Comm
*
parents
)
{
char
*
port_name
;
char
*
port_name
;
MPI_Comm
newintercomm
;
MPI_Comm
newintercomm
;
if
(
myId
==
root
)
{
if
(
mall
->
myId
==
mall
->
root
)
{
port_name
=
(
char
*
)
malloc
(
MPI_MAX_PORT_NAME
*
sizeof
(
char
));
port_name
=
(
char
*
)
malloc
(
MPI_MAX_PORT_NAME
*
sizeof
(
char
));
MPI_Open_port
(
MPI_INFO_NULL
,
port_name
);
MPI_Open_port
(
MPI_INFO_NULL
,
port_name
);
MPI_Send
(
port_name
,
MPI_MAX_PORT_NAME
,
MPI_CHAR
,
root
,
130
,
*
parents
);
MPI_Send
(
port_name
,
MPI_MAX_PORT_NAME
,
MPI_CHAR
,
mall
->
root_parents
,
130
,
*
parents
);
}
else
{
}
else
{
port_name
=
malloc
(
1
);
port_name
=
malloc
(
1
);
}
}
MPI_Comm_accept
(
port_name
,
MPI_INFO_NULL
,
root
,
MPI_COMM_WORLD
,
&
newintercomm
);
MPI_Comm_accept
(
port_name
,
MPI_INFO_NULL
,
mall
->
root
,
MPI_COMM_WORLD
,
&
newintercomm
);
if
(
myId
==
root
)
{
if
(
mall
->
myId
==
mall
->
root
)
{
MPI_Close_port
(
port_name
);
MPI_Close_port
(
port_name
);
}
}
free
(
port_name
);
free
(
port_name
);
...
...
malleability/spawn_methods/Baseline.h
View file @
e466e997
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
#include <mpi.h>
#include <mpi.h>
#include <string.h>
#include <string.h>
#include "../malleabilityDataStructures.h"
#include "../malleabilityDataStructures.h"
#include "Spawn_DataStructure.h"
int
baseline
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
);
int
baseline
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
);
#endif
#endif
malleability/spawn_methods/GenericSpawn.c
View file @
e466e997
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
#include <mpi.h>
#include <mpi.h>
#include <string.h>
#include <string.h>
#include "../malleabilityStates.h"
#include "../malleabilityStates.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"
...
@@ -17,24 +19,20 @@
...
@@ -17,24 +19,20 @@
Spawn_data
*
spawn_data
=
NULL
;
Spawn_data
*
spawn_data
=
NULL
;
pthread_t
spawn_thread
;
pthread_t
spawn_thread
;
MPI_Comm
*
returned_comm
;
double
end_time
;
//FIXME REFACTOR
//--------------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
(
MPI_Comm
comm
);
void
set_basic_spawn_dtype
();
void
deallocate_spawn_data
();
void
deallocate_spawn_data
();
//--------------PRIVATE DECLARATIONS---------------//
//--------------PRIVATE DECLARATIONS---------------//
void
generic_spawn
(
MPI_Comm
*
child
,
int
data_stage
);
void
generic_spawn
(
MPI_Comm
*
child
,
int
data_stage
);
int
check_single_state
(
MPI_Comm
comm
,
int
global_state
);
int
check_single_state
(
MPI_Comm
comm
,
MPI_Comm
*
child
,
int
global_state
,
int
wait_completed
);
int
check_generic_state
(
MPI_Comm
comm
,
MPI_Comm
*
child
,
int
local_state
,
double
*
real_time
);
int
check_generic_state
(
MPI_Comm
comm
,
int
local_state
,
int
wait_completed
);
//--------------PRIVATE THREADS DECLARATIONS---------------//
//--------------PRIVATE THREADS DECLARATIONS---------------//
int
allocate_thread_spawn
();
int
allocate_thread_spawn
(
MPI_Comm
*
child
);
void
*
thread_work
();
void
*
thread_work
(
void
*
args
);
//--------------PUBLIC FUNCTIONS---------------//
//--------------PUBLIC FUNCTIONS---------------//
...
@@ -55,9 +53,9 @@ void* thread_work();
...
@@ -55,9 +53,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
(
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
(
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
);
...
@@ -68,11 +66,11 @@ int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId
...
@@ -68,11 +66,11 @@ 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
&&
mall
->
myId
==
mall
->
root
)
||
!
spawn_data
->
spawn_is_single
)
{
allocate_thread_spawn
();
allocate_thread_spawn
(
child
);
}
}
}
}
...
@@ -83,7 +81,7 @@ int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId
...
@@ -83,7 +81,7 @@ int init_spawn(char *argv, int num_cpus, int num_nodes, char *nodelist, int myId
* Comprueba si una configuracion para crear un nuevo grupo de procesos esta lista,
* Comprueba si una configuracion para crear un nuevo grupo de procesos esta lista,
* y en caso de que lo este, se devuelve el communicador a estos nuevos procesos.
* y en caso de que lo este, se devuelve el communicador a estos nuevos procesos.
*/
*/
int
check_spawn_state
(
MPI_Comm
*
child
,
MPI_Comm
comm
,
double
*
real_time
)
{
int
check_spawn_state
(
MPI_Comm
*
child
,
MPI_Comm
comm
,
int
wait_completed
)
{
int
local_state
;
int
local_state
;
int
global_state
=
MALL_NOT_STARTED
;
int
global_state
=
MALL_NOT_STARTED
;
...
@@ -91,10 +89,10 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
...
@@ -91,10 +89,10 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
local_state
=
get_spawn_state
(
spawn_data
->
spawn_is_async
);
local_state
=
get_spawn_state
(
spawn_data
->
spawn_is_async
);
if
(
local_state
==
MALL_SPAWN_SINGLE_PENDING
||
local_state
==
MALL_SPAWN_SINGLE_COMPLETED
)
{
// Single
if
(
local_state
==
MALL_SPAWN_SINGLE_PENDING
||
local_state
==
MALL_SPAWN_SINGLE_COMPLETED
)
{
// Single
global_state
=
check_single_state
(
comm
,
local_state
);
global_state
=
check_single_state
(
comm
,
child
,
local_state
,
wait_completed
);
}
else
if
(
local_state
==
MALL_SPAWN_PENDING
||
local_state
==
MALL_SPAWN_COMPLETED
||
local_state
==
MALL_SPAWN_ADAPTED
)
{
//
Baseline
}
else
if
(
local_state
==
MALL_SPAWN_PENDING
||
local_state
==
MALL_SPAWN_COMPLETED
||
local_state
==
MALL_SPAWN_ADAPTED
)
{
//
Generic
global_state
=
check_generic_state
(
comm
,
child
,
local_state
,
real_time
);
global_state
=
check_generic_state
(
comm
,
local_state
,
wait_completed
);
}
else
if
(
local_state
==
MALL_SPAWN_ADAPT_POSTPONE
)
{
}
else
if
(
local_state
==
MALL_SPAWN_ADAPT_POSTPONE
)
{
global_state
=
local_state
;
global_state
=
local_state
;
...
@@ -104,7 +102,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
...
@@ -104,7 +102,7 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
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
);
}
}
...
@@ -126,8 +124,8 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
...
@@ -126,8 +124,8 @@ int check_spawn_state(MPI_Comm *child, MPI_Comm comm, double *real_time) {
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
();
wakeup
_redistribution
();
}
}
}
}
...
@@ -139,68 +137,52 @@ void unset_spawn_postpone_flag(int outside_state) {
...
@@ -139,68 +137,52 @@ void unset_spawn_postpone_flag(int outside_state) {
* para el paso de redistribucion de datos (Numeros de procesos y Id del Root).
* para el paso de redistribucion de datos (Numeros de procesos y Id del Root).
*
*
*/
*/
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
(
MPI_Comm
comm
,
MPI_Comm
*
parents
)
{
spawn_data
=
(
Spawn_data
*
)
malloc
(
sizeof
(
Spawn_data
));
spawn_data
=
(
Spawn_data
*
)
malloc
(
sizeof
(
Spawn_data
));
spawn_data
->
root
=
root
;
spawn_data
->
spawn_qty
=
mall
->
numP
;
spawn_data
->
myId
=
myId
;
spawn_data
->
target_qty
=
mall
->
numP
;
spawn_data
->
spawn_qty
=
numP
;
spawn_data
->
target_qty
=
numP
;
spawn_data
->
comm
=
comm
;
spawn_data
->
comm
=
comm
;
set_basic_spawn_dtype
();
MAM_Comm_main_structures
(
MALLEABILITY_ROOT
);
//FIXME What if root is another id different to 0? Send from spawn to root id?
MPI_Bcast
(
spawn_data
,
1
,
spawn_data
->
dtype
,
MALLEABILITY_ROOT
,
*
parents
);
//MPI_Comm_remote_size(*parents, &spawn_data->initial_qty);
spawn_data
->
initial_qty
=
mall
->
num_parents
;
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_SINGLE
,
&
(
spawn_data
->
spawn_is_single
));
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_PTHREAD
,
&
(
spawn_data
->
spawn_is_async
));
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_INTERCOMM
,
&
(
spawn_data
->
spawn_is_intercomm
));
switch
(
spawn_data
->
spawn_method
)
{
switch
(
mall_conf
->
spawn_method
)
{
case
MALL_SPAWN_BASELINE
:
case
MALL_SPAWN_BASELINE
:
baseline
(
*
spawn_data
,
parents
);
baseline
(
*
spawn_data
,
parents
);
if
(
!
spawn_data
->
spawn_is_intercomm
)
{
intracomm_strategy
(
MALLEABILITY_CHILDREN
,
parents
);
}
break
;
break
;
case
MALL_SPAWN_MERGE
:
case
MALL_SPAWN_MERGE
:
spawn_data
->
target_qty
+=
spawn_data
->
initial_qty
;
spawn_data
->
target_qty
+=
spawn_data
->
initial_qty
;
merge
(
*
spawn_data
,
parents
,
MALL_NOT_STARTED
);
merge
(
*
spawn_data
,
parents
,
MALL_NOT_STARTED
);
break
;
break
;
}
}
//mall->num_parents = spawn_data->initial_qty;
*
root_parents
=
spawn_data
->
root_parents
;
*
numP_parents
=
spawn_data
->
initial_qty
;
MPI_Type_free
(
&
(
spawn_data
->
dtype
));
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
;
}
//--------------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
(
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
->
initial_qty
=
mall
->
numP
;
spawn_data
->
root
=
root
;
spawn_data
->
target_qty
=
mall
->
numC
;
spawn_data
->
root_parents
=
root
;
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_SINGLE
,
&
(
spawn_data
->
spawn_is_single
));
spawn_data
->
initial_qty
=
initial_qty
;
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_PTHREAD
,
&
(
spawn_data
->
spawn_is_async
));
spawn_data
->
target_qty
=
target_qty
;
MAM_Contains_strat
(
MAM_SPAWN_STRATEGIES
,
MAM_STRAT_SPAWN_INTERCOMM
,
&
(
spawn_data
->
spawn_is_intercomm
));
spawn_data
->
spawn_method
=
spawn_method
;
malleability_spawn_contains_strat
(
spawn_strategies
,
MALL_SPAWN_SINGLE
,
&
(
spawn_data
->
spawn_is_single
));
malleability_spawn_contains_strat
(
spawn_strategies
,
MALL_SPAWN_PTHREAD
,
&
(
spawn_data
->
spawn_is_async
));
spawn_data
->
comm
=
comm
;
spawn_data
->
comm
=
comm
;
spawn_data
->
mapping_fill_method
=
MALL_DIST_STRING
;
set_basic_spawn_dtype
();
switch
(
mall_conf
->
spawn_method
)
{
switch
(
spawn_data
->
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
;
...
@@ -214,47 +196,7 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel
...
@@ -214,47 +196,7 @@ void set_spawn_configuration(char *cmd, int num_cpus, int num_nodes, char *nodel
if
(
spawn_data
->
spawn_is_async
)
{
if
(
spawn_data
->
spawn_is_async
)
{
init_spawn_state
();
init_spawn_state
();
}
}
spawn_data
->
mapping
=
MPI_INFO_NULL
;
spawn_data
->
mapping
=
MPI_INFO_NULL
;
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
));
//COPY PROGRAM NAME
spawn_data
->
cmd
=
malloc
((
strlen
(
cmd
)
+
1
)
*
sizeof
(
char
));
strcpy
(
spawn_data
->
cmd
,
cmd
);
spawn_data
->
cmd
[
strlen
(
cmd
)]
=
'\0'
;
}
else
{
spawn_data
->
cmd
=
malloc
(
1
*
sizeof
(
char
));
}
}
/*
* Crea un tipo derivado para mandar 4 enteros con informacion
* basica a los hijos. Son datos necesarios para que terminen
* la creacion de procesos.
*/
void
set_basic_spawn_dtype
()
{
int
i
,
counts
=
4
;
int
blocklengths
[]
=
{
1
,
1
,
1
,
1
};
MPI_Aint
displs
[
counts
],
dir
;
MPI_Datatype
types
[
counts
];
// Rellenar vector types
types
[
0
]
=
types
[
1
]
=
types
[
2
]
=
types
[
3
]
=
MPI_INT
;
// Rellenar vector displs
MPI_Get_address
(
spawn_data
,
&
dir
);
MPI_Get_address
(
&
(
spawn_data
->
root_parents
),
&
displs
[
0
]);
MPI_Get_address
(
&
(
spawn_data
->
initial_qty
),
&
displs
[
1
]);
MPI_Get_address
(
&
(
spawn_data
->
spawn_is_single
),
&
displs
[
2
]);
MPI_Get_address
(
&
(
spawn_data
->
spawn_method
),
&
displs
[
3
]);
for
(
i
=
0
;
i
<
counts
;
i
++
)
displs
[
i
]
-=
dir
;
MPI_Type_create_struct
(
counts
,
blocklengths
,
displs
,
types
,
&
(
spawn_data
->
dtype
));
MPI_Type_commit
(
&
(
spawn_data
->
dtype
));
}
}
/*
/*
...
@@ -264,12 +206,6 @@ void set_basic_spawn_dtype() {
...
@@ -264,12 +206,6 @@ void set_basic_spawn_dtype() {
void
deallocate_spawn_data
()
{
void
deallocate_spawn_data
()
{
if
(
spawn_data
==
NULL
)
return
;
if
(
spawn_data
==
NULL
)
return
;
if
(
spawn_data
->
cmd
!=
NULL
)
{
free
(
spawn_data
->
cmd
);
}
if
(
spawn_data
->
dtype
!=
MPI_DATATYPE_NULL
)
{
MPI_Type_free
(
&
(
spawn_data
->
dtype
));
}
if
(
spawn_data
->
mapping
!=
MPI_INFO_NULL
)
{
if
(
spawn_data
->
mapping
!=
MPI_INFO_NULL
)
{
MPI_Info_free
(
&
(
spawn_data
->
mapping
));
MPI_Info_free
(
&
(
spawn_data
->
mapping
));
}
}
...
@@ -293,19 +229,21 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
...
@@ -293,19 +229,21 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
int
local_state
,
aux_state
;
int
local_state
,
aux_state
;
// WORK
// WORK
if
(
spawn_data
->
myId
==
spawn_data
->
root
&&
spawn_data
->
spawn_qty
>
0
)
{
//SET MAPPING FOR NEW PROCESSES
if
(
mall
->
myId
==
mall
->
root
&&
spawn_data
->
spawn_qty
>
0
)
{
//SET MAPPING FOR NEW PROCESSES
processes_dist
(
spawn_data
->
dist
,
&
(
spawn_data
->
mapping
));
processes_dist
(
*
spawn_data
,
&
(
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
);
if
(
!
spawn_data
->
spawn_is_intercomm
)
{
local_state
=
intracomm_strategy
(
MALLEABILITY_NOT_CHILDREN
,
child
);
}
break
;
break
;
case
MALL_SPAWN_MERGE
:
case
MALL_SPAWN_MERGE
:
local_state
=
merge
(
*
spawn_data
,
child
,
data_stage
);
local_state
=
merge
(
*
spawn_data
,
child
,
data_stage
);
break
;
break
;
}
}
// END WORK
// END WORK
end_time
=
MPI_Wtime
();
aux_state
=
get_spawn_state
(
spawn_data
->
spawn_is_async
);
aux_state
=
get_spawn_state
(
spawn_data
->
spawn_is_async
);
if
(
!
(
aux_state
==
MALL_SPAWN_PENDING
&&
local_state
==
MALL_SPAWN_ADAPT_POSTPONE
))
{
if
(
!
(
aux_state
==
MALL_SPAWN_PENDING
&&
local_state
==
MALL_SPAWN_ADAPT_POSTPONE
))
{
set_spawn_state
(
local_state
,
spawn_data
->
spawn_is_async
);
set_spawn_state
(
local_state
,
spawn_data
->
spawn_is_async
);
...
@@ -320,8 +258,8 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
...
@@ -320,8 +258,8 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
* No se puede realizar un "join" sobre el hilo y el mismo libera su memoria
* No se puede realizar un "join" sobre el hilo y el mismo libera su memoria
* asociado al terminar.
* asociado al terminar.
*/
*/
int
allocate_thread_spawn
()
{
int
allocate_thread_spawn
(
MPI_Comm
*
child
)
{
if
(
pthread_create
(
&
spawn_thread
,
NULL
,
thread_work
,
NULL
))
{
if
(
pthread_create
(
&
spawn_thread
,
NULL
,
thread_work
,
(
void
*
)
child
))
{
printf
(
"Error al crear el hilo de SPAWN
\n
"
);
printf
(
"Error al crear el hilo de SPAWN
\n
"
);
MPI_Abort
(
MPI_COMM_WORLD
,
-
1
);
MPI_Abort
(
MPI_COMM_WORLD
,
-
1
);
return
-
1
;
return
-
1
;
...
@@ -341,19 +279,20 @@ int allocate_thread_spawn() {
...
@@ -341,19 +279,20 @@ int allocate_thread_spawn() {
* Una vez esta lista la configuracion y es posible crear los procesos
* Una vez esta lista la configuracion y es posible crear los procesos
* se avisa al hilo maestro.
* se avisa al hilo maestro.
*/
*/
void
*
thread_work
()
{
void
*
thread_work
(
void
*
args
)
{
int
local_state
;
int
local_state
;
returned_comm
=
(
MPI_Comm
*
)
malloc
(
sizeof
(
MPI_Comm
))
;
MPI_Comm
*
child
=
(
MPI_Comm
*
)
args
;
generic_spawn
(
returned_comm
,
MALL_NOT_STARTED
);
generic_spawn
(
child
,
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
local_state
=
wait_
wakeup
();
local_state
=
wait_
redistribution
();
generic_spawn
(
returned_comm
,
MALL_DIST_COMPLETED
);
generic_spawn
(
child
,
MALL_DIST_COMPLETED
);
}
}
wakeup_completion
();
pthread_exit
(
NULL
);
pthread_exit
(
NULL
);
}
}
...
@@ -368,17 +307,20 @@ void* thread_work() {
...
@@ -368,17 +307,20 @@ void* thread_work() {
* los procesos no root y se devuelve el estado
* los procesos no root y se devuelve el estado
* "MALL_SPAWN_PENDING".
* "MALL_SPAWN_PENDING".
*/
*/
int
check_single_state
(
MPI_Comm
comm
,
int
global_state
)
{
int
check_single_state
(
MPI_Comm
comm
,
MPI_Comm
*
child
,
int
global_state
,
int
wait_completed
)
{
MPI_Bcast
(
&
global_state
,
1
,
MPI_INT
,
spawn_data
->
root
,
comm
);
while
(
wait_completed
&&
mall
->
myId
==
mall
->
root
&&
global_state
==
MALL_SPAWN_SINGLE_PENDING
)
{
global_state
=
wait_completion
();
}
MPI_Bcast
(
&
global_state
,
1
,
MPI_INT
,
mall
->
root
,
comm
);
// Non-root processes join root to finalize the spawn
// Non-root processes join root to finalize the spawn
// 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
(
mall
->
myId
!=
mall
->
root
)
{
allocate_thread_spawn
(
spawn_data
);
allocate_thread_spawn
(
child
);
}
}
}
}
return
global_state
;
return
global_state
;
...
@@ -393,15 +335,14 @@ int check_single_state(MPI_Comm comm, int global_state) {
...
@@ -393,15 +335,14 @@ int check_single_state(MPI_Comm comm, int global_state) {
* Si ha terminado libera la memoria asociada a spawn_data
* Si ha terminado libera la memoria asociada a spawn_data
* y devuelve el estado "MALL_SPAWN_COMPLETED".
* y devuelve el estado "MALL_SPAWN_COMPLETED".
*/
*/
int
check_generic_state
(
MPI_Comm
comm
,
MPI_Comm
*
child
,
int
local_state
,
double
*
real_time
)
{
int
check_generic_state
(
MPI_Comm
comm
,
int
local_state
,
int
wait_completed
)
{
int
global_state
;
int
global_state
;
while
(
wait_completed
&&
local_state
==
MALL_SPAWN_PENDING
)
local_state
=
wait_completion
();
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
;
deallocate_spawn_data
(
spawn_data
);
*
real_time
=
end_time
;
}
}
return
global_state
;
return
global_state
;
}
}
malleability/spawn_methods/GenericSpawn.h
View file @
e466e997
...
@@ -4,14 +4,13 @@
...
@@ -4,14 +4,13 @@
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdlib.h>
#include <mpi.h>
#include <mpi.h>
#include "
../malleability
DataStructure
s
.h"
#include "
Spawn_
DataStructure.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
(
MPI_Comm
comm
,
MPI_Comm
*
child
);
int
check_spawn_state
(
MPI_Comm
*
child
,
MPI_Comm
comm
,
double
*
real_time
);
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
(
MPI_Comm
comm
,
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
);
#endif
#endif
malleability/spawn_methods/Merge.c
View file @
e466e997
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <stdlib.h>
#include <mpi.h>
#include <mpi.h>
#include "../malleabilityStates.h"
#include "../malleabilityStates.h"
#include "../malleabilityDataStructures.h"
#include "Merge.h"
#include "Merge.h"
#include "Baseline.h"
#include "Baseline.h"
...
@@ -17,7 +18,7 @@ int merge(Spawn_data spawn_data, MPI_Comm *child, int data_state) {
...
@@ -17,7 +18,7 @@ int merge(Spawn_data spawn_data, MPI_Comm *child, int data_state) {
if
(
spawn_data
.
initial_qty
>
spawn_data
.
target_qty
)
{
//Shrink
if
(
spawn_data
.
initial_qty
>
spawn_data
.
target_qty
)
{
//Shrink
if
(
data_state
==
MALL_DIST_COMPLETED
)
{
if
(
data_state
==
MALL_DIST_COMPLETED
)
{
merge_adapt_shrink
(
spawn_data
.
target_qty
,
child
,
spawn_data
.
comm
,
spawn_data
.
myId
);
merge_adapt_shrink
(
spawn_data
.
target_qty
,
child
,
spawn_data
.
comm
,
mall
->
myId
);
local_state
=
MALL_SPAWN_ADAPTED
;
local_state
=
MALL_SPAWN_ADAPTED
;
}
else
{
}
else
{
local_state
=
MALL_SPAWN_ADAPT_POSTPONE
;
local_state
=
MALL_SPAWN_ADAPT_POSTPONE
;
...
@@ -35,6 +36,11 @@ int merge(Spawn_data spawn_data, MPI_Comm *child, int data_state) {
...
@@ -35,6 +36,11 @@ int merge(Spawn_data spawn_data, MPI_Comm *child, int data_state) {
return
local_state
;
return
local_state
;
}
}
int
intracomm_strategy
(
int
is_children_group
,
MPI_Comm
*
child
)
{
merge_adapt_expand
(
child
,
is_children_group
);
return
MALL_SPAWN_COMPLETED
;
}
//--------------PRIVATE MERGE TYPE FUNCTIONS---------------//
//--------------PRIVATE MERGE TYPE FUNCTIONS---------------//
/*
/*
...
@@ -51,13 +57,8 @@ void merge_adapt_expand(MPI_Comm *child, int is_children_group) {
...
@@ -51,13 +57,8 @@ void merge_adapt_expand(MPI_Comm *child, int is_children_group) {
MPI_Intercomm_merge
(
*
child
,
is_children_group
,
&
new_comm
);
//El que pone 0 va primero
MPI_Intercomm_merge
(
*
child
,
is_children_group
,
&
new_comm
);
//El que pone 0 va primero
MPI_Comm_free
(
child
);
//POSIBLE ERROR?
MPI_Comm_free
(
child
);
*
child
=
new_comm
;
*
child
=
new_comm
;
//*numP = numC; //TODO REFACTOR Llevar a otra parte -- Hacer solo si MALL_SPAWN_ADAPTED
//if(*comm != MPI_COMM_WORLD && *comm != MPI_COMM_NULL) {
// MPI_Comm_free(comm);
//}
}
}
...
...
malleability/spawn_methods/Merge.h
View file @
e466e997
...
@@ -5,7 +5,9 @@
...
@@ -5,7 +5,9 @@
#include <stdlib.h>
#include <stdlib.h>
#include <mpi.h>
#include <mpi.h>
#include "../malleabilityDataStructures.h"
#include "../malleabilityDataStructures.h"
#include "Spawn_DataStructure.h"
int
merge
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
,
int
data_state
);
int
merge
(
Spawn_data
spawn_data
,
MPI_Comm
*
child
,
int
data_state
);
int
intracomm_strategy
(
int
is_children_group
,
MPI_Comm
*
child
);
#endif
#endif
malleability/spawn_methods/ProcessDist.c
View file @
e466e997
...
@@ -7,17 +7,16 @@
...
@@ -7,17 +7,16 @@
#include <mpi.h>
#include <mpi.h>
#include "ProcessDist.h"
#include "ProcessDist.h"
//#define USE_SLURM
//--------------PRIVATE DECLARATIONS---------------//
//--------------PRIVATE DECLARATIONS---------------//
void
node_dist
(
struct
physical_dist
dist
,
int
**
qty
,
int
*
used_nodes
);
void
node_dist
(
Spawn_data
spawn_data
,
int
**
qty
,
int
*
used_nodes
);
void
spread_dist
(
struct
physical_dist
dist
,
int
*
used_nodes
,
int
*
procs
);
void
spread_dist
(
Spawn_data
spawn_data
,
int
*
used_nodes
,
int
*
procs
);
void
compact_dist
(
struct
physical_dist
dist
,
int
*
used_nodes
,
int
*
procs
);
void
compact_dist
(
Spawn_data
spawn_data
,
int
*
used_nodes
,
int
*
procs
);
void
generate_info_string
(
int
target_qty
,
MPI_Info
*
info
);
void
generate_info_string
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
);
void
fill_str_hosts
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
host_str
);
//--------------------------------SLURM USAGE-------------------------------------//
//--------------------------------SLURM USAGE-------------------------------------//
#if
def
USE_SLURM
#if USE_
MAL_
SLURM
#include <slurm/slurm.h>
#include <slurm/slurm.h>
void
generate_info_string_slurm
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
);
void
generate_info_string_slurm
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
);
void
fill_str_hosts_slurm
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
hostfile_str
);
void
fill_str_hosts_slurm
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
hostfile_str
);
...
@@ -33,39 +32,6 @@ int create_hostfile(char **file_name);
...
@@ -33,39 +32,6 @@ int create_hostfile(char **file_name);
int
write_hostfile_node
(
int
ptr
,
int
qty
,
char
*
node_name
);
int
write_hostfile_node
(
int
ptr
,
int
qty
,
char
*
node_name
);
//--------------PUBLIC FUNCTIONS---------------//
//--------------PUBLIC FUNCTIONS---------------//
/*
* Pone los datos para una estructura que guarda los parametros
* para realizar un mappeado de los procesos.
*
* Si la memoria no esta reservada devuelve falso y no hace nada.
* Si puede realizar los cambios devuelve verdadero.
*
* IN parameters -->
* target_qty: Numero de procesos tras la reconfiguracion
* alreadyCreated: Numero de procesos padre a considerar
* La resta de target_qty-alreadyCreated es el numero de hijos a crear
* num_cpus: Numero de cpus totales (En uso o no)
* num_nodes: Numero de nodos disponibles por esta aplicacion
* info_type: Indica como realizar el mappeado, si indicarlo
* en una cadena (MALL_DIST_STRING) o en un hostfile
* (MALL_DIST_HOSTFILE)
* dist_type: Indica como sera el mappeado, si intentar rellenar
* primero los nodos con cpus ya usados (CPUS/BEST/COMPACT) o
* que todos los nodos tengan el mismo numero de cpus usados
* (NODES/WORST/SPREAD)
*/
int
physical_struct_create
(
int
target_qty
,
int
already_created
,
int
num_cpus
,
int
num_nodes
,
char
*
nodelist
,
int
dist_type
,
int
info_type
,
struct
physical_dist
*
dist
)
{
dist
->
target_qty
=
target_qty
;
dist
->
already_created
=
already_created
;
dist
->
num_cpus
=
num_cpus
;
dist
->
num_nodes
=
num_nodes
;
dist
->
nodelist
=
nodelist
;
dist
->
dist_type
=
dist_type
;
dist
->
info_type
=
info_type
;
return
1
;
}
/*
/*
* Configura la creacion de un nuevo grupo de procesos, reservando la memoria
* Configura la creacion de un nuevo grupo de procesos, reservando la memoria
...
@@ -76,23 +42,24 @@ int physical_struct_create(int target_qty, int already_created, int num_cpus, in
...
@@ -76,23 +42,24 @@ int physical_struct_create(int target_qty, int already_created, int num_cpus, in
* info_spawn: Objeto MPI_Info en el que se indica el mappeado
* info_spawn: Objeto MPI_Info en el que se indica el mappeado
* a usar al crear los procesos.
* a usar al crear los procesos.
*/
*/
void
processes_dist
(
struct
physical_dist
dist
,
MPI_Info
*
info_spawn
)
{
void
processes_dist
(
Spawn_data
spawn_data
,
MPI_Info
*
info_spawn
)
{
#ifdef USE_SLURM
int
used_nodes
=
0
;
int
used_nodes
=
0
;
int
*
procs_array
;
int
*
procs_array
;
// GET NEW DISTRIBUTION
// GET NEW DISTRIBUTION
node_dist
(
dist
,
&
procs_array
,
&
used_nodes
);
node_dist
(
spawn_data
,
&
procs_array
,
&
used_nodes
);
switch
(
dist
.
info_type
)
{
#if USE_MAL_SLURM
switch
(
spawn_data
.
mapping_fill_method
)
{
case
MALL_DIST_STRING
:
case
MALL_DIST_STRING
:
generate_info_string_slurm
(
dist
.
nodelist
,
procs_array
,
used_nodes
,
info_spawn
);
generate_info_string_slurm
(
mall
->
nodelist
,
procs_array
,
used_nodes
,
info_spawn
);
break
;
break
;
case
MALL_DIST_HOSTFILE
:
case
MALL_DIST_HOSTFILE
:
generate_info_hostfile_slurm
(
dist
.
nodelist
,
procs_array
,
used_nodes
,
info_spawn
);
generate_info_hostfile_slurm
(
mall
->
nodelist
,
procs_array
,
used_nodes
,
info_spawn
);
break
;
break
;
}
}
free
(
procs_array
);
free
(
procs_array
);
#else
#else
//
generate_info_string(
dist.target_qty
, info_spawn);
generate_info_string
(
mall
->
nodelist
,
procs_array
,
used_nodes
,
info_spawn
);
#endif
#endif
}
}
...
@@ -104,25 +71,25 @@ void processes_dist(struct physical_dist dist, MPI_Info *info_spawn) {
...
@@ -104,25 +71,25 @@ void processes_dist(struct physical_dist dist, MPI_Info *info_spawn) {
* cuantos nodos se van a utilizar y la cantidad de procesos que alojara cada
* cuantos nodos se van a utilizar y la cantidad de procesos que alojara cada
* nodo.
* nodo.
*
*
* Se permiten dos tipos de distribuciones fisicas segun el valor de "
dist_type
":
* Se permiten dos tipos de distribuciones fisicas segun el valor de "
spawn_dist
":
*
*
* COMM_PHY_NODES (1): Orientada a equilibrar el numero de procesos entre
* COMM_PHY_NODES (1): Orientada a equilibrar el numero de procesos entre
* todos los nodos disponibles.
* todos los nodos disponibles.
* COMM_PHY_CPU (2): Orientada a completar la capacidad de un nodo antes de
* COMM_PHY_CPU (2): Orientada a completar la capacidad de un nodo antes de
* ocupar otro nodo.
* ocupar otro nodo.
*/
*/
void
node_dist
(
struct
physical_dist
dist
,
int
**
qty
,
int
*
used_nodes
)
{
void
node_dist
(
Spawn_data
spawn_data
,
int
**
qty
,
int
*
used_nodes
)
{
int
i
,
*
procs
;
int
i
,
*
procs
;
procs
=
calloc
(
dist
.
num_nodes
,
sizeof
(
int
));
// Numero de procesos por nodo
procs
=
calloc
(
mall
->
num_nodes
,
sizeof
(
int
));
// Numero de procesos por nodo
/* GET NEW DISTRIBUTION */
/* GET NEW DISTRIBUTION */
switch
(
dist
.
dist_type
)
{
switch
(
mall_conf
->
spawn_dist
)
{
case
MALL_DIST_SPREAD
:
// DIST NODES @deprecated
case
MALL_DIST_SPREAD
:
// DIST NODES @deprecated
spread_dist
(
dist
,
used_nodes
,
procs
);
spread_dist
(
spawn_data
,
used_nodes
,
procs
);
break
;
break
;
case
MALL_DIST_COMPACT
:
// DIST CPUs
case
MALL_DIST_COMPACT
:
// DIST CPUs
compact_dist
(
dist
,
used_nodes
,
procs
);
compact_dist
(
spawn_data
,
used_nodes
,
procs
);
break
;
break
;
}
}
...
@@ -139,18 +106,18 @@ void node_dist(struct physical_dist dist, int **qty, int *used_nodes) {
...
@@ -139,18 +106,18 @@ void node_dist(struct physical_dist dist, int **qty, int *used_nodes) {
* para que todos los nodos tengan el mismo numero. Devuelve el total de
* para que todos los nodos tengan el mismo numero. Devuelve el total de
* nodos utilizados y el numero de procesos a crear en cada nodo.
* nodos utilizados y el numero de procesos a crear en cada nodo.
*
*
*
TODO
Tener en cuenta procesos ya creados (already_created)
*
FIXME
Tener en cuenta procesos ya creados (already_created)
*/
*/
void
spread_dist
(
struct
physical_dist
dist
,
int
*
used_nodes
,
int
*
procs
)
{
void
spread_dist
(
Spawn_data
spawn_data
,
int
*
used_nodes
,
int
*
procs
)
{
int
i
,
tamBl
,
remainder
;
int
i
,
tamBl
,
remainder
;
*
used_nodes
=
dist
.
num_nodes
;
*
used_nodes
=
mall
->
num_nodes
;
tamBl
=
dist
.
target_qty
/
dist
.
num_nodes
;
tamBl
=
spawn_data
.
target_qty
/
mall
->
num_nodes
;
remainder
=
dist
.
target_qty
%
dist
.
num_nodes
;
remainder
=
spawn_data
.
target_qty
%
mall
->
num_nodes
;
for
(
i
=
0
;
i
<
remainder
;
i
++
)
{
for
(
i
=
0
;
i
<
remainder
;
i
++
)
{
procs
[
i
]
=
tamBl
+
1
;
procs
[
i
]
=
tamBl
+
1
;
}
}
for
(
i
=
remainder
;
i
<
dist
.
num_nodes
;
i
++
)
{
for
(
i
=
remainder
;
i
<
mall
->
num_nodes
;
i
++
)
{
procs
[
i
]
=
tamBl
;
procs
[
i
]
=
tamBl
;
}
}
}
}
...
@@ -163,14 +130,14 @@ void spread_dist(struct physical_dist dist, int *used_nodes, int *procs) {
...
@@ -163,14 +130,14 @@ void spread_dist(struct physical_dist dist, int *used_nodes, int *procs) {
* Tiene en cuenta los procesos ya existentes para el mappeado de
* Tiene en cuenta los procesos ya existentes para el mappeado de
* los procesos a crear.
* los procesos a crear.
*/
*/
void
compact_dist
(
struct
physical_dist
dist
,
int
*
used_nodes
,
int
*
procs
)
{
void
compact_dist
(
Spawn_data
spawn_data
,
int
*
used_nodes
,
int
*
procs
)
{
int
i
,
asigCores
;
int
i
,
asigCores
;
int
tamBl
,
remainder
;
int
tamBl
,
remainder
;
tamBl
=
dist
.
num_cpus
/
dist
.
num_nodes
;
tamBl
=
mall
->
num_cpus
/
mall
->
num_nodes
;
asigCores
=
dist
.
already_created
;
asigCores
=
spawn_data
.
already_created
;
i
=
*
used_nodes
=
dist
.
already_created
/
tamBl
;
i
=
*
used_nodes
=
spawn_data
.
already_created
/
tamBl
;
remainder
=
dist
.
already_created
%
tamBl
;
remainder
=
spawn_data
.
already_created
%
tamBl
;
//FIXME REFACTOR Que pasa si los nodos 1 y 2 tienen espacios libres
//FIXME REFACTOR Que pasa si los nodos 1 y 2 tienen espacios libres
//First nodes could already have existing procs
//First nodes could already have existing procs
...
@@ -178,24 +145,24 @@ void compact_dist(struct physical_dist dist, int *used_nodes, int *procs) {
...
@@ -178,24 +145,24 @@ void compact_dist(struct physical_dist dist, int *used_nodes, int *procs) {
if
(
remainder
)
{
if
(
remainder
)
{
procs
[
i
]
=
tamBl
-
remainder
;
procs
[
i
]
=
tamBl
-
remainder
;
asigCores
+=
procs
[
i
];
asigCores
+=
procs
[
i
];
i
=
(
i
+
1
)
%
dist
.
num_nodes
;
i
=
(
i
+
1
)
%
mall
->
num_nodes
;
(
*
used_nodes
)
++
;
(
*
used_nodes
)
++
;
}
}
//Assign tamBl to each node
//Assign tamBl to each node
while
(
asigCores
+
tamBl
<=
dist
.
target_qty
)
{
while
(
asigCores
+
tamBl
<=
spawn_data
.
target_qty
)
{
asigCores
+=
tamBl
;
asigCores
+=
tamBl
;
procs
[
i
]
+=
tamBl
;
procs
[
i
]
+=
tamBl
;
i
=
(
i
+
1
)
%
dist
.
num_nodes
;
i
=
(
i
+
1
)
%
mall
->
num_nodes
;
(
*
used_nodes
)
++
;
(
*
used_nodes
)
++
;
}
}
//Last node could have less procs than tamBl
//Last node could have less procs than tamBl
if
(
asigCores
<
dist
.
target_qty
)
{
if
(
asigCores
<
spawn_data
.
target_qty
)
{
procs
[
i
]
+=
dist
.
target_qty
-
asigCores
;
procs
[
i
]
+=
spawn_data
.
target_qty
-
asigCores
;
(
*
used_nodes
)
++
;
(
*
used_nodes
)
++
;
}
}
if
(
*
used_nodes
>
dist
.
num_nodes
)
*
used_nodes
=
dist
.
num_nodes
;
//FIXME Si ocurre esto no es un error?
if
(
*
used_nodes
>
mall
->
num_nodes
)
*
used_nodes
=
mall
->
num_nodes
;
//FIXME Si ocurre esto no es un error?
}
}
...
@@ -207,68 +174,41 @@ void compact_dist(struct physical_dist dist, int *used_nodes, int *procs) {
...
@@ -207,68 +174,41 @@ void compact_dist(struct physical_dist dist, int *used_nodes, int *procs) {
* en el que se indica el mappeado a utilizar en los nuevos
* en el que se indica el mappeado a utilizar en los nuevos
* procesos.
* procesos.
*
*
* Actualmente no considera que puedan haber varios nodos
*
* y lleva todos al mismo. Las funciones "generate_info_string_slurm"
* o "generate_info_hostfile_slurm" permiten utilizar varios
* nodos, pero es necesario activar Slurm.
*/
*/
void
generate_info_string
(
int
target_qty
,
MPI_Info
*
info
){
void
generate_info_string
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
){
char
*
host_string
,
*
host
;
char
*
host_str
;
int
len
,
err
;
host
=
"localhost"
;
fill_str_hosts
(
nodelist
,
procs_array
,
nodes
,
&
host_str
);
//host = malloc(MPI_MAX_PROCESSOR_NAME * sizeof(char));
//MPI_Get_processor_name(host, &len);
// CREATE AND SET STRING HOSTS
err
=
write_str_node
(
&
host_string
,
0
,
target_qty
,
host
);
if
(
err
<
0
)
{
printf
(
"Error when generating mapping: %d
\n
"
,
err
);
MPI_Abort
(
MPI_COMM_WORLD
,
err
);}
// SET MAPPING
// SET MAPPING
MPI_Info_create
(
info
);
MPI_Info_create
(
info
);
MPI_Info_set
(
*
info
,
"hosts"
,
host_string
);
MPI_Info_set
(
*
info
,
"hosts"
,
mall
->
nodelist
);
//free(host);
free
(
host_str
);
free
(
host_string
);
}
//--------------------------------SLURM USAGE-------------------------------------//
#ifdef USE_SLURM
/*
* Crea y devuelve un objeto MPI_Info con un par hosts/mapping
* en el que se indica el mappeado a utilizar en los nuevos
* procesos.
* Es necesario usar Slurm para usarlo.
*/
void
generate_info_string_slurm
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
){
// CREATE AND SET STRING HOSTS
char
*
hoststring
;
fill_str_hosts_slurm
(
nodelist
,
procs_array
,
nodes
,
&
hoststring
);
MPI_Info_create
(
info
);
MPI_Info_set
(
*
info
,
"hosts"
,
hoststring
);
free
(
hoststring
);
}
}
/*
/*
* Crea y devuelve una cadena para ser utilizada por la llave "hosts"
* Crea y devuelve una cadena para ser utilizada por la llave "hosts"
* al crear procesos e indicar donde tienen que ser creados.
* al crear procesos e indicar donde tienen que ser creados.
*/
*/
void
fill_str_hosts
_slurm
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
host
file
_str
)
{
void
fill_str_hosts
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
host_str
)
{
char
*
host
;
char
*
host
,
*
aux
,
*
token
;
size_t
i
=
0
,
len
=
0
;
size_t
i
=
0
,
len
=
0
;
hostlist_t
hostlist
;
aux
=
(
char
*
)
malloc
((
strlen
(
nodelist
)
+
1
)
*
sizeof
(
char
));
hostlist
=
slurm_hostlist_create
(
nodelist
);
strcpy
(
aux
,
nodelist
);
while
(
(
host
=
slurm_hostlist_shift
(
hostlist
))
&&
i
<
used_nodes
)
{
token
=
strtok
(
aux
,
","
);
if
(
qty
[
i
]
!=
0
)
{
while
(
token
!=
NULL
&&
i
<
used_nodes
)
{
len
=
write_str_node
(
hostfile_str
,
len
,
qty
[
i
],
host
);
host
=
strdup
(
token
);
if
(
qty
[
i
]
!=
0
)
{
len
=
write_str_node
(
host_str
,
len
,
qty
[
i
],
host
);
}
}
i
++
;
i
++
;
free
(
host
);
free
(
host
);
token
=
strtok
(
NULL
,
","
);
}
}
slurm_hostlist_destroy
(
hostlist
);
free
(
aux
);
}
}
#endif
//--------------------------------SLURM USAGE-------------------------------------//
/*
/*
* Añade en una cadena "qty" entradas de "node_name".
* Añade en una cadena "qty" entradas de "node_name".
* Realiza la reserva de memoria y la realoja si es necesario.
* Realiza la reserva de memoria y la realoja si es necesario.
...
@@ -307,14 +247,50 @@ int write_str_node(char **hostfile_str, size_t len_og, size_t qty, char *node_na
...
@@ -307,14 +247,50 @@ int write_str_node(char **hostfile_str, size_t len_og, size_t qty, char *node_na
return
len
+
len_og
;
return
len
+
len_og
;
}
}
//--------------------------------SLURM USAGE-------------------------------------//
#if USE_MAL_SLURM
/*
* Crea y devuelve un objeto MPI_Info con un par hosts/mapping
* en el que se indica el mappeado a utilizar en los nuevos
* procesos.
* Es necesario usar Slurm para usarlo.
*/
void
generate_info_string_slurm
(
char
*
nodelist
,
int
*
procs_array
,
size_t
nodes
,
MPI_Info
*
info
){
// CREATE AND SET STRING HOSTS
char
*
hoststring
;
fill_str_hosts_slurm
(
nodelist
,
procs_array
,
nodes
,
&
hoststring
);
MPI_Info_create
(
info
);
MPI_Info_set
(
*
info
,
"hosts"
,
hoststring
);
free
(
hoststring
);
}
/*
* Crea y devuelve una cadena para ser utilizada por la llave "hosts"
* al crear procesos e indicar donde tienen que ser creados.
*/
void
fill_str_hosts_slurm
(
char
*
nodelist
,
int
*
qty
,
size_t
used_nodes
,
char
**
hostfile_str
)
{
char
*
host
;
size_t
i
=
0
,
len
=
0
;
hostlist_t
hostlist
;
hostlist
=
slurm_hostlist_create
(
nodelist
);
while
(
(
host
=
slurm_hostlist_shift
(
hostlist
))
&&
i
<
used_nodes
)
{
if
(
qty
[
i
]
!=
0
)
{
len
=
write_str_node
(
hostfile_str
,
len
,
qty
[
i
],
host
);
}
i
++
;
free
(
host
);
}
slurm_hostlist_destroy
(
hostlist
);
}
//====================================================
//====================================================
//====================================================
//====================================================
//============DEPRECATED FUNCTIONS====================
//============DEPRECATED FUNCTIONS====================
//====================================================
//====================================================
//====================================================
//====================================================
//--------------------------------SLURM USAGE-------------------------------------//
#ifdef USE_SLURM
/* FIXME Por revisar
/* FIXME Por revisar
* @deprecated
* @deprecated
* Genera un fichero hostfile y lo anyade a un objeto
* Genera un fichero hostfile y lo anyade a un objeto
...
@@ -413,17 +389,3 @@ int write_hostfile_node(int ptr, int qty, char *node_name) {
...
@@ -413,17 +389,3 @@ int write_hostfile_node(int ptr, int qty, char *node_name) {
}
}
#endif
#endif
//--------------------------------SLURM USAGE-------------------------------------//
//--------------------------------SLURM USAGE-------------------------------------//
//TODO REFACTOR PARA CUANDO SE COMUNIQUE CON RMS
// Get Slurm job info
//int jobId;
//char *tmp;
//job_info_msg_t *j_info;
//slurm_job_info_t last_record;
//tmp = getenv("SLURM_JOB_ID");
//jobId = atoi(tmp);
//slurm_load_job(&j_info, jobId, 1);
//last_record = j_info->job_array[j_info->record_count - 1];
// Free JOB INFO
//slurm_free_job_info_msg(j_info);
malleability/spawn_methods/ProcessDist.h
View file @
e466e997
...
@@ -7,14 +7,8 @@
...
@@ -7,14 +7,8 @@
#include <string.h>
#include <string.h>
#include "../malleabilityStates.h"
#include "../malleabilityStates.h"
#include "../malleabilityDataStructures.h"
#include "../malleabilityDataStructures.h"
#include "Spawn_DataStructure.h"
#define MALL_DIST_SPREAD 1
void
processes_dist
(
Spawn_data
spawn_data
,
MPI_Info
*
info_spawn
);
#define MALL_DIST_COMPACT 2
#define MALL_DIST_STRING 1
#define MALL_DIST_HOSTFILE 2
int
physical_struct_create
(
int
target_qty
,
int
already_created
,
int
num_cpus
,
int
num_nodes
,
char
*
nodelist
,
int
dist_type
,
int
info_type
,
struct
physical_dist
*
dist
);
void
processes_dist
(
struct
physical_dist
dist
,
MPI_Info
*
info_spawn
);
#endif
#endif
malleability/spawn_methods/Spawn_DataStructure.h
0 → 100644
View file @
e466e997
#ifndef MAM_SPAWN_DATASTRUCTURE_H
#define MAM_SPAWN_DATASTRUCTURE_H
#include <mpi.h>
/* --- SPAWN STRUCTURE --- */
typedef
struct
{
int
spawn_qty
,
initial_qty
,
target_qty
;
int
already_created
;
int
spawn_is_single
,
spawn_is_async
,
spawn_is_intercomm
;
MPI_Info
mapping
;
int
mapping_fill_method
;
MPI_Comm
comm
,
returned_comm
;
}
Spawn_data
;
#endif
malleability/spawn_methods/Spawn_state.c
View file @
e466e997
...
@@ -4,19 +4,21 @@
...
@@ -4,19 +4,21 @@
#include "Spawn_state.h"
#include "Spawn_state.h"
pthread_mutex_t
spawn_mutex
;
pthread_mutex_t
spawn_mutex
;
pthread_cond_t
spawn_cond
;
pthread_cond_t
spawn_cond
,
completion_cond
;
int
spawn_state
;
int
spawn_state
;
int
waiting_redistribution
=
0
;
int
waiting_redistribution
=
0
,
waiting_completion
=
0
;
void
init_spawn_state
()
{
void
init_spawn_state
()
{
pthread_mutex_init
(
&
spawn_mutex
,
NULL
);
pthread_mutex_init
(
&
spawn_mutex
,
NULL
);
pthread_cond_init
(
&
spawn_cond
,
NULL
);
pthread_cond_init
(
&
spawn_cond
,
NULL
);
pthread_cond_init
(
&
completion_cond
,
NULL
);
set_spawn_state
(
1
,
0
);
//FIXME First parameter is a horrible magical number
set_spawn_state
(
1
,
0
);
//FIXME First parameter is a horrible magical number
}
}
void
free_spawn_state
()
{
void
free_spawn_state
()
{
pthread_mutex_destroy
(
&
spawn_mutex
);
pthread_mutex_destroy
(
&
spawn_mutex
);
pthread_cond_destroy
(
&
spawn_cond
);
pthread_cond_destroy
(
&
spawn_cond
);
pthread_cond_destroy
(
&
completion_cond
);
}
}
int
get_spawn_state
(
int
is_async
)
{
int
get_spawn_state
(
int
is_async
)
{
...
@@ -41,7 +43,7 @@ void set_spawn_state(int value, int is_async) {
...
@@ -41,7 +43,7 @@ void set_spawn_state(int value, int is_async) {
}
}
}
}
int
wait_
wakeup
()
{
int
wait_
redistribution
()
{
pthread_mutex_lock
(
&
spawn_mutex
);
pthread_mutex_lock
(
&
spawn_mutex
);
if
(
!
waiting_redistribution
)
{
if
(
!
waiting_redistribution
)
{
waiting_redistribution
=
1
;
waiting_redistribution
=
1
;
...
@@ -52,7 +54,7 @@ int wait_wakeup() {
...
@@ -52,7 +54,7 @@ int wait_wakeup() {
return
get_spawn_state
(
1
);
return
get_spawn_state
(
1
);
}
}
void
wakeup
()
{
void
wakeup
_redistribution
()
{
pthread_mutex_lock
(
&
spawn_mutex
);
pthread_mutex_lock
(
&
spawn_mutex
);
if
(
waiting_redistribution
)
{
if
(
waiting_redistribution
)
{
pthread_cond_signal
(
&
spawn_cond
);
pthread_cond_signal
(
&
spawn_cond
);
...
@@ -60,3 +62,23 @@ void wakeup() {
...
@@ -60,3 +62,23 @@ void wakeup() {
waiting_redistribution
=
1
;
waiting_redistribution
=
1
;
pthread_mutex_unlock
(
&
spawn_mutex
);
pthread_mutex_unlock
(
&
spawn_mutex
);
}
}
int
wait_completion
()
{
pthread_mutex_lock
(
&
spawn_mutex
);
if
(
!
waiting_completion
)
{
waiting_completion
=
1
;
pthread_cond_wait
(
&
completion_cond
,
&
spawn_mutex
);
}
waiting_completion
=
0
;
pthread_mutex_unlock
(
&
spawn_mutex
);
return
get_spawn_state
(
1
);
}
void
wakeup_completion
()
{
pthread_mutex_lock
(
&
spawn_mutex
);
if
(
waiting_completion
)
{
pthread_cond_signal
(
&
completion_cond
);
}
waiting_completion
=
1
;
pthread_mutex_unlock
(
&
spawn_mutex
);
}
malleability/spawn_methods/Spawn_state.h
View file @
e466e997
...
@@ -11,7 +11,10 @@ void free_spawn_state();
...
@@ -11,7 +11,10 @@ void free_spawn_state();
int
get_spawn_state
(
int
is_async
);
int
get_spawn_state
(
int
is_async
);
void
set_spawn_state
(
int
value
,
int
is_async
);
void
set_spawn_state
(
int
value
,
int
is_async
);
int
wait_wakeup
();
int
wait_redistribution
();
void
wakeup
();
void
wakeup_redistribution
();
int
wait_completion
();
void
wakeup_completion
();
#endif
#endif
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment