diff --git a/UD_any/launchBatches.py b/UD_any/launchBatches.py index 0e3977c9a1a542a7ed251fbc0abfb3dca197fee5..599e20f1cb07e9382164b45039ff27b8f4b47ee0 100755 --- a/UD_any/launchBatches.py +++ b/UD_any/launchBatches.py @@ -24,7 +24,7 @@ def launchTrain(device, mode, expName, arguments, launcher, nbHours, seed) : elif launcher == "oar" : launchTrainOar(device, mode, expName, arguments, nbHours, seed) elif launcher == "slurm" : - launchTrainSlurm(mode, expName, arguments, nbHours, seed) + launchTrainSlurm(device, mode, expName, arguments, nbHours, seed) else : printUsageAndExit() ############################################################################### @@ -62,7 +62,7 @@ def launchTrainOar(device, mode, expName, arguments, nbHours, seed) : ############################################################################### ############################################################################### -def launchTrainSlurm(mode, expName, arguments, nbHours, seed) : +def launchTrainSlurm(device, mode, expName, arguments, nbHours, seed) : filename = "train.{}.slurm".format(expName) sFile = open(filename, "w") @@ -99,16 +99,15 @@ module load python/3.7.5 #SBATCH --open-mode=append #SBATCH --ntasks=1 #SBATCH --cpus-per-task=1 -#SBATCH --gres=gpu #SBATCH --hint=nomultithread -#SBATCH --partition=gpu -#SBATCH --exclude=sensei1,lifnode1 +#SBATCH --partition={} +#SBATCH --exclude=sensei1,lifnode1,asfalda1 #SBATCH --time={}:00:00 module purge ./train.sh {} bin/{} {} --silent --seed {} -""".format(expName, expName, expName, nbHours, mode, expName, arguments, seed), file=sFile) +""".format(expName, expName, expName, "cpu" if device == "cpu" else "gpu\n#SBATCH --gres=gpu", nbHours, mode, expName, arguments, seed), file=sFile) sFile.close() else : print("ERROR : Unknown hostname \'%s\'"%hostname) @@ -193,15 +192,15 @@ module load python/3.7.5 #SBATCH --open-mode=append #SBATCH --ntasks=1 #SBATCH --cpus-per-task=1 -#SBATCH --gres=gpu #SBATCH --hint=nomultithread -#SBATCH --partition=gpu +#SBATCH --partition={} +#SBATCH --exclude=sensei1,lifnode1,asfalda1 #SBATCH --time={}:00:00 module purge ./evaluate.sh {} bin/{} --silent -""".format(expName, expName, expName, nbHours, mode, expName), file=sFile) +""".format(expName, expName, expName, "cpu" if device == "cpu" else "gpu\n#SBATCH --gres=gpu", nbHours, mode, expName), file=sFile) sFile.close() else : print("ERROR : Unknown hostname \'%s\'"%hostname)