Skip to content

Commit f5b4fc0

Browse files
clementFoyerclementFoyer
committed
Remove inter-dependencies between OSC modules.
The osc monitoring component needed to include other OSC components header in order to be able tu access communicator through the component specific ompi_osc_*_module_t structures. This commit remove the dependency, and resolve the issue #4523. Extend the common monitoring API. * Now it's possible to translate from local rank to world rank from both the communicator and the group. * Remove useless hashtable as we directly use the w_group contained in window structure. Add automatic generation at config time. The templates are expanded at configure time. It creates a new header file that generates all the variables/functions needed. Adding this during the autogen automagicaly generates for each of the available modules the proper functions. Only keep a generated argv-style array. Following Jeff's advice, the configure.m4 file generate a simple array of module variables to be iterated over to find the proper module. Signed-off-by: Clement Foyer <[email protected]>
1 parent a4755b6 commit f5b4fc0

33 files changed

+305
-245
lines changed

‎ompi/mca/coll/monitoring/coll_monitoring_allgather.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -34,7 +34,7 @@ int mca_coll_monitoring_allgather(const void *sbuf, int scount,
3434
* If this fails the destination is not part of my MPI_COM_WORLD
3535
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3636
*/
37-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
37+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3838
mca_common_monitoring_record_coll(rank, data_size);
3939
}
4040
}
@@ -63,7 +63,7 @@ int mca_coll_monitoring_iallgather(const void *sbuf, int scount,
6363
* If this fails the destination is not part of my MPI_COM_WORLD
6464
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6565
*/
66-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
66+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6767
mca_common_monitoring_record_coll(rank, data_size);
6868
}
6969
}

‎ompi/mca/coll/monitoring/coll_monitoring_allgatherv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -34,7 +34,7 @@ int mca_coll_monitoring_allgatherv(const void *sbuf, int scount,
3434
* If this fails the destination is not part of my MPI_COM_WORLD
3535
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3636
*/
37-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
37+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3838
mca_common_monitoring_record_coll(rank, data_size);
3939
}
4040
}
@@ -63,7 +63,7 @@ int mca_coll_monitoring_iallgatherv(const void *sbuf, int scount,
6363
* If this fails the destination is not part of my MPI_COM_WORLD
6464
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6565
*/
66-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
66+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6767
mca_common_monitoring_record_coll(rank, data_size);
6868
}
6969
}

‎ompi/mca/coll/monitoring/coll_monitoring_allreduce.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -34,7 +34,7 @@ int mca_coll_monitoring_allreduce(const void *sbuf, void *rbuf, int count,
3434
* If this fails the destination is not part of my MPI_COM_WORLD
3535
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3636
*/
37-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
37+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3838
mca_common_monitoring_record_coll(rank, data_size);
3939
}
4040
}
@@ -62,7 +62,7 @@ int mca_coll_monitoring_iallreduce(const void *sbuf, void *rbuf, int count,
6262
* If this fails the destination is not part of my MPI_COM_WORLD
6363
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6464
*/
65-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
65+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6666
mca_common_monitoring_record_coll(rank, data_size);
6767
}
6868
}

‎ompi/mca/coll/monitoring/coll_monitoring_alltoall.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -32,7 +32,7 @@ int mca_coll_monitoring_alltoall(const void *sbuf, int scount, struct ompi_datat
3232
* If this fails the destination is not part of my MPI_COM_WORLD
3333
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3434
*/
35-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
35+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3636
mca_common_monitoring_record_coll(rank, data_size);
3737
}
3838
}
@@ -61,7 +61,7 @@ int mca_coll_monitoring_ialltoall(const void *sbuf, int scount,
6161
* If this fails the destination is not part of my MPI_COM_WORLD
6262
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6363
*/
64-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
64+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6565
mca_common_monitoring_record_coll(rank, data_size);
6666
}
6767
}

‎ompi/mca/coll/monitoring/coll_monitoring_alltoallv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -33,7 +33,7 @@ int mca_coll_monitoring_alltoallv(const void *sbuf, const int *scounts, const in
3333
* If this fails the destination is not part of my MPI_COM_WORLD
3434
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3535
*/
36-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
36+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3737
mca_common_monitoring_record_coll(rank, data_size);
3838
data_size_aggreg += data_size;
3939
}
@@ -65,7 +65,7 @@ int mca_coll_monitoring_ialltoallv(const void *sbuf, const int *scounts,
6565
* If this fails the destination is not part of my MPI_COM_WORLD
6666
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6767
*/
68-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
68+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6969
mca_common_monitoring_record_coll(rank, data_size);
7070
data_size_aggreg += data_size;
7171
}

