- MPI_Scatter() /* untested */

- associated tests

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6466 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/smpi/allreduce.c b/examples/smpi/allreduce.c
new file mode 100644 (file)
index 0000000..f8ecf7b
--- /dev/null
+++ b/examples/smpi/allreduce.c
@@ -0,0 +1,79 @@
+#include <stdio.h>
+#include <mpi.h>
+
+/**
+ * MESSAGE PASSING INTERFACE TEST CASE SUITE
+ *
+ * Copyright IBM Corp. 1995
+ * 
+ * IBM Corp. hereby grants a non-exclusive license to use, copy, modify, and
+ *distribute this software for any purpose and without fee provided that the
+ *above copyright notice and the following paragraphs appear in all copies.
+
+ * IBM Corp. makes no representation that the test cases comprising this
+ * suite are correct or are an accurate representation of any standard.
+
+ * In no event shall IBM be liable to any party for direct, indirect, special
+ * incidental, or consequential damage arising out of the use of this software
+ * even if IBM Corp. has been advised of the possibility of such damage.
+
+ * IBM CORP. SPECIFICALLY DISCLAIMS ANY WARRANTIES INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS AND IBM
+ * CORP. HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ * ***************************************************************************
+ **/
+int ibm_test(int rank, int size)
+{
+         int success = 1;
+#define MAXLEN  10000
+
+         int root, i, j, k;
+         int out[MAXLEN];
+         int in[MAXLEN];
+
+         for (j = 1; j <= MAXLEN; j *= 10) {
+                   for (i = 0; i < j; i++)
+                               out[i] = i;
+
+                   MPI_Allreduce(out, in, j, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+                   MPI_Barrier(MPI_COMM_WORLD);
+
+                   if (rank == root) {
+                               for (k = 0; k < j; k++) {
+                                         if (in[k] != k * size) {
+                                                   printf("bad answer (%d) at index %d of %d (should be %d)", in[k], k,
+                                                                         j, k * size);
+                                                   success = 0;
+                                                   break;
+                                         }
+                               }
+                   }
+         }
+         return (success);
+}
+
+
+
+
+int main(int argc, char **argv)
+{
+  int size, rank;
+
+
+  MPI_Init(&argc, &argv);
+  MPI_Comm_size(MPI_COMM_WORLD, &size);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+
+
+  if (0 == rank)
+    printf("** IBM Test Result: ... \n");
+  if (!ibm_test(rank, size))
+    printf("\t[%d] failed.\n", rank);
+  else
+    printf("\t[%d] ok.\n", rank);
+
+  MPI_Finalize();
+  return 0;
+}

diff --git a/examples/smpi/scatter.c b/examples/smpi/scatter.c
new file mode 100644 (file)
index 0000000..9647aee
--- /dev/null
+++ b/examples/smpi/scatter.c
@@ -0,0 +1,106 @@
+/**
+ * MESSAGE PASSING INTERFACE TEST CASE SUITE
+ *
+ * Copyright IBM Corp. 1995
+ * 
+ * IBM Corp. hereby grants a non-exclusive license to use, copy, modify, and
+ *distribute this software for any purpose and without fee provided that the
+ *above copyright notice and the following paragraphs appear in all copies.
+
+ * IBM Corp. makes no representation that the test cases comprising this
+ * suite are correct or are an accurate representation of any standard.
+
+ * In no event shall IBM be liable to any party for direct, indirect, special
+ * incidental, or consequential damage arising out of the use of this software
+ * even if IBM Corp. has been advised of the possibility of such damage.
+
+ * IBM CORP. SPECIFICALLY DISCLAIMS ANY WARRANTIES INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS AND IBM
+ * CORP. HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ * ***************************************************************************
+ **/
+#include <stdio.h>
+#include <mpi.h>
+
+int ibm_test(int rank, int size)  {
+
+#define MAXLEN  10000
+
+         int success = 1;
+         int root,i,j,k;
+         int out[MAXLEN*64];
+         int in[MAXLEN];
+
+
+         for(j=1,root=0;j<=MAXLEN;j*=10,root=(root+1)%size)  {
+                   if(rank == root)
+                               for(i=0;i<j*size;i++)  out[i] = i;
+
+                   MPI_Scatter(out,j,MPI_INT,in,j,MPI_INT,root,MPI_COMM_WORLD);
+
+                   for(k=0;k<j;k++) {
+                               if(in[k] != k+rank*j) {
+                                         fprintf(stderr,"task %d bad answer (%d) at index %d k of %d (should be %d)", rank,in[k],k,j,(k+rank*j));
+                                         return( 0 ); 
+                               }
+                   }
+         }
+        return( success );
+         MPI_Barrier( MPI_COMM_WORLD );
+}
+
+/**
+ * small test: the root sends a single distinct double to other processes
+ **/
+int small_test( int rank, int size ) {
+  int success=1;
+  int sendcount=size;
+  int recvcount=1;
+  int i;
+  double *sndbuf =NULL;
+  double rcvd;
+  int root=0; // arbitrary choice 
+
+  // on root, initialize sendbuf
+  if (root == rank )  {
+           sndbuf = malloc( sendcount*sizeof(double));
+           for (i=0; i<sendcount;i++) {
+                       sndbuf[i] = (double) rank;
+           }
+  }
+
+   MPI_Scatter(sndbuf, sendcount, MPI_DOUBLE, &rcvd,recvcount,MPI_DOUBLE,root,MPI_COMM_WORLD);
+
+  return(success);
+}
+
+
+
+int main(int argc, char **argv)
+{
+  int size, rank;
+
+
+  MPI_Init(&argc, &argv);
+  MPI_Comm_size(MPI_COMM_WORLD, &size);
+  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+
+
+
+  if (0 == rank)
+    printf("** Small Test Result: ... \n");
+  small_test( rank, size );
+
+
+  if (0 == rank)
+    printf("** IBM Test Result: ... \n");
+/*  if (!ibm_test(rank, size))
+    printf("\t[%d] failed.\n", rank);
+  else
+    printf("\t[%d] ok.\n", rank);
+*/
+  MPI_Finalize();
+  return 0;
+}

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index af5a3e2..fbbbe9f 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -102,6 +102,7 @@ SG_BEGIN_DECL()
 #define MPI_Wtime() SMPI_MPI_Wtime()
 #define MPI_Reduce( a, b, c, d, e, f, g) SMPI_MPI_Reduce( a, b, c, d, e, f, g)
 #define MPI_Allreduce( a, b, c, d, e, f) SMPI_MPI_Allreduce( a, b, c, d, e, f)
 #define MPI_Wtime() SMPI_MPI_Wtime()
 #define MPI_Reduce( a, b, c, d, e, f, g) SMPI_MPI_Reduce( a, b, c, d, e, f, g)
 #define MPI_Allreduce( a, b, c, d, e, f) SMPI_MPI_Allreduce( a, b, c, d, e, f)

+#define MPI_Scatter( a, b, c, d, e, f, g, h )  SMPI_MPI_Scatter( a, b, c, d, e, f, g, h)

 
 // SMPI Functions
 XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
 
 // SMPI Functions
 XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);


