monitoring: re-test CI

ompi/mca/coll/monitoring/Makefile.am

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2016 Inria.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+monitoring_sources  = \
+	coll_monitoring.h            \
+	coll_monitoring_allgather.c  \
+	coll_monitoring_allgatherv.c \
+	coll_monitoring_allreduce.c  \
+	coll_monitoring_alltoall.c   \
+	coll_monitoring_alltoallv.c  \
+	coll_monitoring_alltoallw.c  \
+	coll_monitoring_barrier.c    \
+	coll_monitoring_bcast.c      \
+	coll_monitoring_component.c  \
+	coll_monitoring_exscan.c     \
+	coll_monitoring_gather.c     \
+	coll_monitoring_gatherv.c    \
+	coll_monitoring_neighbor_allgather.c  \
+	coll_monitoring_neighbor_allgatherv.c \
+	coll_monitoring_neighbor_alltoall.c   \
+	coll_monitoring_neighbor_alltoallv.c  \
+	coll_monitoring_neighbor_alltoallw.c  \
+	coll_monitoring_reduce.c     \
+	coll_monitoring_reduce_scatter.c \
+	coll_monitoring_reduce_scatter_block.c \
+	coll_monitoring_scan.c       \
+	coll_monitoring_scatter.c    \
+	coll_monitoring_scatterv.c
+
+if MCA_BUILD_ompi_coll_monitoring_DSO
+component_noinst =
+component_install = mca_coll_monitoring.la
+else
+component_noinst = libmca_coll_monitoring.la
+component_install =
+endif
+
+mcacomponentdir = $(ompilibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_coll_monitoring_la_SOURCES = $(monitoring_sources)
+mca_coll_monitoring_la_LDFLAGS = -module -avoid-version
+mca_coll_monitoring_la_LIBADD = \
+	$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
+
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_coll_monitoring_la_SOURCES = $(monitoring_sources)
+libmca_coll_monitoring_la_LDFLAGS = -module -avoid-version

ompi/mca/coll/monitoring/coll_monitoring_allgather.c

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016-2017 Inria. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <ompi_config.h>
+#include <ompi/request/request.h>
+#include <ompi/datatype/ompi_datatype.h>
+#include <ompi/communicator/communicator.h>
+#include "coll_monitoring.h"
+
+int mca_coll_monitoring_allgather(const void *sbuf, int scount,
+                                  struct ompi_datatype_t *sdtype,
+                                  void *rbuf, int rcount,
+                                  struct ompi_datatype_t *rdtype,
+                                  struct ompi_communicator_t *comm,
+                                  mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( i == my_rank ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_allgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, monitoring_module->real.coll_allgather_module);
+}
+
+int mca_coll_monitoring_iallgather(const void *sbuf, int scount,
+                                   struct ompi_datatype_t *sdtype,
+                                   void *rbuf, int rcount,
+                                   struct ompi_datatype_t *rdtype,
+                                   struct ompi_communicator_t *comm,
+                                   ompi_request_t ** request,
+                                   mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_iallgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, request, monitoring_module->real.coll_iallgather_module);
+}

ompi/mca/coll/monitoring/coll_monitoring_allgatherv.c

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016-2017 Inria. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <ompi_config.h>
+#include <ompi/request/request.h>
+#include <ompi/datatype/ompi_datatype.h>
+#include <ompi/communicator/communicator.h>
+#include "coll_monitoring.h"
+
+int mca_coll_monitoring_allgatherv(const void *sbuf, int scount,
+                                   struct ompi_datatype_t *sdtype,
+                                   void * rbuf, const int *rcounts, const int *disps,
+                                   struct ompi_datatype_t *rdtype,
+                                   struct ompi_communicator_t *comm,
+                                   mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_allgatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, comm, monitoring_module->real.coll_allgatherv_module);
+}
+
+int mca_coll_monitoring_iallgatherv(const void *sbuf, int scount,
+                                    struct ompi_datatype_t *sdtype,
+                                    void * rbuf, const int *rcounts, const int *disps,
+                                    struct ompi_datatype_t *rdtype,
+                                    struct ompi_communicator_t *comm,
+                                    ompi_request_t ** request,
+                                    mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_iallgatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, comm, request, monitoring_module->real.coll_iallgatherv_module);
+}

ompi/mca/coll/monitoring/coll_monitoring_allreduce.c

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016-2017 Inria. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <ompi_config.h>
+#include <ompi/op/op.h>
+#include <ompi/request/request.h>
+#include <ompi/datatype/ompi_datatype.h>
+#include <ompi/communicator/communicator.h>
+#include "coll_monitoring.h"
+
+int mca_coll_monitoring_allreduce(const void *sbuf, void *rbuf, int count,
+                                          struct ompi_datatype_t *dtype,
+                                          struct ompi_op_t *op,
+                                          struct ompi_communicator_t *comm,
+                                          mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(dtype, &type_size);
+    data_size = count * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_allreduce(sbuf, rbuf, count, dtype, op, comm, monitoring_module->real.coll_allreduce_module);
+}
+
+int mca_coll_monitoring_iallreduce(const void *sbuf, void *rbuf, int count,
+                                          struct ompi_datatype_t *dtype,
+                                          struct ompi_op_t *op,
+                                          struct ompi_communicator_t *comm,
+                                          ompi_request_t ** request,
+                                          mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(dtype, &type_size);
+    data_size = count * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_iallreduce(sbuf, rbuf, count, dtype, op, comm, request, monitoring_module->real.coll_iallreduce_module);
+}

ompi/mca/coll/monitoring/coll_monitoring_alltoall.c

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016-2017 Inria. All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include <ompi_config.h>
+#include <ompi/request/request.h>
+#include <ompi/datatype/ompi_datatype.h>
+#include <ompi/communicator/communicator.h>
+#include "coll_monitoring.h"
+
+int mca_coll_monitoring_alltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype,
+                                 void* rbuf, int rcount, struct ompi_datatype_t *rdtype,
+                                 struct ompi_communicator_t *comm,
+                                 mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_alltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, monitoring_module->real.coll_alltoall_module);
+}
+
+int mca_coll_monitoring_ialltoall(const void *sbuf, int scount,
+                                  struct ompi_datatype_t *sdtype,
+                                  void *rbuf, int rcount,
+                                  struct ompi_datatype_t *rdtype,
+                                  struct ompi_communicator_t *comm,
+                                  ompi_request_t ** request,
+                                  mca_coll_base_module_t *module)
+{
+    mca_coll_monitoring_module_t*monitoring_module = (mca_coll_monitoring_module_t*) module;
+    size_t type_size, data_size;
+    const int comm_size = ompi_comm_size(comm);
+    const int my_rank = ompi_comm_rank(comm);
+    int i, rank;
+    ompi_datatype_type_size(sdtype, &type_size);
+    data_size = scount * type_size;
+    mca_common_monitoring_coll_a2a(data_size * (comm_size - 1), monitoring_module->data);
+    for( i = 0; i < comm_size; ++i ) {
+        if( my_rank == i ) continue; /* No communication for self */
+        /**
+         * If this fails the destination is not part of my MPI_COM_WORLD
+         * Lookup its name in the rank hastable to get its MPI_COMM_WORLD rank
+         */
+        if( OPAL_SUCCESS == mca_common_monitoring_get_world_rank(i, comm, &rank) ) {
+            mca_common_monitoring_record_coll(rank, data_size);
+        }
+    }
+    return monitoring_module->real.coll_ialltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, request, monitoring_module->real.coll_ialltoall_module);
+}