Browse Source

Fix running the bandwidth benchmark on jolly

Samuel Thibault 4 years ago
parent
commit
db07549d9e
2 changed files with 16 additions and 6 deletions
  1. 2 0
      tests/Makefile.am
  2. 14 6
      tests/microbenchs/bandwidth_scheds.sh

+ 2 - 0
tests/Makefile.am

@@ -43,6 +43,7 @@ EXTRA_DIST =					\
 	microbenchs/parallel_independent_heterogeneous_tasks.sh	\
 	microbenchs/parallel_independent_homogeneous_tasks_data.sh	\
 	microbenchs/parallel_independent_homogeneous_tasks.sh	\
+	microbenchs/bandwidth_scheds.sh		\
 	energy/static.sh			\
 	energy/dynamic.sh			\
 	energy/perfs.gp				\
@@ -446,6 +447,7 @@ endif
 if !STARPU_USE_MPI_MASTER_SLAVE
 SHELL_TESTS += \
 	datawizard/locality.sh \
+	microbenchs/bandwidth_scheds.sh \
 	overlap/overlap.sh
 endif
 

+ 14 - 6
tests/microbenchs/bandwidth_scheds.sh

@@ -26,9 +26,19 @@ else
 	DEFAULT=eager
 fi
 
-cat > bandwidth.gp << EOF
-set term postscript eps enhanced color font ",18"
-set output "bandwidth.eps"
+if [ -n "$STARPU_BENCH_DIR" ]; then
+	cat > bandwidth.gp << EOF
+	set term png font ",16"
+	set output "bandwidth.png"
+EOF
+else
+	cat > bandwidth.gp << EOF
+	set term postscript eps enhanced color font ",18"
+	set output "bandwidth.eps"
+EOF
+fi
+
+cat >> bandwidth.gp << EOF
 set key outside
 set ylabel "GB/s"
 set xlabel "ncores"
@@ -51,8 +61,6 @@ done
 
 if gnuplot bandwidth.gp ; then
 	if [ -n "$STARPU_BENCH_DIR" ]; then
-		cp bandwidth.eps $STARPU_BENCH_DIR/
-	else
-		gv bandwidth.eps &
+		cp bandwidth.png $STARPU_BENCH_DIR/
 	fi
 fi