‎ompi/mca/coll/monitoring/coll_monitoring_alltoallw.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -35,7 +35,7 @@ int mca_coll_monitoring_alltoallw(const void *sbuf, const int *scounts,
3535
* If this fails the destination is not part of my MPI_COM_WORLD
3636
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3737
*/
38-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
38+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3939
mca_common_monitoring_record_coll(rank, data_size);
4040
data_size_aggreg += data_size;
4141
}
@@ -67,7 +67,7 @@ int mca_coll_monitoring_ialltoallw(const void *sbuf, const int *scounts,
6767
* If this fails the destination is not part of my MPI_COM_WORLD
6868
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6969
*/
70-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
70+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
7171
mca_common_monitoring_record_coll(rank, data_size);
7272
data_size_aggreg += data_size;
7373
}

‎ompi/mca/coll/monitoring/coll_monitoring_barrier.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -25,7 +25,7 @@ int mca_coll_monitoring_barrier(struct ompi_communicator_t *comm,
2525
* If this fails the destination is not part of my MPI_COM_WORLD
2626
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
2727
*/
28-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
28+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
2929
mca_common_monitoring_record_coll(rank, 0);
3030
}
3131
}
@@ -47,7 +47,7 @@ int mca_coll_monitoring_ibarrier(struct ompi_communicator_t *comm,
4747
* If this fails the destination is not part of my MPI_COM_WORLD
4848
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
4949
*/
50-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
50+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
5151
mca_common_monitoring_record_coll(rank, 0);
5252
}
5353
}

‎ompi/mca/coll/monitoring/coll_monitoring_bcast.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* Copyright (c) 2017 Research Organization for Information Science
44
* and Technology (RIST). All rights reserved.
55
* $COPYRIGHT$
@@ -35,7 +35,7 @@ int mca_coll_monitoring_bcast(void *buff, int count,
3535
* If this fails the destination is not part of my MPI_COM_WORLD
3636
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3737
*/
38-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
38+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3939
mca_common_monitoring_record_coll(rank, data_size);
4040
}
4141
}
@@ -64,7 +64,7 @@ int mca_coll_monitoring_ibcast(void *buff, int count,
6464
* If this fails the destination is not part of my MPI_COM_WORLD
6565
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6666
*/
67-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
67+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6868
mca_common_monitoring_record_coll(rank, data_size);
6969
}
7070
}

‎ompi/mca/coll/monitoring/coll_monitoring_exscan.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -33,7 +33,7 @@ int mca_coll_monitoring_exscan(const void *sbuf, void *rbuf, int count,
3333
* If this fails the destination is not part of my MPI_COM_WORLD
3434
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3535
*/
36-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
36+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3737
mca_common_monitoring_record_coll(rank, data_size);
3838
}
3939
}
@@ -60,7 +60,7 @@ int mca_coll_monitoring_iexscan(const void *sbuf, void *rbuf, int count,
6060
* If this fails the destination is not part of my MPI_COM_WORLD
6161
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6262
*/
63-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
63+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6464
mca_common_monitoring_record_coll(rank, data_size);
6565
}
6666
}

‎ompi/mca/coll/monitoring/coll_monitoring_gather.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2017 Inria. All rights reserved.
2+
* Copyright (c) 2016-2018 Inria. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow
@@ -32,7 +32,7 @@ int mca_coll_monitoring_gather(const void *sbuf, int scount,
3232
* If this fails the destination is not part of my MPI_COM_WORLD
3333
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
3434
*/
35-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
35+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
3636
mca_common_monitoring_record_coll(rank, data_size);
3737
}
3838
}
@@ -61,7 +61,7 @@ int mca_coll_monitoring_igather(const void *sbuf, int scount,
6161
* If this fails the destination is not part of my MPI_COM_WORLD
6262
* Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
6363
*/
64-
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
64+
if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm->c_remote_group, &rank) ) {
6565
mca_common_monitoring_record_coll(rank, data_size);
6666
}
6767
}

0 commit comments

Comments
 (0)