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:
f5d1d8c
)
Add parameter MEMPERCPU (EDF issue #2671)
author
barate
<barate>
Mon, 23 Sep 2013 13:27:42 +0000
(13:27 +0000)
committer
barate
<barate>
Mon, 23 Sep 2013 13:27:42 +0000
(13:27 +0000)
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 cc9136362c7b27b5886c99f7e4371922bfb5967c..d2d0e74d270eb3598478bfc4781c4faa485f60c4 100644
(file)
--- a/
src/Core/Constants.cxx
+++ b/
src/Core/Constants.cxx
@@
-49,6
+49,7
@@
namespace Batch {
def_Constant(STATE);
def_Constant(WORKDIR);
def_Constant(EXCLUSIVE);
def_Constant(STATE);
def_Constant(WORKDIR);
def_Constant(EXCLUSIVE);
+ def_Constant(MEMPERCPU);
// 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 a18b031e055899ca67ae26e9333d342332d86c89..8a080984f18fe3cfc809c5cd351db9cf17780a23 100644
(file)
--- a/
src/Core/Constants.hxx
+++ b/
src/Core/Constants.hxx
@@
-60,6
+60,7
@@
namespace Batch {
decl_extern_Constant(STATE);
decl_extern_Constant(WORKDIR);
decl_extern_Constant(EXCLUSIVE);
decl_extern_Constant(STATE);
decl_extern_Constant(WORKDIR);
decl_extern_Constant(EXCLUSIVE);
+ decl_extern_Constant(MEMPERCPU);
// 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 1375ada09f442bca6ca9c6e0d49c193b0ff24d6b..c20ad7177571e99537a623582e2986f5ad0a64a1 100644
(file)
--- a/
src/Core/ParameterTypeMap.cxx
+++ b/
src/Core/ParameterTypeMap.cxx
@@
-62,6
+62,7
@@
namespace Batch {
addParameter("STATE", STRING, 1);
addParameter("WORKDIR", STRING, 1);
addParameter("EXCLUSIVE", BOOL, 1);
addParameter("STATE", STRING, 1);
addParameter("WORKDIR", STRING, 1);
addParameter("EXCLUSIVE", BOOL, 1);
+ addParameter("MEMPERCPU", 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 d3d46aaf06456f9c92e0040b77ff056d253cc411..9d62defc038c2774872b6589f6ceec54569df347 100644
(file)
--- a/
src/Slurm/BatchManager_Slurm.cxx
+++ b/
src/Slurm/BatchManager_Slurm.cxx
@@
-148,6
+148,8
@@
namespace Batch {
tempOutputFile << "#SBATCH --time=" << params[MAXWALLTIME] << endl;
if (params.find(MAXRAMSIZE) != params.end())
tempOutputFile << "#SBATCH --mem=" << params[MAXRAMSIZE] << endl;
tempOutputFile << "#SBATCH --time=" << params[MAXWALLTIME] << endl;
if (params.find(MAXRAMSIZE) != params.end())
tempOutputFile << "#SBATCH --mem=" << params[MAXRAMSIZE] << endl;
+ else if (params.find(MEMPERCPU) != params.end())
+ tempOutputFile << "#SBATCH --mem-per-cpu=" << params[MEMPERCPU] << endl;
if (params.find(QUEUE) != params.end())
tempOutputFile << "#SBATCH --partition=" << params[QUEUE] << endl;
if (params.find(QUEUE) != params.end())
tempOutputFile << "#SBATCH --partition=" << params[QUEUE] << endl;