displays progress and fixes index bug.

exanauts · Jun 5, 2021 · fbb4d7c · fbb4d7c
1 parent fad55a1
commit fbb4d7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/figure5.sh b/figure5.sh
@@ -26,6 +26,7 @@ VA=(1000 2000 5000 5000 50000)
 ITER=(6000 15000 35000 45000 30000)
 
 for i in ${!DATA[@]}; do
-	julia --project ./src/admm_standalone.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} true > output_gpu1_${DATA[$i]}.txt 2>&1
+    echo "Solving ${DATA[$i]} . . ."
+    julia --project ./src/admm_standalone.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} true > output_gpu1_${DATA[$i]}.txt 2>&1
 done
 
diff --git a/figure6.sh b/figure6.sh
@@ -28,8 +28,9 @@ ITER=(5648 13651 30927 41126 28358)
 NGPU=(2 3 4 5 6)
 
 for j in ${!NGPU[@]}; do
-	for i in ${!DATA[@]}; do
-		mpirun -np ${j} julia --project ./src/launch_mpi.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} true > output_gpu${j}_${DATA[$i]}.txt 2>&1
-        mv br_time_gpu.txt br_time_gpu${j}_${DATA[$i]}.txt
+    for i in ${!DATA[@]}; do
+        echo "Solving ${DATA[$i]} using ${NGPU[$j]} GPUs . . ."
+        mpirun -np ${NGPU[$j]} julia --project ./src/launch_mpi.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} true > output_gpu${NGPU[$j]}_${DATA[$i]}.txt 2>&1
+        mv br_time_gpu.txt br_time_gpu${NGPU[$j]}_${DATA[$i]}.txt
 	done
 done
diff --git a/figure8.sh b/figure8.sh
@@ -27,5 +27,6 @@ VA=(1000 2000 5000 5000 50000)
 ITER=(5718 13640 30932 41140 28358)
 
 for i in ${!DATA[@]}; do
-	mpirun -np 40 julia --project ./src/launch_mpi.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} false > output_cpu40_${DATA[$i]}.txt 2>&1
+    echo "Solving ${DATA[$i]} using 40 CPU cores . . ."
+    mpirun -np 40 julia --project ./src/launch_mpi.jl "./data/${DATA[$i]}" ${PQ[$i]} ${VA[$i]} ${ITER[$i]} false > output_cpu40_${DATA[$i]}.txt 2>&1
 done