X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e081f749e69ecc10ea0274b33ab3b8a5b4d6a0b..f2d6ca40194a4c2823be67e3d270d19aa5ea6520:/examples/gras/pmm/pmm.c

diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c
index c0320c4d33..86c563a3bb 100755
--- a/examples/gras/pmm/pmm.c
+++ b/examples/gras/pmm/pmm.c
@@ -1,4 +1,5 @@
-/* pmm - paralel matrix multiplication "double diffusion"                       */
+/* $Id$ */
+/* pmm - parallel matrix multiplication "double diffusion"                       */
 
 /* Copyright (c) 2006- Ahmed Harbaoui. All rights reserved.                  */
 
@@ -6,30 +7,32 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "gras.h"
-#define MATRIX_SIZE 3
-#define SLAVE_COUNT 9
+#define PROC_MATRIX_SIZE 3
+#define SLAVE_COUNT (PROC_MATRIX_SIZE*PROC_MATRIX_SIZE)
+
+#define DATA_MATRIX_SIZE 3
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(pmm,"Parallel Matrix Multiplication");
 
 GRAS_DEFINE_TYPE(s_matrix,struct s_matrix {
+  int lines;
   int rows;
-  int cols;
-  double *data GRAS_ANNOTE(size, rows*cols);
+  double *data GRAS_ANNOTE(size, lines*rows);
 };)
-     typedef struct s_matrix matrix_t;
-
-     /* struct for recovering results */
-     GRAS_DEFINE_TYPE(s_result,struct s_result {
-       int i;
-       int j;
-       double value;
-     });
+typedef struct s_matrix matrix_t;
+
+/* struct for recovering results */
+GRAS_DEFINE_TYPE(s_result,struct s_result {
+  int i;
+  int j;
+  double value;
+});
 typedef struct s_result result_t;
 
 /* struct to send initial data to slave */
 GRAS_DEFINE_TYPE(s_init_data,struct s_init_data {
+  int myline;
   int myrow;
-  int mycol;
   double a;
   double b;
 });
