X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4eb1ae8b7be9ad432765f2a6a3d16c115c03603..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/examples/smpi/MM/MM_mpi.c

diff --git a/examples/smpi/MM/MM_mpi.c b/examples/smpi/MM/MM_mpi.c
index 7ab7d14371..6767ba47e9 100644
--- a/examples/smpi/MM/MM_mpi.c
+++ b/examples/smpi/MM/MM_mpi.c
@@ -1,12 +1,15 @@
+/* Copyright (c) 2012, 2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 /*
  * Block Matrix Multiplication example
  *
- * Authors: Quintin Jean-Noël
  */
 
 
-#include "topo.h"
-#include "param.h"
 #include "Matrix_init.h"
 #include "2.5D_MM.h"
 #include "xbt/log.h"
@@ -14,11 +17,11 @@
 /*int sched_setaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *mask);
   int sched_getaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *mask);
  */
+#include <stdio.h>
+#include <string.h>
 #include <mpi.h>
 #include <math.h>
 #include <getopt.h>
-#include <stdio.h>
-#include <string.h>
 
  XBT_LOG_NEW_DEFAULT_CATEGORY(MM_mpi,
                              "Messages specific for this msg example");
@@ -69,28 +72,25 @@ int main(int argc, char ** argv)
   while(loop==1);
 #endif
 
-  int opt, display = 0;
-  char *conf_file = NULL;
+  int opt = 0;
   optind = 1;
 
   //get the parameter from command line
-  while ((opt = getopt(argc, argv, "hdf:r:c:M:N:K:B:G:g:k:P:")) != -1) {
+  while ((opt = getopt(argc, argv, "hr:c:M:N:K:B:G:g:k:P:")) != -1) {
     switch(opt) {
       case 'h':
         XBT_INFO(
                     "Usage: mxm_cblas_test [options]\n"
-                    "	-M I	M size (default: %zu)\n"
-                    "	-N I	N size (default: %zu)\n"
-                    "	-K I	K size (default: %zu)\n"
-                    "	-B I	Block size on the k dimension(default: %zu)\n"
-                    "	-G I	Number of processor groups(default: %zu)\n"
-                    "	-g I	group index(default: %zu)\n"
-                    "	-k I	group rank(default: %zu)\n"
-                    "	-r I	processor row size (default: %zu)\n"
-                    "	-c I	processor col size (default: %zu)\n"
-                    " -f {Filename} provide the file with the configuration\n"
-                    "	-d  display the configuration file on the stderr\n"
-                    "	-h	help\n",
+                    "  -M I  M size (default: %zu)\n"
+                    "  -N I  N size (default: %zu)\n"
+                    "  -K I  K size (default: %zu)\n"
+                    "  -B I  Block size on the k dimension(default: %zu)\n"
+                    "  -G I  Number of processor groups(default: %zu)\n"
+                    "  -g I  group index(default: %zu)\n"
+                    "  -k I  group rank(default: %zu)\n"
+                    "  -r I  processor row size (default: %zu)\n"
+                    "  -c I  processor col size (default: %zu)\n"
+                    "  -h  help\n",
                     m, n, k, Block_size, NB_groups, group, key, row, col);
         return 0;
       case 'M':
@@ -123,41 +123,10 @@ int main(int argc, char ** argv)
         /*case 'P':
           str_mask = strdup(optarg);
           break;*/
-      case 'f':
-        conf_file = strdup(optarg);
-        break;
-      case 'd':
-        display = 1;
-        break;
     }
   }
-  if( display == 1 ){
-    print_conf(MPI_COMM_WORLD, myrank,NULL,NULL);
-    MPI_Barrier(MPI_COMM_WORLD);
-    MPI_Finalize();
-    exit(0);
-  }
-
-  char **conf;
-  //char ***conf_all;
-  if(conf_file == NULL){
-    conf = get_conf(MPI_COMM_WORLD, "default_conf", -1);
-  }else{
-    conf = get_conf(MPI_COMM_WORLD, conf_file, -1);
-    //conf_all = get_conf_all(conf_file);
-  }
-  if(conf == NULL){
-        XBT_INFO(
-                "No configuration for me inside the file\n");
-  }else{
 
 
-    if(NB_groups !=1){
-      /* Get my group number from the config file */
-      group = (size_t)atoi(conf[4]);
-    }
-  }
-
 
 
 
@@ -171,7 +140,6 @@ int main(int argc, char ** argv)
                size_row, size_col,  NB_groups);
 
   // close properly the pragram
-end:
   MPI_Barrier(MPI_COMM_WORLD);
   MPI_Finalize();
   return 0;