Cleanup orte MPI test directory so it all builds again

orte/test/mpi/Makefile

@@ -1,4 +1,4 @@
-PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help crisscross read_write ziatest slave reduce-hang ziaprobe ziatest bcast_loop parallel_w8 parallel_w64 parallel_r8 parallel_r64 sio sendrecv_blaster early_abort debugger singleton_client_server intercomm_create spawn_tree init-exit77 mpi_info info_spawn server client paccept pconnect coll_test
+PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help crisscross read_write ziatest slave reduce-hang ziaprobe ziatest bcast_loop parallel_w8 parallel_w64 parallel_r8 parallel_r64 sio sendrecv_blaster early_abort debugger singleton_client_server intercomm_create spawn_tree init-exit77 mpi_info info_spawn server client paccept pconnect
 
 all: $(PROGS)
 

orte/test/mpi/coll_test.c

@@ -1,66 +0,0 @@
-/* -*- C -*-
- *
- * $HEADER$
- *
- * The most basic of MPI applications
- */
-
-#include <stdio.h>
-#include "opal/mca/hwloc/hwloc.h"
-#include "mpi.h"
-
-#include "ompi/mca/rte/rte.h"
-
-#include "orte/util/proc_info.h"
-
-#define COLL_TEST_MAX  100
-
-int main(int argc, char* argv[])
-{
-    int rank, size, rc;
-    hwloc_cpuset_t cpus;
-    char *bindings;
-    int i, ret;
-    ompi_rte_collective_t *coll;
-
-    MPI_Init(&argc, &argv);
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    MPI_Comm_size(MPI_COMM_WORLD, &size);
-
-    cpus = hwloc_bitmap_alloc();
-    rc = hwloc_get_cpubind(opal_hwloc_topology, cpus, HWLOC_CPUBIND_PROCESS);
-    hwloc_bitmap_list_asprintf(&bindings, cpus);
-
-    printf("Hello, World, I am %d of %d [%d local peers]: get_cpubind: %d bitmap %s\n",
-           rank, size, orte_process_info.num_local_peers, rc,
-           (NULL == bindings) ? "NULL" : bindings);
-
-    for (i=0; i < COLL_TEST_MAX; i++) {
-        fprintf(stderr, "%d executing barrier %d\n", rank, i);
-        coll = OBJ_NEW(ompi_rte_collective_t);
-        coll->id = ompi_rte_get_collective_id(MPI_COMM_WORLD);
-        coll->active = true;
-        if (OMPI_SUCCESS != (ret = ompi_rte_barrier(coll))) {
-            OMPI_ERROR_LOG(ret);
-            return ret;
-        }
-        OMPI_LAZY_WAIT_FOR_COMPLETION(coll->active);
-        OBJ_RELEASE(coll);
-    }
-
-    for (i=0; i < COLL_TEST_MAX; i++) {
-        fprintf(stderr, "%d executing modex %d\n", rank, i);
-        coll = OBJ_NEW(ompi_rte_collective_t);
-        coll->id = ompi_rte_get_collective_id(MPI_COMM_WORLD);
-        coll->active = true;
-        if (OMPI_SUCCESS != (ret = ompi_rte_modex(coll))) {
-            OMPI_ERROR_LOG(ret);
-            return ret;
-        }
-        OMPI_LAZY_WAIT_FOR_COMPLETION(coll->active);
-        OBJ_RELEASE(coll);
-    }
-
-    MPI_Finalize();
-    return 0;
-}

orte/test/mpi/paccept.c

@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
                            MPI_COMM_SELF,           /* old communicator */
                            NULL,                    /* bridge comm */
                            &rank,                   /* local leader */
-                           &sender->proc_name,      /* remote leader */
+                           &sender->super.proc_name,      /* remote leader */
                            OMPI_COMM_CID_INTRA_OOB, /* mode */
                            false);                  /* send or recv first */
     if ( OMPI_SUCCESS != rc ) {
@@ -81,7 +81,7 @@ int main(int argc, char* argv[])
                             MPI_COMM_SELF,           /* old communicator */
                             NULL,                    /* bridge comm */
                             &rank,                   /* local leader */
-                            &sender->proc_name,      /* remote leader */
+                            &sender->super.proc_name,      /* remote leader */
                             OMPI_COMM_CID_INTRA_OOB, /* mode */
                             false);                  /* send or recv first */
     if ( OMPI_SUCCESS != rc ) {

orte/test/mpi/pconnect.c

@@ -63,7 +63,7 @@ int main(int argc, char* argv[])
                            MPI_COMM_SELF,           /* old communicator */
                            NULL,                    /* bridge comm */
                            &rank,                   /* local leader */
-                           &sender->proc_name,      /* remote leader */
+                           &sender->super.proc_name,      /* remote leader */
                            OMPI_COMM_CID_INTRA_OOB, /* mode */
                            true);                   /* send or recv first */
     if ( OMPI_SUCCESS != rc ) {
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
                             MPI_COMM_SELF,           /* old communicator */
                             NULL,                    /* bridge comm */
                             &rank,                   /* local leader */
-                            &sender->proc_name,      /* remote leader */
+                            &sender->super.proc_name,      /* remote leader */
                             OMPI_COMM_CID_INTRA_OOB, /* mode */
                             true);                   /* send or recv first */
     if ( OMPI_SUCCESS != rc ) {