Changeset 254

Timestamp:

07/08/11 11:21:13 (13 years ago)

Author:

hozdoba

Message:

Gestion du dispatch client

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (2 diffs)
• src/xmlio/fortran/impi_interface.f90 (modified) (1 diff)
• src/xmlio/fortran/impi_interface.hpp (modified) (1 diff)
• src/xmlio/main_server.cpp (modified) (1 diff)
• src/xmlio/manager/mpi_manager.cpp (modified) (2 diffs)
• src/xmlio/manager/mpi_manager.hpp (modified) (2 diffs)
• src/xmlio/output/onetcdf4.cpp (modified) (1 diff)
• src/xmlio/output/onetcdf4.hpp (modified) (1 diff)
• src4/xmlio/fortran/idomain.f90 (modified) (2 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -15 +15 @@
 VTK       = yes
 GUI       = no
-NPROC     = 5
+NPROC     = 12
 #VERSION   = 4
 CSUITE    = gnu
@@ -255 +255 @@
 
 LIBS_PATH  += -L $(NETCDF_LIB) -L $(HDF5_LIB)
-LIBS       += -lnetcdf -lhdf5_hl -lhdf5 -lz
+LIBS       +=  -lnetcdf -lhdf5_hl -lhdf5 -lz
 INCLUDE    += -I $(NETCDF_INCL)
 

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.f90

@@ -176 +176 @@
    END SUBROUTINE xios_mpi_barrier
 
+   ! Collecte de données et rediffusion
+   SUBROUTINE xios_mpi_allgather(sendbuf, sendcount, recvbuf, recvcount, comm, ierror) BIND (C, NAME ="mpi_allgather")
+      INTEGER (kind = C_INT), DIMENSION(*) :: sendbuf, recvbuf
+      INTEGER (kind = C_INT)               :: sendcount, recvcount, comm, ierror
+       CALL MPI_ALLGATHER(sendbuf, sendcount, MPI_INTEGER, recvbuf, recvcount, MPI_INTEGER, comm, ierror)
+   END SUBROUTINE xios_mpi_allgather
+
 END MODULE IMPI_INTERFACE

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.hpp

@@ -80 +80 @@
 void mpi_barrier(int * comm, int * err);
 
+/// Collecte de données et rediffusion ///
+void mpi_allgather(int sendbuf[], int * sendcount, int recvbuf[], int * recvcount, int * comm, int * ierror);
+
 #ifdef __cplusplus
 }

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -16 +16 @@
    try
    {
+      MPIComm comm_client, comm_client_server, comm_server;
       //comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté
       //comm::CMPIManager::Finalize();               // < seulement en mode connecté
 
       CXIOSManager::Initialise (CXIOSManager::CLIENT_SERVER, &argc, &argv);
-      CXIOSManager::AddClient ("nemo"    , 4, 2, &nemo_fake_entry);
+      //CXIOSManager::AddClient ("nemo"    , 4, 2, &nemo_fake_entry);
       //CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry);
       //CXIOSManager::AddClient("lmdz"    , 4, 2, &lmdz_fake_entry);
-      CXIOSManager::RunClientServer (comm::CMPIManager::GetCommWorld ());
+      CMPIManager::DispatchClient(true, comm_client, comm_client_server,  comm_server);
+      CMPIManager::RunServer("Nemo", comm_client_server, comm_server);
+      //CXIOSManager::RunClientServer (comm::CMPIManager::GetCommWorld ());
       CXIOSManager::Finalize ();
    }

XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.cpp

@@ -88 +88 @@
       }
 
+      bool CMPIManager::DispatchClient(bool      is_server,
+                                       MPIComm & comm_client,
+                                       MPIComm & comm_client_server,
+                                       MPIComm & comm_server,
+                                       MPIComm   comm_parent)
+      {
+         int value = (is_server) ? 1 : 2;
+         StdSize nbClient = 0, nbServer = 0, nbClientByServer = 0;
+         std::vector<int> info, rank_client, rank_server;
+         CMPIManager::AllGather(value, info, comm_parent);
+
+         for (StdSize s = 0;  s < info.size(); s++)
+         {
+            if (info[s] == 1) rank_server.push_back(s);
+            else rank_client.push_back(s);
+         }
+         nbClient = rank_client.size();
+         nbServer = rank_server.size();
+         
+
+         comm_client = CMPIManager::CreateComm(CMPIManager::CreateSubGroup(
+                       CMPIManager::GetGroupWorld(), rank_client), comm_parent);
+
+         if (nbServer != 0)
+         {
+            StdSize currentServer = 0;
+            nbClientByServer = nbClient/nbServer;
+            comm_server = CMPIManager::CreateComm(CMPIManager::CreateSubGroup(
+                          CMPIManager::GetGroupWorld(), rank_server), comm_parent);
+
+            //std::cout << nbClient << "," << nbServer  << "," << nbClientByServer << std::endl;
+
+            for (StdSize mm = 0; mm < nbClient; mm += nbClientByServer)
+            {
+               std::vector<int> group_rank;
+               group_rank.push_back(rank_server[currentServer++]);
+               for (StdSize nn = 0; nn < nbClientByServer; nn++)
+                  group_rank.push_back(rank_client[nn+mm]);
+               MPIComm comm_client_server_ = CMPIManager::CreateComm(CMPIManager::CreateSubGroup(
+                                             CMPIManager::GetGroupWorld(), group_rank), comm_parent);
+
+               if (std::find(group_rank.begin(), group_rank.end(), CMPIManager::GetCommRank()) != group_rank.end())
+               {
+                  comm_client_server = comm_client_server_;
+               }
+               
+               group_rank.clear();
+            }
+            return (true);
+         }
+         else
+         {
+            comm_server = comm_client;
+            return (false);
+         }
+      }
+
       //---------------------------------------------------------------
 
