Salome HOME
projects
/
tools
/
libbatch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c29c87d
)
Add parameters PARTITION and NBNODE for slurm.
omu/evol2.4
author
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Tue, 23 Jan 2018 14:01:08 +0000
(15:01 +0100)
committer
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Tue, 23 Jan 2018 14:01:08 +0000
(15:01 +0100)
src/Core/Constants.cxx
patch
|
blob
|
history
src/Core/Constants.hxx
patch
|
blob
|
history
src/Core/ParameterTypeMap.cxx
patch
|
blob
|
history
src/Slurm/BatchManager_Slurm.cxx
patch
|
blob
|
history
diff --git
a/src/Core/Constants.cxx
b/src/Core/Constants.cxx
index 480919facefceb083a8e19930ac3f162fd52efc4..124bbb7a5b9e0147eb8e7f539ddfb1890cac1653 100644
(file)
--- a/
src/Core/Constants.cxx
+++ b/
src/Core/Constants.cxx
@@
-53,6
+53,8
@@
namespace Batch {
def_Constant(WCKEY);
def_Constant(EXTRAPARAMS);
def_Constant(PREPROCESS);
def_Constant(WCKEY);
def_Constant(EXTRAPARAMS);
def_Constant(PREPROCESS);
+ def_Constant(PARTITION);
+ def_Constant(NBNODE);
// Parameters for COORM
def_Constant(LAUNCHER_FILE);
// Parameters for COORM
def_Constant(LAUNCHER_FILE);
diff --git
a/src/Core/Constants.hxx
b/src/Core/Constants.hxx
index ac07e1d468e2bfb5409840f1a3be7ab39c3aeb75..2e9f71b0f2b7f8202021ed8500cb11aee472c40d 100644
(file)
--- a/
src/Core/Constants.hxx
+++ b/
src/Core/Constants.hxx
@@
-64,6
+64,8
@@
namespace Batch {
decl_extern_Constant(WCKEY);
decl_extern_Constant(EXTRAPARAMS);
decl_extern_Constant(PREPROCESS);
decl_extern_Constant(WCKEY);
decl_extern_Constant(EXTRAPARAMS);
decl_extern_Constant(PREPROCESS);
+ decl_extern_Constant(PARTITION);
+ decl_extern_Constant(NBNODE);
// Parameters for COORM
decl_extern_Constant(LAUNCHER_FILE);
// Parameters for COORM
decl_extern_Constant(LAUNCHER_FILE);
diff --git
a/src/Core/ParameterTypeMap.cxx
b/src/Core/ParameterTypeMap.cxx
index 8b23095d13d721af15be614c7ee3d62953345404..426d8ef5933d17026397e9fd6b4ef7dfcc2867ea 100644
(file)
--- a/
src/Core/ParameterTypeMap.cxx
+++ b/
src/Core/ParameterTypeMap.cxx
@@
-66,6
+66,8
@@
namespace Batch {
addParameter("WCKEY", STRING, 1);
addParameter("EXTRAPARAMS", STRING, 1);
addParameter("PREPROCESS", STRING, 1);
addParameter("WCKEY", STRING, 1);
addParameter("EXTRAPARAMS", STRING, 1);
addParameter("PREPROCESS", STRING, 1);
+ addParameter("PARTITION", STRING, 1);
+ addParameter("NBNODE", LONG, 1);
// Parameters for COORM
addParameter("LAUNCHER_FILE", STRING, 1);
// Parameters for COORM
addParameter("LAUNCHER_FILE", STRING, 1);
diff --git
a/src/Slurm/BatchManager_Slurm.cxx
b/src/Slurm/BatchManager_Slurm.cxx
index 4bb013d36ca7ed5f0ad66b5ae27f7adbf62f23c7..25bbc34063d95d69ccb0c3b49e3cafc43016f724 100644
(file)
--- a/
src/Slurm/BatchManager_Slurm.cxx
+++ b/
src/Slurm/BatchManager_Slurm.cxx
@@
-149,8
+149,12
@@
namespace Batch {
tempOutputFile << "#SBATCH --mem-per-cpu=" << params[MEMPERCPU] << endl;
if (params.find(QUEUE) != params.end())
tempOutputFile << "#SBATCH --qos=" << params[QUEUE] << endl;
tempOutputFile << "#SBATCH --mem-per-cpu=" << params[MEMPERCPU] << endl;
if (params.find(QUEUE) != params.end())
tempOutputFile << "#SBATCH --qos=" << params[QUEUE] << endl;
+ if (params.find(PARTITION) != params.end())
+ tempOutputFile << "#SBATCH --partition=" << params[PARTITION] << endl;
if (params.find(WCKEY) != params.end())
tempOutputFile << "#SBATCH --wckey=" << params[WCKEY] << endl;
if (params.find(WCKEY) != params.end())
tempOutputFile << "#SBATCH --wckey=" << params[WCKEY] << endl;
+ if (params.find(NBNODE) != params.end())
+ tempOutputFile << "#SBATCH --nodes=" << params[NBNODE] << endl;
if (params.find(EXTRAPARAMS) != params.end())
tempOutputFile << params[EXTRAPARAMS] << endl;
if (params.find(EXTRAPARAMS) != params.end())
tempOutputFile << params[EXTRAPARAMS] << endl;