- Use coll_tags.h

- #if 0 out almost everything; waiting for stable PML interface... This commit was SVN r693.
2004-02-10 19:34:26 +00:00 · 2004-02-10 19:34:26 +00:00 · 0140eb755e
--- a/src/mca/mpi/coll/basic/src/coll_basic.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic.c
@ -187,6 +187,11 @@ int mca_coll_basic_init_query(int *thread_min, int *thread_max)
 */
 const mca_coll_1_0_0_t *mca_coll_basic_comm_query(MPI_Comm comm, int *priority)
 {
+#if 1
+  /* JMS fix me */
+  *priority = 0;
+  return &linear;
+#else
  int size;

  /* This module should always have the lowest available priority */
@ -201,6 +206,7 @@ const mca_coll_1_0_0_t *mca_coll_basic_comm_query(MPI_Comm comm, int *priority)
  } else {
    return &log;
  }
+#endif
 }


--- a/src/mca/mpi/coll/basic/src/coll_basic_allgather.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_allgather.c
@ -9,6 +9,7 @@
 #include "mpi.h"
 #include "mpi/communicator/communicator.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -24,6 +25,9 @@ int mca_coll_basic_allgather(void *sbuf, int scount,
                             int rcount, MPI_Datatype rdtype, 
                             MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int size;
  int err;