@@ -42,7 +45,7 @@ static void register_messages(void) {
   result_type=gras_datadesc_by_symbol(s_result);
   init_data_type=gras_datadesc_by_symbol(s_init_data);
 	
-  gras_msgtype_declare("result", result_type);  // recieve a final result from slave
+  gras_msgtype_declare("result", result_type);  // receive a final result from slave
   gras_msgtype_declare("init_data", init_data_type);  // send from master to slave to initialize data bA,bB
 
   gras_msgtype_declare("ask_result", gras_datadesc_by_name("int")); // send from master to slave to ask a final result	
@@ -63,7 +66,7 @@ int master (int argc,char *argv[]);
 
 /* Global private data */
 typedef struct {
-  int nbr_col,nbr_row;
+  int nbr_row,nbr_line;
   int remaining_step;
   int remaining_ack;
 } master_data_t;
@@ -74,7 +77,7 @@ typedef struct {
 static void initmatrix(matrix_t *X){
   int i;
 
-  for(i=0 ; i<(X->rows)*(X->cols); i++)
+  for(i=0 ; i<(X->lines)*(X->rows); i++)
     X->data[i]=1.0;//*rand()/(RAND_MAX+1.0);
 } /* end_of_initmatrixs */
 
@@ -109,22 +112,22 @@ static void display(matrix_t X){
   int i,j,t=0;
 
   printf("      ");
-  for(j=0;j<X.cols;j++)
+  for(j=0;j<X.rows;j++)
     printf("%.3d ",j);
   printf("\n");
   printf("    __");
-  for(j=0;j<X.cols;j++)
+  for(j=0;j<X.rows;j++)
     printf("____");
   printf("_\n");
 
-  for(i=0;i<X.rows;i++){
+  for(i=0;i<X.lines;i++){
     printf("%.3d | ",i);
-    for(j=0;j<X.cols;j++)
+    for(j=0;j<X.rows;j++)
       printf("%.3g ",X.data[t++]);
     printf("|\n");
   }
   printf("    --");
-  for(j=0;j<X.cols;j++)
+  for(j=0;j<X.rows;j++)
     printf("----");
   printf("-\n");
 
@@ -144,17 +147,17 @@ int master (int argc,char *argv[]) {
   /*  Init the GRAS's infrastructure */
   gras_init(&argc, argv);
 
-  gras_socket_t socket[MATRIX_SIZE*MATRIX_SIZE]; /* sockets for brodcast to other slave */
+  gras_socket_t socket[SLAVE_COUNT]; /* sockets for brodcast to slaves */
 
   /*  Initialize Matrixs */
 
-  A.rows=A.cols=MATRIX_SIZE;
-  B.rows=B.cols=MATRIX_SIZE;
-  C.rows=C.cols=MATRIX_SIZE;
+  A.lines=A.rows=DATA_MATRIX_SIZE;
+  B.lines=B.rows=DATA_MATRIX_SIZE;
+  C.lines=C.rows=DATA_MATRIX_SIZE;
 	
-  A.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
-  B.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
-  C.data=xbt_malloc0(sizeof(double)*MATRIX_SIZE*MATRIX_SIZE);
+  A.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
+  B.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
+  C.data=xbt_malloc0(sizeof(double)*DATA_MATRIX_SIZE*DATA_MATRIX_SIZE);
 	
   initmatrix(&A);
   initmatrix(&B);
@@ -166,11 +169,13 @@ int master (int argc,char *argv[]) {
   //multiplication();
   //gather();
   //display(A);
-  /****************************** Init Data Send *********************************/
+  /************************* Init Data Send *********************************/
   int step_ack,j=0;
   init_data_t mydata;
-  gras_os_sleep(60);                                                // MODIFIER LES TEMPS D'ATTENTE 60 c trop normalement
-  for( i=2;i< argc;i+=3){
+  gras_os_sleep(60);      // MODIFIER LES TEMPS D'ATTENTE 60 c trop normalement
+
+  int line=1, row=1;
+  for( i=2;i< argc;i++){
     TRY {
       socket[j]=gras_socket_client(argv[i],port);
     } CATCH(e) {
@@ -178,25 +183,32 @@ int master (int argc,char *argv[]) {
     }
     INFO2("Connected to %s:%d.",argv[i],port);
 		
-    mydata.myrow=atoi(argv[i+1]);  // My row
-    mydata.mycol=atoi(argv[i+2]);  // My column
+    mydata.myline=line;  // My line
+    mydata.myrow=row;  // My row
+    line++;
+    if (line > PROC_MATRIX_SIZE) {
+      line=1;
+      row++;
+    }
 		
-    mydata.a=A.data[(mydata.myrow-1)*MATRIX_SIZE+(mydata.mycol-1)];
-    mydata.b=B.data[(mydata.myrow-1)*MATRIX_SIZE+(mydata.mycol-1)];;
+    mydata.a=A.data[(mydata.myline-1)*PROC_MATRIX_SIZE+(mydata.myrow-1)];
+    mydata.b=B.data[(mydata.myline-1)*PROC_MATRIX_SIZE+(mydata.myrow-1)];;
 		
     gras_msg_send(socket[j],gras_msgtype_by_name("init_data"),&mydata);
-    INFO3("Send Init Data to %s : data A= %.3g & data B= %.3g",gras_socket_peer_name(socket[j]),mydata.a,mydata.b);
+    INFO3("Send Init Data to %s : data A= %.3g & data B= %.3g",
+	  gras_socket_peer_name(socket[j]),mydata.a,mydata.b);
     j++;
-  } // end init Data Send
+  }
+    // end init Data Send
 
   /******************************* multiplication ********************************/
-  INFO0("begin Multiplication");
+  INFO0("XXXXXXXXXXXXXXXXXXXXXX begin Multiplication");
 	
-  for (step=1; step <= MATRIX_SIZE; step++){
-    gras_os_sleep(50);
+  for (step=1; step <= PROC_MATRIX_SIZE; step++){
+    //    gras_os_sleep(50);
     for (i=0; i< SLAVE_COUNT; i++){
       TRY {
-	gras_msg_send(socket[i], gras_msgtype_by_name("step"), &step);  /* initialize Mycol, MyRow, mydataA,mydataB*/
+	gras_msg_send(socket[i], gras_msgtype_by_name("step"), &step);
       } CATCH(e) {
 	gras_socket_close(socket[i]);
 	RETHROW0("Unable to send the msg : %s");
@@ -228,7 +240,7 @@ int master (int argc,char *argv[]) {
   /* wait for results */
   for( i=1;i< argc;i++){
     gras_msg_wait(600,gras_msgtype_by_name("result"),&from,&result);
-    C.data[(result.i-1)*MATRIX_SIZE+(result.j-1)]=result.value;
+    C.data[(result.i-1)*DATA_MATRIX_SIZE+(result.j-1)]=result.value;
   }
   /*    end of gather   */
   INFO0 ("The Result of Multiplication is :");
@@ -248,7 +260,7 @@ int slave(int argc,char *argv[]) {
   int step,port,l,result_ack=0; 
   double bA,bB;
 
-  int myrow,mycol;
+  int myline,myrow;
   double mydataA,mydataB;
   double bC=0;
   
@@ -256,9 +268,11 @@ int slave(int argc,char *argv[]) {
 
   result_t result;
  
-  gras_socket_t from,sock;  /* to recive from server for steps */
+  gras_socket_t from,sock;  /* to receive from server for steps */
 
-  gras_socket_t socket_row[MATRIX_SIZE-1],socket_column[MATRIX_SIZE-1]; /* sockets for brodcast to other slave */
+  /* sockets for brodcast to other slave */
+  gras_socket_t socket_line[PROC_MATRIX_SIZE-1];
+  gras_socket_t socket_row[PROC_MATRIX_SIZE-1];
 
   /* Init the GRAS's infrastructure */
 
@@ -274,9 +288,9 @@ int slave(int argc,char *argv[]) {
   gras_os_sleep(1); //wait to start all slaves 
 
   int i;
-  for (i=1;i<MATRIX_SIZE;i++){
-    socket_row[i-1]=gras_socket_client(argv[i+1],port);
-    socket_column[i-1]=gras_socket_client(argv[i+MATRIX_SIZE],port);
+  for (i=1;i<PROC_MATRIX_SIZE;i++){
+    socket_line[i-1]=gras_socket_client(argv[i+1],port);
+    socket_row[i-1]=gras_socket_client(argv[i+PROC_MATRIX_SIZE],port);
   }
 
   /*  Register the known messages */
@@ -290,62 +304,62 @@ int slave(int argc,char *argv[]) {
   } CATCH(e) {
     RETHROW0("I Can't get a init Data message from master : %s");
   }
+  myline=mydata.myline;
   myrow=mydata.myrow;
-  mycol=mydata.mycol;
   mydataA=mydata.a;
   mydataB=mydata.b;
-  INFO4("Recive MY POSITION (%d,%d) and MY INIT DATA ( A=%.3g | B=%.3g )",
-	myrow,mycol,mydataA,mydataB);
+  INFO4("Receive MY POSITION (%d,%d) and MY INIT DATA ( A=%.3g | B=%.3g )",
+	myline,myrow,mydataA,mydataB);
   step=1;
   
   do {  //repeat until compute Cb
-    step=MATRIX_SIZE+1;  // just intilization for loop
+    step=PROC_MATRIX_SIZE+1;  // just intilization for loop
 	
     TRY {
       gras_msg_wait(200,gras_msgtype_by_name("step"),&from,&step);
     } CATCH(e) {
       RETHROW0("I Can't get a Next Step message from master : %s");
     }
-    INFO1("Recive a step message from master: step = %d ",step);
+    INFO1("Receive a step message from master: step = %d ",step);
 
-    if (step < MATRIX_SIZE ){
-      /* a row brodcast */
+    if (step < PROC_MATRIX_SIZE ){
+      /* a line brodcast */
       gras_os_sleep(3);  // IL FAUT EXPRIMER LE TEMPS D'ATTENTE EN FONCTION DE "SLAVE_COUNT"
-      if(myrow==step){
-	INFO2("step(%d) = Myrow(%d)",step,myrow);
-	for (l=1;l < MATRIX_SIZE ;l++){
-	  gras_msg_send(socket_column[l-1], gras_msgtype_by_name("dataB"), &mydataB);
+      if(myline==step){
+	INFO2("step(%d) = Myline(%d)",step,myline);
+	for (l=1;l < PROC_MATRIX_SIZE ;l++){
+	  gras_msg_send(socket_row[l-1], gras_msgtype_by_name("dataB"), &mydataB);
 	  bB=mydataB;
 	  INFO1("send my data B (%.3g) to my (vertical) neighbors",bB);  
 	}
       }
-      if(myrow != step){ 
-	INFO2("step(%d) <> Myrow(%d)",step,myrow);
+      if(myline != step){ 
+	INFO2("step(%d) <> Myline(%d)",step,myline);
 	TRY {
 	  gras_msg_wait(600,gras_msgtype_by_name("dataB"),
 			&from,&bB);
 	} CATCH(e) {
-	  RETHROW0("I Can't get a data message from row : %s");
+	  RETHROW0("I Can't get a data message from line : %s");
 	}
-	INFO2("Recive data B (%.3g) from my neighbor: %s",bB,gras_socket_peer_name(from));
+	INFO2("Receive data B (%.3g) from my neighbor: %s",bB,gras_socket_peer_name(from));
       }
-      /* a column brodcast */
-      if(mycol==step){
-	for (l=1;l < MATRIX_SIZE ;l++){
-	  gras_msg_send(socket_row[l-1],gras_msgtype_by_name("dataA"), &mydataA);
+      /* a row brodcast */
+      if(myrow==step){
+	for (l=1;l < PROC_MATRIX_SIZE ;l++){
+	  gras_msg_send(socket_line[l-1],gras_msgtype_by_name("dataA"), &mydataA);
 	  bA=mydataA;
 	  INFO1("send my data A (%.3g) to my (horizontal) neighbors",bA);
 	}
       }
 
-      if(mycol != step){
+      if(myrow != step){
 	TRY {
 	  gras_msg_wait(1200,gras_msgtype_by_name("dataA"),
 			&from,&bA);
 	} CATCH(e) {
-	  RETHROW0("I Can't get a data message from column : %s");
+	  RETHROW0("I Can't get a data message from row : %s");
 	}
-	INFO2("Recive data A (%.3g) from my neighbor : %s ",bA,gras_socket_peer_name(from));
+	INFO2("Receive data A (%.3g) from my neighbor : %s ",bA,gras_socket_peer_name(from));
       }
       bC+=bA*bB;
       INFO1(">>>>>>>> My BC = %.3g",bC);
@@ -356,20 +370,20 @@ int slave(int argc,char *argv[]) {
 	
       INFO1("Send ack to master for to end %d th step",step);
     }
-    if(step==MATRIX_SIZE-1) break;
+    if(step==PROC_MATRIX_SIZE-1) break;
 	
-  } while (step < MATRIX_SIZE);
+  } while (step < PROC_MATRIX_SIZE);
   /*  wait Message from master to send the result */
  
   result.value=bC;
-  result.i=myrow;
-  result.j=mycol;
+  result.i=myline;
+  result.j=myrow;
  
   TRY {
     gras_msg_wait(600,gras_msgtype_by_name("ask_result"),
 		  &from,&result_ack);
   } CATCH(e) {
-    RETHROW0("I Can't get a data message from row : %s");
+    RETHROW0("I Can't get a data message from line : %s");
   }
   /* send Result to master */
   TRY {