@@ -139,6 +140,8 @@ XBT_PUBLIC(int) SMPI_MPI_Reduce(void *sendbuf, void *recvbuf, int count,
 XBT_PUBLIC(int) SMPI_MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
                                    MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
 
 XBT_PUBLIC(int) SMPI_MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
                                    MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
 

+XBT_PUBLIC(int) SMPI_MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype datatype,
+                                    void *recvbuf, int recvcount, MPI_Datatype recvtype,int root, MPI_Comm comm);

 
 // smpi functions
 XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);
 
 // smpi functions
 XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 0a075cc..6aae3c6 100644 (file)
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -391,6 +391,79 @@ int SMPI_MPI_Allreduce( void *sendbuf, void *recvbuf, int count, MPI_Datatype da
 }
 
 
 }
 
 

+/**
+ * MPI_Scatter user entry point
+ **/
+//int SMPI_MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype datatype, 
+//                      void *recvbuf, int recvcount, MPI_Datatype recvtype,int root,
+//                     MPI_Comm comm);
+int SMPI_MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype datatype, 
+                        void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                          int root, MPI_Comm comm)
+{
+  int retval = MPI_SUCCESS;
+  int i;
+  int cnt=0;  
+  int rank;
+  int tag=0;
+  char *cbuf;  // to manipulate the void * buffers
+  smpi_mpi_request_t *requests;
+  smpi_mpi_request_t request;
+  smpi_mpi_status_t status;
+
+
+  smpi_bench_end();
+
+  rank = smpi_mpi_comm_rank(comm);
+
+  requests = xbt_malloc((comm->size-1) * sizeof(smpi_mpi_request_t));
+  if (rank == root) {
+           // i am the root: distribute my sendbuf
+           for (i=0; i < comm->size; i++) {
+                                 cbuf = sendbuf;
+                                 cbuf += i*sendcount*datatype->size;
+                       if ( i!=root ) { // send to processes ...
+
+                                 retval = smpi_create_request((void *)cbuf, sendcount, 
+                                                       datatype, root, i, tag, comm, &(requests[cnt++]));
+                                 if (NULL != requests[cnt] && MPI_SUCCESS == retval) {
+                                           if (MPI_SUCCESS == retval) {
+                                                       smpi_mpi_isend(requests[cnt]);
+                                           }
+                                 }
+                                 cnt++;
+                       } 
+                       else { // ... except if it's me.
+                                 memcpy(recvbuf, (void *)cbuf, recvcount*recvtype->size*sizeof(char));
+                       }
+           }
+           for(i=0; i<cnt; i++) { // wait for send to complete
+                           /* FIXME: waitall() should be slightly better */
+                           smpi_mpi_wait(requests[i], &status);
+                           xbt_mallocator_release(smpi_global->request_mallocator, requests[i]);
+
+           }
+  } 
+  else {  // i am a non-root process: wait data from the root
+           retval = smpi_create_request(recvbuf,recvcount, 
+                                 recvtype, root, rank, tag, comm, &request);
+           if (NULL != request && MPI_SUCCESS == retval) {
+                       if (MPI_SUCCESS == retval) {
+                                 smpi_mpi_irecv(request);
+                       }
+           }
+           smpi_mpi_wait(request, &status);
+           xbt_mallocator_release(smpi_global->request_mallocator, request);
+  }
+  xbt_free(requests);
+
+  smpi_bench_begin();
+
+  return retval;
+}
+
+
+