Drobnosti

bashrc

@@ -12,7 +12,7 @@ workdir_mk()
 	workdir_set $workdir
 	mkdir $workdir/data
 	mkdir $workdir/sdp
-	mkdir $workdir/sdp/{max_coord,nonzero_coord,3d}
+	mkdir $workdir/sdp/{max_coord,nonzero_coord,3d,score_by_cut}
 	mkdir $workdir/outputs
 	echo ". bashrc && workdir_set $workdir"
 }

gen_main_test.sh

@@ -2,12 +2,15 @@
 
 for seed in $@
 do
-	for n in 10 20 50 100 200 400 800
+	for n in 10 20 50 100 200 400 566
+	do
+		echo ./wrap_run -s -e -o --sdp_sage_log_all algo/semidef_prog_sage.sage $n $seed 10 CVXOPT
+	done
+	for n in 10 20 50 100 200 400 566 800 1131 1600 2263 3200
 	do
 		echo ./wrap_run -s -e -o build/greedy $n $seed
 		echo ./wrap_run -s -e -o build/rg $n $seed
 		echo ./wrap_run -s -e -o build/rsg $n $seed
 		echo ./wrap_run -s -e -o build/semidef_prog $n $seed 10
-		echo ./wrap_run -s -e -o --sdp_sage_log_all algo/semidef_prog_sage.sage $n $seed 10 CVXOPT
 	done
 done

run.sh

+#!/bin/bash
+bash gen_main_test.sh $@ | shuf | systemd-run --send-sighup -Pd -E LOGFILE=$LOGFILE -E workdir=$workdir --user -p CPUAffinity=1 -p MemoryMax=16G -p MemoryHigh=16G sh

wrap_run

@@ -22,8 +22,8 @@ if "BPS_CORE" in os.environ and args.core is None:
 
 if args.hash_seed:
     # print(list(hashlib.sha256(i.encode("utf-8")).hexdigest().encode() for i in args.cmd))
-    h = hashlib.sha256(b"".join(hashlib.sha256(i.encode("utf-8")).hexdigest().encode() for i in args.cmd))
-    args.cmd[2] = str(int(h.hexdigest(), base=16)%100000)
+    h = hashlib.sha256(b"".join(hashlib.sha256(i.encode("utf-8")).hexdigest().encode() for i in args.cmd[0:2]+args.cmd[3:]))
+    args.cmd[2] = str(int(h.hexdigest(), base=16)%10000*100+int(args.cmd[2]))
     # print(h.hexdigest(), args.cmd[2])
 
 algo_args = args.cmd[3:]
@@ -73,6 +73,7 @@ if args.sdp_sage_log_all:
         p_env["BPS_LOG_MAX_COORD"] = workdir+"/sdp/max_coord/"+run_name
         p_env["BPS_LOG_NONZERO_COORD"] = workdir+"/sdp/nonzero_coord/"+run_name
         p_env["BPS_LOG_3D"] = workdir+"/sdp/3d/"+run_name
+        p_env["BPS_LOG_SCORE_BY_CUT"] = workdir+"/sdp/score_by_cut/"+run_name
 p = subprocess.run(cmd, stdout=subprocess.PIPE, env=p_env)
 
 if p.returncode or len(p.stdout.split(b"\n"))<3: