From 5afcdae9761dd4c3dcba2dfcc88c68cf9de09882 Mon Sep 17 00:00:00 2001 From: Hyacinthe Cartiaux Date: Thu, 24 Aug 2017 15:01:32 +0200 Subject: [PATCH] [bash] Slurm integration improved --- bash/bash_slurm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bash/bash_slurm b/bash/bash_slurm index f3c6422..7b6888a 100755 --- a/bash/bash_slurm +++ b/bash/bash_slurm @@ -3,8 +3,8 @@ __slurm_ps1_remaining_time(){ if [ -n "$SLURM_JOB_ID" ]; then DATE_NOW=$(date +%s) DATE_JOB_START=$(stat -c %Y "/sys/fs/cgroup/cpu/slurm/uid_${UID}/job_${SLURM_JOB_ID}") - DATE_TMP=$(sacct -j $SLURM_JOB_ID --format Timelimit | awk -F: '/:/ { print ($1 * 3600) + ($2 * 60) + $3 }') - ((DATE_TMP = (DATE_TMP - DATE_NOW + DATE_JOB_START) / 60)) + [[ -z "$TIME_LIMIT" ]] && TIME_LIMIT=$(scontrol show job $SLURM_JOB_ID | grep -Po 'TimeLimit=\K[^ ]*' | awk -F: '/:/ { print ($1 * 3600) + ($2 * 60) + $3 }') + ((DATE_TMP = (TIME_LIMIT - DATE_NOW + DATE_JOB_START) / 60)) echo -n "[SLURM$SLURM_JOB_ID->$DATE_TMP]" fi } @@ -12,6 +12,6 @@ __slurm_ps1_remaining_time(){ test -n "$SLURM_PTY_PORT" && ( echo "[SLURM] SLURM_JOB_ID=$SLURM_JOB_ID" echo "[SLURM] Your nodes are:" - srun bash -c 'echo " $(hostname)*$SLURM_CPUS_ON_NODE"' | sort + srun bash -c 'echo " $(hostname)*$SLURM_CPUS_ON_NODE"' | sort -u ) || true