change organization

src/run-submit-pol-job.py → src/run-policy/run-submit-pol-job.py

@@ -133,8 +133,7 @@ def main():
         cmd = f'{cmd} --with-dirs'
     
     print(f"Command: {cmd}")
-    proc = subprocess.run(cmd,shell=True)
-    proc.communicate()
+    subprocess.run(cmd,shell=True)
     exit()
 
 if __name__ == '__main__':

src/submit-pol-job → src/run-policy/submit-pol-job

@@ -12,7 +12,8 @@ mem_per_cpu="8G"
 time="24:00:00"
 partition="amd-hdr100,medium"
 outdir="/data/rc/gpfs-policy/data"
-policy="./policy/list-path-external"
+policy="./policy-def/list-path-external"
+policy_dirplus="./policy-def/list-path-dirplus"
 outfile=""
 
 ############################################################
@@ -80,15 +81,15 @@ eval set -- ${args}
 while :
 do
   case $1 in
-    -h | --help)        help                                ;;
-    -o | --outdir)      outdir=$2                           ; shift 2 ;;
-    -f | --outfile)     outfile=$2                          ; shift 2 ;;
-    --with-dirs)        policy="./policy/list-path-dirplus" ; shift 1 ;;
-    -N | --nodes)       nodes=$2                            ; shift 2 ;;
-    -c | --cores)      cores=$2                           ; shift 2 ;;
-    -p | --partition)   partition=$2                        ; shift 2 ;;
-    -t | --time)        time=$2                             ; shift 2 ;;
-    -m | --mem-per-cpu) mem_per_cpu=$2                      ; shift 2 ;;
+    -h | --help)        help                       ;;
+    -o | --outdir)      outdir=$2                  ; shift 2 ;;
+    -f | --outfile)     outfile=$2                 ; shift 2 ;;
+    --with-dirs)        policy="${policy_dirplus}" ; shift 1 ;;
+    -N | --nodes)       nodes=$2                   ; shift 2 ;;
+    -c | --cores)       cores=$2                   ; shift 2 ;;
+    -p | --partition)   partition=$2               ; shift 2 ;;
+    -t | --time)        time=$2                    ; shift 2 ;;
+    -m | --mem-per-cpu) mem_per_cpu=$2             ; shift 2 ;;
     --) shift; break ;;
     *) >&2 echo Unsupported option: $1
        usage ;;
@@ -107,6 +108,8 @@ if [[ -z "$device" ]]; then
     usage
 fi
 
+slurm_out="out/pol-%A-$(basename ${policy})-$(basename ${device}).out"
+
 DIR=$outdir POLICYFILE=$policy FILESYSTEM=${device} OUTFILE=${outfile} && \
 DIR=$DIR POLICYFILE=$POLICYFILE FILESYSTEM=${FILESYSTEM} OUTFILE=${OUTFILE} \
 sbatch \
@@ -115,4 +118,5 @@ sbatch \
    -t $time \
    --mem-per-cpu=$mem_per_cpu \
    -p $partition \
+   -o ${slurm_out} \
    ./run-mmpol.sh