Generate MPI lam machine file for a lam machine or a cluster

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
index 6e5e63a0aa9b7019640b3b1400ab8635eb2f9cbf..b51969141f69294fcb89476a12ecefc0d7ecff07 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
@@ -229,6 +229,27 @@ SALOME_ResourcesCatalog_Handler::ProcessCluster(xmlNodePtr cluster_descr, Parser
     return false;
   }
 
+  if (xmlHasProp(cluster_descr, (const xmlChar*)test_mpi))
+  {
+    xmlChar* mpi = xmlGetProp(cluster_descr, (const xmlChar*)test_mpi);
+    std::string anMpi = (const char*)mpi;
+    xmlFree(mpi);
+    if (anMpi == "lam")
+      resource.mpi = lam;
+    else if (anMpi == "mpich1")
+      resource.mpi = mpich1;
+    else if (anMpi == "mpich2")
+      resource.mpi = mpich2;
+    else if (anMpi == "openmpi")
+      resource.mpi = openmpi;
+    else if  (anMpi == "slurm")
+      resource.mpi = slurm;
+    else if  (anMpi == "prun")
+      resource.mpi = prun;
+    else
+      resource.mpi = nompi;
+  }
+
   // Parsing des membres du cluster 
   xmlNodePtr aCurSubNode = cluster_descr->xmlChildrenNode;
   while(aCurSubNode != NULL)

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 3a1bb029427c9b952250c7e4181102da257456b5..e3fb14ffc397f39254fde6c13f8b3ef5b33f68aa 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -305,6 +305,52 @@ SALOME_ResourcesManager::getMachineFile(std::string hostname, CORBA::Long nb_pro
   else if (parallelLib == "Mpi")
   {
     MESSAGE("[getMachineFile] parallelLib is Mpi");
+
+    MapOfParserResourcesType resourcesList = _rm.GetList();
+    if (resourcesList.find(hostname) != resourcesList.end())
+    {
+      ParserResourcesType resource = resourcesList[hostname];
+      // Check if resource is cluster or not
+      if (resource.ClusterMembersList.empty())
+      {
+       //It is not a cluster so we create a cluster with one machine
+       ParserResourcesClusterMembersType fake_node;
+       fake_node.HostName = resource.HostName;
+       fake_node.Protocol = resource.Protocol;
+       fake_node.UserName = resource.UserName;
+       fake_node.AppliPath = resource.AppliPath;
+       fake_node.DataForSort = resource.DataForSort;
+
+       resource.ClusterMembersList.push_front(fake_node);
+      }
+
+      // Choose mpi implementation -> each MPI implementation has is own machinefile...
+      if (resource.mpi == lam)
+      {
+       // Creating machine file
+       machine_file_name = tmpnam(NULL);
+       std::ofstream machine_file(machine_file_name.c_str(), ios_base::out);
+
+       // We add all cluster machines to the file
+       std::list<ParserResourcesClusterMembersType>::iterator cluster_it = 
+         resource.ClusterMembersList.begin();
+       while (cluster_it != resource.ClusterMembersList.end())
+       {
+         unsigned int number_of_proc = (*cluster_it).DataForSort._nbOfNodes * 
+           (*cluster_it).DataForSort._nbOfProcPerNode;
+         machine_file << (*cluster_it).HostName << " cpu=" << number_of_proc << endl;
+         cluster_it++;
+       }
+      }
+      else if (resource.mpi == nompi)
+      {
+       INFOS("[getMachineFile] Error hostname MPI implementation was defined for " << hostname);
+      }
+      else
+       INFOS("[getMachineFile] Error hostname MPI implementation not currenly handled for " << hostname);
+    }
+    else
+      INFOS("[getMachineFile] Error hostname not found in resourcesList -> " << hostname);
   }
   else
     INFOS("[getMachineFile] Error parallelLib is not handled -> " << parallelLib);