X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/blobdiff_plain/e4b14590c5b948dac64c900d8d83e990a3f79122..7314cfe257c8b75f34a34995a4a2075edc1d3888:/hpcc.tex

diff --git a/hpcc.tex b/hpcc.tex
index 640f3ae..865fb94 100644
--- a/hpcc.tex
+++ b/hpcc.tex
@@ -135,35 +135,7 @@ iterative  asynchronous algorithms  to solve  a given  problem on  a large-scale
 simulated environment challenges to  find optimal configurations giving the best
 results with a lowest residual error and in the best of execution time.
 
-<<<<<<< HEAD
-To our knowledge, there is no existing work on the large-scale simulation of a
-real AIAC application. The aim of this paper is twofold. First we give a first
-approach of the simulation of AIAC algorithms using a simulation tool (i.e. the
-SimGrid toolkit~\cite{SimGrid}). Second, we confirm the effectiveness of
-asynchronous mode algorithms by comparing their performance with the synchronous
-mode. More precisely, we had implemented a program for solving large
-linear system of equations by numerical method GMRES (Generalized
-Minimal Residual) \cite{ref1}. We show, that with minor modifications of the
-initial MPI code, the SimGrid toolkit allows us to perform a test campaign of a
-real AIAC application on different computing architectures. The simulated
-results we obtained are in line with real results exposed in ??\AG[]{ref?}.
-SimGrid had allowed us to launch the application from a modest computing
-infrastructure by simulating different distributed architectures composed by
-clusters nodes interconnected by variable speed networks. In the simulated environment, after setting appropriate 
-network and cluster parameters like the network bandwidth, latency or the processors power, 
-the experimental results have demonstrated a asynchronous execution time saving up to \np[\%]{40} in
-compared to the synchronous mode.
-\AG{Il faudrait revoir la phrase prÃ©cÃ©dente (couper en deux?).  LÃ , on peut
-  avoir l'impression que le gain de \np[\%]{40} est entre une exÃ©cution rÃ©elle
-  et une exÃ©cution simulÃ©e!}
-\CER{La phrase a Ã©tÃ© modifiÃ©e}
-
-This article is structured as follows: after this introduction, the next  section will give a brief description of
-iterative asynchronous model.  Then, the simulation framework SimGrid is presented with the settings to create various
-distributed architectures. The algorithm of  the multisplitting method based on GMRES \LZK{??? GMRES n'utilise pas la mÃ©thode de multisplitting! Sinon ne doit on pas expliquer le choix d'une mÃ©thode de multisplitting?} \CER{La phrase a Ã©tÃ© corrigÃ©e} written with MPI primitives and
-its adaptation to SimGrid with SMPI (Simulated MPI) is detailed in the next section. At last, the experiments results
-carried out will be presented before some concluding remarks and future works.
-=======
+
 To our knowledge,  there is no existing work on the  large-scale simulation of a
 real  AIAC application.   {\bf  The contribution  of  the present  paper can  be
   summarised  in two  main  points}.  First  we  give a  first  approach of  the
@@ -196,7 +168,7 @@ based  on GMRES to  solve each  block obtained  of the  splitting. This  code is
 written with MPI  primitives and its adaptation to  SimGrid with SMPI (Simulated
 MPI) is  detailed in the next  section. At last, the  simulation results carried
 out will be presented before some concluding remarks and future works.
->>>>>>> 6785b9ef58de0db67c33ca901c7813f3dfdc76e0
+
  
 \section{Motivations and scientific context}
 
