-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
/*
* BatchManager_Slurm.cxx :
}
// Method to submit a job to the batch manager
- const JobId BatchManager_Slurm::submitJob(const Job & job)
+ const JobId BatchManager_Slurm::runJob(const Job & job)
{
Parametre params = job.getParametre();
const string workDir = params[WORKDIR];
- // export input files on cluster
- exportInputFiles(job);
-
// build command file to submit the job and copy it on the server
string cmdFile = buildCommandFile(job);
ofstream tempOutputFile;
string tmpFileName = Utils::createAndOpenTemporaryFile("slurm-script", tempOutputFile);
- tempOutputFile << "#!/bin/sh -f" << endl;
+ tempOutputFile << "#!/bin/bash -l" << endl;
tempOutputFile << "#SBATCH --output=" << workDir << "/logs/output.log." << rootNameToExecute << endl;
tempOutputFile << "#SBATCH --error=" << workDir << "/logs/error.log." << rootNameToExecute << 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;
+ 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(NBNODE) != params.end())
+ tempOutputFile << "#SBATCH --nodes=" << params[NBNODE] << endl;
if (params.find(EXTRAPARAMS) != params.end())
tempOutputFile << params[EXTRAPARAMS] << endl;