@ -39,4 +43,5 @@ int mca_coll_basic_allgather(void *sbuf, int scount,
  err = comm->c_coll.coll_bcast_intra(rbuf, rcount * size, rdtype, 
                                      0, comm);
  return err;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_allgatherv.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_allgatherv.c
@ -9,6 +9,7 @@
 #include "mpi.h"
 #include "mpi/communicator/communicator.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -25,6 +26,9 @@ int mca_coll_basic_allgatherv(void *sbuf, int scount,
                              MPI_Datatype rdtype, 
                              MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i, size;
  int err;

@ -39,4 +43,5 @@ int mca_coll_basic_allgatherv(void *sbuf, int scount,
  }

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_allreduce.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_allreduce.c
@ -9,6 +9,7 @@
 #include "mpi.h"
 #include "mpi/communicator/communicator.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -23,6 +24,9 @@ int mca_coll_basic_allreduce(void *sbuf, void *rbuf, int count,
                             MPI_Datatype dtype, MPI_Op op,
                             MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int err;

  /* Reduce to 0 and broadcast. */
@ -33,4 +37,5 @@ int mca_coll_basic_allreduce(void *sbuf, void *rbuf, int count,
    return err;

  return comm->c_coll.coll_bcast_intra(rbuf, count, dtype, 0, comm);
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_alltoall.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_alltoall.c
@ -13,6 +13,7 @@
 #include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -28,6 +29,9 @@ int mca_coll_basic_alltoall(void *sbuf, int scount,
                            int rcount, MPI_Datatype rdtype,
                            MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int rank;
  int size;
@ -145,4 +149,5 @@ int mca_coll_basic_alltoall(void *sbuf, int scount,

  free(req);
  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_alltoallv.c
@ -13,6 +13,7 @@
 #include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -29,6 +30,9 @@ mca_coll_basic_alltoallv(void *sbuf, int *scounts, int *sdisps,
                         int *rcounts, int *rdisps,
                         MPI_Datatype rdtype, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -150,4 +154,5 @@ mca_coll_basic_alltoallv(void *sbuf, int *scounts, int *sdisps,

  free(req);
  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_alltoallw.c
@ -13,6 +13,7 @@
 #include "lam/mem/malloc.h"
 #include "mpi/datatype/datatype.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -28,6 +29,9 @@ int mca_coll_basic_alltoallw(void *sbuf, int *scounts, int *sdisps,
                             int *rcounts, int *rdisps,
                             MPI_Datatype *rdtypes, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -145,4 +149,5 @@ int mca_coll_basic_alltoallw(void *sbuf, int *scounts, int *sdisps,

  free(req);
  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_barrier.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_barrier.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -20,7 +21,9 @@
 */
 int mca_coll_basic_barrier_lin(MPI_Comm comm)
 {
-#if 0
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int size;
  int rank;
  int err;
@ -78,11 +81,11 @@ int mca_coll_basic_barrier_lin(MPI_Comm comm)
 #endif
    }
  }
-#endif /* 0 */

  /* All done */

  return MPI_SUCCESS;
+#endif
 }


@ -96,7 +99,9 @@ int mca_coll_basic_barrier_lin(MPI_Comm comm)
 int
 mca_coll_basic_barrier_log(MPI_Comm comm)
 {
-#if 0
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int size;
  int rank;
  int peer;
@ -174,9 +179,9 @@ mca_coll_basic_barrier_log(MPI_Comm comm)
 #endif
    }
  }
-#endif /* 0 */

  /* All done */

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_bcast.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_bcast.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -22,6 +23,9 @@ int mca_coll_basic_bcast_lin(void *buff, int count,
 				 MPI_Datatype datatype, int root,
 				 MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -90,6 +94,7 @@ int mca_coll_basic_bcast_lin(void *buff, int count,
  /* All done */

  return MPI_SUCCESS;
+#endif
 }


@ -104,6 +109,9 @@ int mca_coll_basic_bcast_log(void *buff, int count,
 				 MPI_Datatype datatype, int root,
 				 MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -190,4 +198,5 @@ int mca_coll_basic_bcast_log(void *buff, int count,
  /* All done */

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_exscan.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_exscan.c
@ -11,6 +11,7 @@
 #include "lam/mem/malloc.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -24,7 +25,9 @@
 int mca_coll_basic_exscan(void *sbuf, void *rbuf, int count,
                          MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)
 {
-#if 0
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int size;
  int rank;
  int err;
@ -162,9 +165,9 @@ int mca_coll_basic_exscan(void *sbuf, void *rbuf, int count,
    LAM_FREE(gathered_buffer);
  if (NULL != tmpbuf)
    LAM_FREE(tmpbuf);
-#endif /* 0 */

  /* All done */

  return MPI_SUCCESS;
+#endif /* 0 */
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_gather.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_gather.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -22,7 +23,9 @@ int mca_coll_basic_gather(void *sbuf, int scount, MPI_Datatype sdtype,
                          void *rbuf, int rcount, MPI_Datatype rdtype, 
                          int root, MPI_Comm comm)
 {
-#if 0
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int err;
  int rank;
@ -64,9 +67,9 @@ int mca_coll_basic_gather(void *sbuf, int scount, MPI_Datatype sdtype,
      return err;
    }
  }
-#endif /* 0 */

  /* All done */
  
  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_gatherv.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_gatherv.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -23,7 +24,9 @@ int mca_coll_basic_gatherv(void *sbuf, int scount, MPI_Datatype sdtype,
                           MPI_Datatype rdtype, int root,
                           MPI_Comm comm)
 {
-#if 0
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int rank;
  int size;
@ -65,9 +68,9 @@ int mca_coll_basic_gatherv(void *sbuf, int scount, MPI_Datatype sdtype,
      return err;
    }
  }
-#endif

  /* All done */

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_reduce.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_reduce.c
@ -10,6 +10,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -24,6 +25,9 @@ int mca_coll_basic_reduce_lin(void *sbuf, void *rbuf, int count,
                              MPI_Datatype dtype, MPI_Op op,
                              int root, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -119,6 +123,7 @@ int mca_coll_basic_reduce_lin(void *sbuf, void *rbuf, int count,
  /* All done */

  return (MPI_SUCCESS);
+#endif
 }


@ -133,6 +138,9 @@ int mca_coll_basic_reduce_log(void *sbuf, void *rbuf, int count,
                              MPI_Datatype dtype, MPI_Op op,
                              int root, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int size;
  int rank;
@ -293,4 +301,5 @@ int mca_coll_basic_reduce_log(void *sbuf, void *rbuf, int count,
  /* All done */

  return err;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_reduce_scatter.c
@ -11,6 +11,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -25,6 +26,9 @@ int mca_coll_basic_reduce_scatter(void *sbuf, void *rbuf, int *rcounts,
                                  MPI_Datatype dtype, MPI_Op op,
                                  MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int err;
  int rank;
@ -88,4 +92,5 @@ int mca_coll_basic_reduce_scatter(void *sbuf, void *rbuf, int *rcounts,
    free(buffer);

  return err;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_scan.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_scan.c
@ -10,6 +10,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -23,6 +24,9 @@
 int mca_coll_basic_scan(void *sbuf, void *rbuf, int count,
                        MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int size;
  int rank;
  int err;
@ -131,4 +135,5 @@ int mca_coll_basic_scan(void *sbuf, void *rbuf, int count,
  /* All done */

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_scatter.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_scatter.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -22,6 +23,9 @@ int mca_coll_basic_scatter(void *sbuf, int scount, MPI_Datatype sdtype,
                           void *rbuf, int rcount, MPI_Datatype rdtype,
                           int root, MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int rank;
  int size;
@ -71,4 +75,5 @@ int mca_coll_basic_scatter(void *sbuf, int scount, MPI_Datatype sdtype,
  /* All done */

  return MPI_SUCCESS;
+#endif
 }
--- a/src/mca/mpi/coll/basic/src/coll_basic_scatterv.c
+++ b/src/mca/mpi/coll/basic/src/coll_basic_scatterv.c
@ -8,6 +8,7 @@
 #include "lam/constants.h"
 #include "mpi.h"
 #include "mca/mpi/coll/coll.h"
+#include "mca/mpi/coll/base/coll_tags.h"
 #include "coll_basic.h"


@ -24,6 +25,9 @@ int mca_coll_basic_scatterv(void *sbuf, int *scounts,
                            MPI_Datatype rdtype, int root,
                            MPI_Comm comm)
 {
+#if 1
+  return LAM_ERR_NOT_IMPLEMENTED;
+#else
  int i;
  int rank;
  int size;
@ -73,4 +77,5 @@ int mca_coll_basic_scatterv(void *sbuf, int *scounts,
  /* All done */

  return MPI_SUCCESS;
+#endif
 }