Number of procs per node is now a job parameter instead of a BatchManager attribute

diff --git a/src/CCC/Batch_FactBatchManager_eCCC.cxx b/src/CCC/Batch_FactBatchManager_eCCC.cxx
index 878d9803620aa665b2e04354936ce691c261573d..74a468975f49e18cd191f3482548b88d66a3aa62 100644 (file)
--- a/src/CCC/Batch_FactBatchManager_eCCC.cxx
+++ b/src/CCC/Batch_FactBatchManager_eCCC.cxx
@@ -50,8 +50,7 @@ namespace Batch {
   BatchManager * FactBatchManager_eCCC::operator() (const char * hostname,
                                                     const char * username,
                                                     CommunicationProtocolType protocolType,
-                                                    const char * mpiImpl,
-                                                    int nb_proc_per_node) const
+                                                    const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_CCC on host '" << hostname << "'");
     return new BatchManager_eCCC(this, hostname, username, protocolType, mpiImpl);

diff --git a/src/CCC/Batch_FactBatchManager_eCCC.hxx b/src/CCC/Batch_FactBatchManager_eCCC.hxx
index c558801db65f108e0ee9d10b3079882c579f6285..fe83053c81b642ce181666b8996002accc68ec43 100644 (file)
--- a/src/CCC/Batch_FactBatchManager_eCCC.hxx
+++ b/src/CCC/Batch_FactBatchManager_eCCC.hxx
@@ -47,8 +47,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
   };
 
 }