@@ -211 +268 @@
       }
 
+      void CMPIManager::AllGather(int indata, std::vector<int> & outdata, MPIComm comm)
+      {
+         std::vector<int> data; data.push_back(indata);
+         CMPIManager::AllGather(data, outdata, comm);
+      }
+
+      void  CMPIManager::AllGather(std::vector<int> & indata,
+                                   std::vector<int> & outdata, MPIComm comm)
+      {
+         int error = 0;
+         int sendcount = indata.size(), recvcount = indata.size() * CMPIManager::GetCommSize(comm);
+         outdata.resize(recvcount);
+         mpi_allgather(&(indata[0]), &sendcount, &(outdata[0]), &sendcount, &comm, &error);
+         if (error != mpi_success)
+            ERROR("CMPIManager::AllGather (indata, outdata, comm)", << " MPI Error !");
+      }
+
       //--------------------------------------------------------------
 

XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.hpp

@@ -40 +40 @@
             static void Barrier(MPIComm comm = CMPIManager::GetCommWorld());
 
+            static bool DispatchClient(bool      is_server,
+                                       MPIComm & comm_client,
+                                       MPIComm & comm_client_server,
+                                       MPIComm & comm_server,
+                                       MPIComm   comm_parent = CMPIManager::GetCommWorld());
+
             /// Groupes ///
             static MPIGroup GetGroupWorld(void);
@@ -53 +59 @@
             static void Wait (MPIRequest & request);
             static bool Test (MPIRequest & request);
+
+            static void AllGather(int indata, std::vector<int> & outdata,
+                                  MPIComm comm = CMPIManager::GetCommWorld());
+
+            static void AllGather(std::vector<int> & indata,
+                                  std::vector<int> & outdata,
+                                  MPIComm comm = CMPIManager::GetCommWorld());
 
             static bool HasReceivedData(MPIComm comm, int src_rank);

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.cpp

@@ -49 +49 @@
             {
                CheckError(nc_create_par
-                  (filename.c_str(), NC_NETCDF4|NC_MPIPOSIX, *comm, MPI_INFO_NULL, &this->ncidp));
+                  (filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp));
             }
             else CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp));

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp

@@ -12 +12 @@
 #define MPI_INCLUDED
 #include <netcdf.h>
+extern "C" {
+#include <netcdf_par.h>
+}
+
 
 #ifndef UNLIMITED_DIM

XMLIO_V2/dev/dev_rv/src4/xmlio/fortran/idomain.f90

@@ -44 +44 @@
       INTEGER                        , OPTIONAL, INTENT(IN) :: jend_
       INTEGER                        , OPTIONAL, INTENT(IN) :: nj_
-      LOGICAL                        , dimension(*), OPTIONAL, INTENT(IN) :: mask_(:,:)
+      LOGICAL          , dimension(*), OPTIONAL, INTENT(IN) :: mask_(:,:)
       INTEGER                        , OPTIONAL, INTENT(IN) :: data_dim_
       INTEGER                        , OPTIONAL, INTENT(IN) :: data_ni_
@@ -93 +93 @@
       INTEGER                          , OPTIONAL, INTENT(IN) :: nj_
       LOGICAL          , dimension(*)  , OPTIONAL, INTENT(IN) :: mask_(:,:)
-      LOGICAL(kind = 1), dimension(:,:), ALLOCATABLE          :: mask__
+      LOGICAL(kind = 1), dimension(:,:), ALLOCATABLE          :: mask__! (size(mask_,1),size(mask,2))
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_dim_
       INTEGER                          , OPTIONAL, INTENT(IN) :: data_ni_