diff --git a/src/Core/Batch_Constants.cxx b/src/Core/Batch_Constants.cxx
index fc04add994e17a26652c60588b9b50eeb038a772..5a6dde1061ae779648e15747ed3dc15ea7b7952a 100644 (file)
--- a/src/Core/Batch_Constants.cxx
+++ b/src/Core/Batch_Constants.cxx
@@ -54,6 +54,7 @@ namespace Batch {
   def_Constant(MODIFICATIONTIME);
   def_Constant(NAME);
   def_Constant(NBPROC);
+  def_Constant(NBPROCPERNODE);
   def_Constant(OUTFILE);
   def_Constant(PID);
   def_Constant(QUEUE);

diff --git a/src/Core/Batch_Constants.hxx b/src/Core/Batch_Constants.hxx
index b8c1b969514267fbb7d7a0ecf78a89c493560888..1190e75e31202f56e760866a59d7868a55148c12 100644 (file)
--- a/src/Core/Batch_Constants.hxx
+++ b/src/Core/Batch_Constants.hxx
@@ -65,6 +65,7 @@ namespace Batch {
   decl_extern_Constant(MODIFICATIONTIME);
   decl_extern_Constant(NAME);
   decl_extern_Constant(NBPROC);
+  decl_extern_Constant(NBPROCPERNODE);
   decl_extern_Constant(OUTFILE);
   decl_extern_Constant(PID);
   decl_extern_Constant(QUEUE);

diff --git a/src/Core/Batch_FactBatchManager.hxx b/src/Core/Batch_FactBatchManager.hxx
index 01b9df47f87d98eaf5346ef1c0c8acd582e44f2b..84ad191388c304f0fb10b65d26472e46965122c2 100644 (file)
--- a/src/Core/Batch_FactBatchManager.hxx
+++ b/src/Core/Batch_FactBatchManager.hxx
@@ -50,8 +50,7 @@ namespace Batch {
     virtual Batch::BatchManager * operator() (const char * hostname,
                                               const char * username = "",
                                               CommunicationProtocolType protocolType = SSH,
-                                              const char * mpi = "nompi",
-                                              int nb_proc_per_node = 1) const = 0;
+                                              const char * mpi = "nompi") const = 0;
     std::string getType() const;
     std::string __repr__() const;
 

diff --git a/src/Core/Batch_ParameterTypeMap.cxx b/src/Core/Batch_ParameterTypeMap.cxx
index 7a1426173cbd12fce451f2fdd08ceb9c06994197..521e0bf5d4e12914c910371c8cb60b1fcf58767c 100644 (file)
--- a/src/Core/Batch_ParameterTypeMap.cxx
+++ b/src/Core/Batch_ParameterTypeMap.cxx
@@ -67,6 +67,7 @@ namespace Batch {
     addParameter("MODIFICATIONTIME", LONG, 1);
     addParameter("NAME", STRING, 1);
     addParameter("NBPROC", LONG, 1);
+    addParameter("NBPROCPERNODE", LONG, 1);
     addParameter("OUTFILE", COUPLE, 0);
     addParameter("PID", LONG, 1);
     addParameter("QUEUE", STRING, 1);

diff --git a/src/LSF/Batch_FactBatchManager_eLSF.cxx b/src/LSF/Batch_FactBatchManager_eLSF.cxx
index ee2585eeec31163e2cba41559d23f872c6101e26..d069be8309e30b795fbcd2b6874f737f4cf05cbc 100644 (file)
--- a/src/LSF/Batch_FactBatchManager_eLSF.cxx
+++ b/src/LSF/Batch_FactBatchManager_eLSF.cxx
@@ -50,8 +50,7 @@ namespace Batch {
   BatchManager * FactBatchManager_eLSF::operator() (const char * hostname,
                                                     const char * username,
                                                     CommunicationProtocolType protocolType,
-                                                    const char * mpiImpl,
-                                                    int nb_proc_per_node) const
+                                                    const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_LSF on host '" << hostname << "'");
     return new BatchManager_eLSF(this, hostname, username, protocolType, mpiImpl);

diff --git a/src/LSF/Batch_FactBatchManager_eLSF.hxx b/src/LSF/Batch_FactBatchManager_eLSF.hxx
index 9997521745f7b9b79574454af6677691812fd6aa..3068869bdc044970c162c66a1f16cc57de94ab87 100644 (file)
--- a/src/LSF/Batch_FactBatchManager_eLSF.hxx
+++ b/src/LSF/Batch_FactBatchManager_eLSF.hxx
@@ -47,8 +47,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
 
   };
 

diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.cxx b/src/LoadLeveler/Batch_BatchManager_eLL.cxx
index d377fabc3bfae4f74c1d97e385d9f0128bfd9da3..fc729bf3bb121ffd699bb0f60a4c32c40a86d9ff 100644 (file)
--- a/src/LoadLeveler/Batch_BatchManager_eLL.cxx
+++ b/src/LoadLeveler/Batch_BatchManager_eLL.cxx
@@ -45,10 +45,8 @@ namespace Batch {
 
   BatchManager_eLL::BatchManager_eLL(const FactBatchManager * parent, const char * host,
                                      const char * username,
-                                     CommunicationProtocolType protocolType, const char * mpiImpl,
-                                     int nb_proc_per_node)
-    : BatchManager(parent, host, username, protocolType, mpiImpl),
-      _nb_proc_per_node(nb_proc_per_node)
+                                     CommunicationProtocolType protocolType, const char * mpiImpl)
+    : BatchManager(parent, host, username, protocolType, mpiImpl)
   {
     // Nothing to do
   }
@@ -144,6 +142,9 @@ namespace Batch {
     int nbproc = 1;
     if (params.find(NBPROC) != params.end())
       nbproc = params[NBPROC];
+    int nbprocpernode = 1;
+    if (params.find(NBPROCPERNODE) != params.end())
+      nbprocpernode = params[NBPROCPERNODE];
 
     if (params.find(EXCLUSIVE) != params.end()) {
       if (params[EXCLUSIVE])
@@ -164,7 +165,7 @@ namespace Batch {
     tempOutputFile << "# @ job_type = " << job_type << endl;
 
     if (job_type == "mpich") {
-      int nodes_requested = (nbproc + _nb_proc_per_node -1) / _nb_proc_per_node;
+      int nodes_requested = (nbproc + nbprocpernode -1) / nbprocpernode;
       tempOutputFile << "# @ node = " << nodes_requested << endl;
       tempOutputFile << "# @ total_tasks = " << nbproc << endl;
     }

diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.hxx b/src/LoadLeveler/Batch_BatchManager_eLL.hxx
index 1b7ea39b4facb1dc4f984e60bbd68266df8a1eee..9b6ae95695e9e76afada34075899e8c0850edf17 100644 (file)
--- a/src/LoadLeveler/Batch_BatchManager_eLL.hxx
+++ b/src/LoadLeveler/Batch_BatchManager_eLL.hxx
@@ -44,8 +44,7 @@ namespace Batch {
   public:
     BatchManager_eLL(const FactBatchManager * parent, const char * host = "localhost",
                      const char * username = "",
-                     CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi",
-                     int nb_proc_per_node=1);
+                     CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi");
     virtual ~BatchManager_eLL();
 
     // Methods to control jobs
@@ -62,8 +61,6 @@ namespace Batch {
   protected:
     std::string buildCommandFile(const Job & job);
 
-    int _nb_proc_per_node;
-
   };
 
 }

diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx b/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
index 0fa4c7d69bc477bb9a88f974a06fd10e6f0b3384..7ca85321aa74045febe026b4c769e93e7e72f7da 100644 (file)
--- a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
+++ b/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
@@ -50,11 +50,10 @@ namespace Batch {
   BatchManager * FactBatchManager_eLL::operator() (const char * hostname,
                                                    const char * username,
                                                    CommunicationProtocolType protocolType,
-                                                   const char * mpiImpl,
-                                                   int nb_proc_per_node) const
+                                                   const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_eLL on host '" << hostname << "'");
-    return new BatchManager_eLL(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_eLL(this, hostname, username, protocolType, mpiImpl);
   }
 
 }

diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
index 4d6d591ec4dfbb24440d8fa61fc178c0fe916c46..c0448f75e7ffde7570d0d0dd978f8df0e07a94b5 100644 (file)
--- a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
+++ b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
@@ -51,8 +51,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
   };
 
 }

diff --git a/src/Local/Batch_BatchManager_Local.cxx b/src/Local/Batch_BatchManager_Local.cxx
index f09b2cdfe23e5e20b0490a43a0412a62c825b92d..8ca72e476f27e8b55aa889b72b55d1f244110deb 100644 (file)
--- a/src/Local/Batch_BatchManager_Local.cxx
+++ b/src/Local/Batch_BatchManager_Local.cxx
@@ -64,8 +64,7 @@ namespace Batch {
   // Constructeur
   BatchManager_Local::BatchManager_Local(const Batch::FactBatchManager * parent, const char * host,
                                          const char * username,
-                                         CommunicationProtocolType protocolType, const char * mpiImpl,
-                                         int nb_proc_per_node)
+                                         CommunicationProtocolType protocolType, const char * mpiImpl)
     : BatchManager(parent, host, username, protocolType, mpiImpl), _connect(0),
       _idCounter(0)
   {

diff --git a/src/Local/Batch_BatchManager_Local.hxx b/src/Local/Batch_BatchManager_Local.hxx
index ab7303808fa85c8cda5d62efec9ff14366e0b52b..2fbd22948f0cd7f87dca7aa52988fb71627b89eb 100644 (file)
--- a/src/Local/Batch_BatchManager_Local.hxx
+++ b/src/Local/Batch_BatchManager_Local.hxx
@@ -119,8 +119,7 @@ namespace Batch {
 
     BatchManager_Local(const Batch::FactBatchManager * parent, const char * host = "localhost",
                        const char * username = "",
-                       CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi",
-                       int nb_proc_per_node = 1);
+                       CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi");
     virtual ~BatchManager_Local();
 
     // Recupere le nom du serveur par defaut

diff --git a/src/Local/Batch_FactBatchManager_Local.cxx b/src/Local/Batch_FactBatchManager_Local.cxx
index 157a1b9b25acafd135bcd0dcb7777e391ac47439..3c89fb86f97735f4cecb60499f5bb28e11d8596a 100644 (file)
--- a/src/Local/Batch_FactBatchManager_Local.cxx
+++ b/src/Local/Batch_FactBatchManager_Local.cxx
@@ -53,11 +53,9 @@ namespace Batch {
   BatchManager * FactBatchManager_Local::operator() (const char * hostname,
                                                      const char * username,
                                                      CommunicationProtocolType protocolType,
-                                                     const char * mpi,
-                                                     int nb_proc_per_node) const
+                                                     const char * mpi) const
   {
-    return new BatchManager_Local(this, hostname, username,
-                                  protocolType, mpi, nb_proc_per_node);
+    return new BatchManager_Local(this, hostname, username, protocolType, mpi);
   }
 
 }

diff --git a/src/Local/Batch_FactBatchManager_Local.hxx b/src/Local/Batch_FactBatchManager_Local.hxx
index cdbdc9c0f58b8cccd8848b5d2e80e3ead82380ff..d1da8e639b958cb03c839a1e3e5322a04ba1511b 100644 (file)
--- a/src/Local/Batch_FactBatchManager_Local.hxx
+++ b/src/Local/Batch_FactBatchManager_Local.hxx
@@ -50,8 +50,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username = "",
                                        CommunicationProtocolType protocolType = SSH,
-                                       const char * mpi = "nompi",
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpi = "nompi") const;
 
   };
 

diff --git a/src/PBS/Batch_BatchManager_ePBS.cxx b/src/PBS/Batch_BatchManager_ePBS.cxx
index ee8c6245d2c087e448b529acbbbfc088a254cb37..1d3e063a987570b7822a163f903e5b6c007e1dbd 100644 (file)
--- a/src/PBS/Batch_BatchManager_ePBS.cxx
+++ b/src/PBS/Batch_BatchManager_ePBS.cxx
@@ -46,10 +46,8 @@ namespace Batch {
 
   BatchManager_ePBS::BatchManager_ePBS(const FactBatchManager * parent, const char * host,
                                        const char * username,
-                                       CommunicationProtocolType protocolType, const char * mpiImpl, 
-                                       int nb_proc_per_node)
-    : BatchManager(parent, host, username, protocolType, mpiImpl),
-      _nb_proc_per_node(nb_proc_per_node)
+                                       CommunicationProtocolType protocolType, const char * mpiImpl)
+    : BatchManager(parent, host, username, protocolType, mpiImpl)
   {
     // Nothing to do
   }
@@ -180,31 +178,32 @@ namespace Batch {
     Parametre params = job.getParametre();
     Environnement env = job.getEnvironnement();
 
-    // Job Parameters
-    string workDir       = "";
-    string fileToExecute = "";
-    int nbproc          = 0;
-    int edt             = 0;
-    int mem              = 0;
-    string queue         = "";
-
     // Mandatory parameters
+    string workDir;
     if (params.find(WORKDIR) != params.end()) 
       workDir = params[WORKDIR].str();
     else 
       throw RunTimeException("params[WORKDIR] is not defined ! Please defined it, cannot submit this job");
+    string fileToExecute;
     if (params.find(EXECUTABLE) != params.end()) 
       fileToExecute = params[EXECUTABLE].str();
     else 
       throw RunTimeException("params[EXECUTABLE] is not defined ! Please defined it, cannot submit this job");
 
     // Optional parameters
-    if (params.find(NBPROC) != params.end()) 
+    int nbproc = 1;
+    if (params.find(NBPROC) != params.end())
       nbproc = params[NBPROC];
+    int nbprocpernode = 1;
+    if (params.find(NBPROCPERNODE) != params.end())
+      nbprocpernode = params[NBPROCPERNODE];
+    int edt = 0;
     if (params.find(MAXWALLTIME) != params.end()) 
       edt = params[MAXWALLTIME];
+    int mem = 0;
     if (params.find(MAXRAMSIZE) != params.end()) 
       mem = params[MAXRAMSIZE];
+    string queue = "";
     if (params.find(QUEUE) != params.end()) 
       queue = params[QUEUE].str();
 
@@ -224,8 +223,8 @@ namespace Batch {
 
     if (nbproc > 0)
     {
-      int nb_full_nodes = nbproc / _nb_proc_per_node;
-      int nb_proc_on_last_node = nbproc % _nb_proc_per_node;
+      int nb_full_nodes = nbproc / nbprocpernode;
+      int nb_proc_on_last_node = nbproc % nbprocpernode;
 
       // In exclusive mode, we reserve all procs on the nodes
       if (params.find(EXCLUSIVE) != params.end() && params[EXCLUSIVE] && nb_proc_on_last_node > 0) {
@@ -237,7 +236,7 @@ namespace Batch {
 
       // Full nodes
       if (nb_full_nodes > 0) {
-        tempOutputFile << nb_full_nodes << ":ppn=" << _nb_proc_per_node;
+        tempOutputFile << nb_full_nodes << ":ppn=" << nbprocpernode;
         if (nb_proc_on_last_node > 0) {
           tempOutputFile << "+";
         }
@@ -269,7 +268,7 @@ namespace Batch {
       tempOutputFile << endl;
     }
 
-    // Abstraction of PBS_NODEFILE - TODO
+    // Define NODEFILE
     tempOutputFile << "export LIBBATCH_NODEFILE=$PBS_NODEFILE" << endl;
 
     // Launch the executable

diff --git a/src/PBS/Batch_BatchManager_ePBS.hxx b/src/PBS/Batch_BatchManager_ePBS.hxx
index 325f4ba17d98aefca762cedbba0354a8425c33e7..aba5df0cb5fbcab69b41ba9c108eb9a2edbe2fb0 100644 (file)
--- a/src/PBS/Batch_BatchManager_ePBS.hxx
+++ b/src/PBS/Batch_BatchManager_ePBS.hxx
@@ -46,8 +46,7 @@ namespace Batch {
     // Constructeur et destructeur
     BatchManager_ePBS(const FactBatchManager * parent, const char * host="localhost",
                       const char * username="",
-                      CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi",
-                     int nb_proc_per_node=1); // connexion a la machine host
+                      CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi");
     virtual ~BatchManager_ePBS();
 
     // Recupere le nom du serveur par defaut
@@ -72,9 +71,6 @@ namespace Batch {
   protected:
     std::string buildSubmissionScript(const Job & job);
 
-  private:
-    int _nb_proc_per_node;
-
 #ifdef SWIG
   public:
     // Recupere le l'identifiant d'un job deja soumis au BatchManager

diff --git a/src/PBS/Batch_FactBatchManager_ePBS.cxx b/src/PBS/Batch_FactBatchManager_ePBS.cxx
index 32f711a56cc80c873d57cb6886a8bd251d39362a..df41a541ff0509befabd8d60d9243899556a7cb5 100644 (file)
--- a/src/PBS/Batch_FactBatchManager_ePBS.cxx
+++ b/src/PBS/Batch_FactBatchManager_ePBS.cxx
@@ -50,10 +50,9 @@ namespace Batch {
   BatchManager * FactBatchManager_ePBS::operator() (const char * hostname,
                                                     const char * username,
                                                     CommunicationProtocolType protocolType,
-                                                    const char * mpiImpl,
-                                                    int nb_proc_per_node) const
+                                                    const char * mpiImpl) const
   {
-    return new BatchManager_ePBS(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_ePBS(this, hostname, username, protocolType, mpiImpl);
   }
 
 }

diff --git a/src/PBS/Batch_FactBatchManager_ePBS.hxx b/src/PBS/Batch_FactBatchManager_ePBS.hxx
index 2e0f49e062f4f56c4ac0c9a6e86d2468d058337e..410f0d9850ce7e0fef993b06345bbefb7849b6ce 100644 (file)
--- a/src/PBS/Batch_FactBatchManager_ePBS.hxx
+++ b/src/PBS/Batch_FactBatchManager_ePBS.hxx
@@ -50,8 +50,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
 
   };
 

diff --git a/src/PBS/Test/Test_ePBS.cxx b/src/PBS/Test/Test_ePBS.cxx
index 424beae3cae492159139665711ea32b1ca162605..f707c8acf696a99a0ee44c0bfae532d85047ec3f 100644 (file)
--- a/src/PBS/Test/Test_ePBS.cxx
+++ b/src/PBS/Test/Test_ePBS.cxx
@@ -95,6 +95,7 @@ int main(int argc, char** argv)
     p[INFILE]       += Couple("setb.sh", "tmp/Batch/setb.sh");
     p[OUTFILE]       = Couple("result.txt", "tmp/Batch/result.txt");
     p[NBPROC]        = 1;
+    p[NBPROCPERNODE] = 8;
     p[MAXWALLTIME]   = 1;
     p[MAXRAMSIZE]    = 128;
     p[HOMEDIR]       = homedir;
@@ -111,7 +112,7 @@ int main(int argc, char** argv)
 
     // Create a BatchManager of type ePBS on localhost
     FactBatchManager * fbm = c("PBS");
-    BatchManager * bm = (*fbm)(host.c_str(), user.c_str(), protocol, "nompi", 8);
+    BatchManager * bm = (*fbm)(host.c_str(), user.c_str(), protocol, "nompi");
 
     // Submit the job to the BatchManager
     JobId jobid = bm->submitJob(job);

diff --git a/src/SGE/Batch_FactBatchManager_eSGE.cxx b/src/SGE/Batch_FactBatchManager_eSGE.cxx
index 4dc70205e73065cb2d32df7f6fd8c87cf86ffb9c..79cfc9db434b13503790b6ab2ed16bfc2d89bcfb 100644 (file)
--- a/src/SGE/Batch_FactBatchManager_eSGE.cxx
+++ b/src/SGE/Batch_FactBatchManager_eSGE.cxx
@@ -50,8 +50,7 @@ namespace Batch {
   BatchManager * FactBatchManager_eSGE::operator() (const char * hostname,
                                                     const char * username,
                                                     CommunicationProtocolType protocolType,
-                                                    const char * mpiImpl,
-                                                    int nb_proc_per_node) const
+                                                    const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_SGE on host '" << hostname << "'");
     return new BatchManager_eSGE(this, hostname, username, protocolType, mpiImpl);

diff --git a/src/SGE/Batch_FactBatchManager_eSGE.hxx b/src/SGE/Batch_FactBatchManager_eSGE.hxx
index 4de6ac8ba9a491f651b973ae4df39e95de2555cf..6eda148b86750b7df846063129e1ed446d730277 100644 (file)
--- a/src/SGE/Batch_FactBatchManager_eSGE.hxx
+++ b/src/SGE/Batch_FactBatchManager_eSGE.hxx
@@ -48,8 +48,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
 
   };
 

diff --git a/src/Slurm/Batch_BatchManager_eSlurm.cxx b/src/Slurm/Batch_BatchManager_eSlurm.cxx
index d63f1856b6f54a70f5580eb441b31730a4de2653..f1e999e3679f711f490d672f4560ad9593f43a5f 100644 (file)
--- a/src/Slurm/Batch_BatchManager_eSlurm.cxx
+++ b/src/Slurm/Batch_BatchManager_eSlurm.cxx
@@ -44,8 +44,7 @@ namespace Batch {
                                            const char * host,
                                            const char * username,
                                            CommunicationProtocolType protocolType,
-                                           const char * mpiImpl,
-                                           int nb_proc_per_node)
+                                           const char * mpiImpl)
     : BatchManager(parent, host, username, protocolType, mpiImpl)
   {
   }

diff --git a/src/Slurm/Batch_BatchManager_eSlurm.hxx b/src/Slurm/Batch_BatchManager_eSlurm.hxx
index b0868634bef34f9eeda485da95523a9b64354676..83a624c768790d1f21ed87e4f01e80ff61fe52c1 100644 (file)
--- a/src/Slurm/Batch_BatchManager_eSlurm.hxx
+++ b/src/Slurm/Batch_BatchManager_eSlurm.hxx
@@ -47,8 +47,7 @@ namespace Batch {
                         const char * host = "localhost",
                         const char * username = "",
                         CommunicationProtocolType protocolType = SSH,
-                        const char * mpiImpl = "nompi",
-                        int nb_proc_per_node = 1);
+                        const char * mpiImpl = "nompi");
     virtual ~BatchManager_eSlurm();
 
     // Methods to control jobs

diff --git a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx b/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
index 9fd77abf488a63c0af22857dffc5d441e2279a0c..8f524f27dee9853013a1ad750e31a726f39ddac3 100644 (file)
--- a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
+++ b/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
@@ -46,10 +46,9 @@ namespace Batch {
   BatchManager * FactBatchManager_eSlurm::operator() (const char * hostname,
                                                       const char * username,
                                                       CommunicationProtocolType protocolType,
-                                                      const char * mpiImpl,
-                                                      int nb_proc_per_node) const
+                                                      const char * mpiImpl) const
   {
-    return new BatchManager_eSlurm(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_eSlurm(this, hostname, username, protocolType, mpiImpl);
   }
 
 }

diff --git a/src/Slurm/Batch_FactBatchManager_eSlurm.hxx b/src/Slurm/Batch_FactBatchManager_eSlurm.hxx
index 7eace420bf93a8735952500b0b24efedd6af57d1..bf7aaa2d7b71e91de2ba0bbedf76f1eb0438bdee 100644 (file)
--- a/src/Slurm/Batch_FactBatchManager_eSlurm.hxx
+++ b/src/Slurm/Batch_FactBatchManager_eSlurm.hxx
@@ -45,8 +45,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
 
   };
 

diff --git a/src/Vishnu/Batch_BatchManager_eVishnu.cxx b/src/Vishnu/Batch_BatchManager_eVishnu.cxx
index 61ec2fd1521994399aed774691601196cf7a9f8d..927f3cec315bfa2d589f4d44e32e95482ec666e2 100644 (file)
--- a/src/Vishnu/Batch_BatchManager_eVishnu.cxx
+++ b/src/Vishnu/Batch_BatchManager_eVishnu.cxx
@@ -50,11 +50,9 @@ namespace Batch {
                                              const char * host,
                                              const char * username,
                                              CommunicationProtocolType protocolType,
-                                             const char * mpiImpl,
-                                             int nb_proc_per_node)
+                                             const char * mpiImpl)
     : // Force SH protocol for Vishnu
-      BatchManager(parent, host, username, SH, mpiImpl),
-      _nb_proc_per_node(nb_proc_per_node)
+      BatchManager(parent, host, username, SH, mpiImpl)
   {
   }
 

diff --git a/src/Vishnu/Batch_BatchManager_eVishnu.hxx b/src/Vishnu/Batch_BatchManager_eVishnu.hxx
index 373a92e85209b6eb06a6cb86d16ec438b21432a6..5674e5bcbe2517c255095ab1de03cdeecf3a3ebc 100644 (file)
--- a/src/Vishnu/Batch_BatchManager_eVishnu.hxx
+++ b/src/Vishnu/Batch_BatchManager_eVishnu.hxx
@@ -47,8 +47,7 @@ namespace Batch {
                          const char * host = "localhost",
                          const char * username = "",
                          CommunicationProtocolType protocolType = SSH,
-                         const char * mpiImpl = "nompi",
-                         int nb_proc_per_node = 1);
+                         const char * mpiImpl = "nompi");
     virtual ~BatchManager_eVishnu();
 
     // Methods to control jobs
@@ -68,8 +67,6 @@ namespace Batch {
     std::string buildCommandFile(const Job & job);
     void exportInputFiles(const Job & job);
 
-    int _nb_proc_per_node;
-
   };
 
 }

diff --git a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx b/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
index 5b8652cd4ed0ec43bb74358d23bc34e6da26b9e0..932e383f7d5f6e46523fae12359ccc7084875d1a 100644 (file)
--- a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
+++ b/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
@@ -46,11 +46,10 @@ namespace Batch {
   BatchManager * FactBatchManager_eVishnu::operator() (const char * hostname,
                                                        const char * username,
                                                        CommunicationProtocolType protocolType,
-                                                       const char * mpiImpl,
-                                                       int nb_proc_per_node) const
+                                                       const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_eVishnu on host '" << hostname << "'");
-    return new BatchManager_eVishnu(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_eVishnu(this, hostname, username, protocolType, mpiImpl);
   }
 
 }

diff --git a/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx b/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx
index bee9b98f0f4747233d20fc941e16911270012006..20b9bfecb89b9678b0e3f738671864ed71b6da7a 100644 (file)
--- a/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx
+++ b/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx
@@ -46,8 +46,7 @@ namespace Batch {
     virtual BatchManager * operator() (const char * hostname,
                                        const char * username,
                                        CommunicationProtocolType protocolType,
-                                       const char * mpiImpl,
-                                       int nb_proc_per_node = 1) const;
+                                       const char * mpiImpl) const;
 
   };