From 40e8a5eac49e91be407c36eef6fb326229945a22 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Thu, 25 May 2023 13:56:18 +0200
Subject: BFS: run timeout in --foreground mode to pass on SIGINT

---
 BFS/Makefile             | 6 +++---
 BFS/baselines/cpu/run.sh | 2 +-
 BFS/run.sh               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'BFS')

diff --git a/BFS/Makefile b/BFS/Makefile
index 7577724..2e1dcfe 100644
--- a/BFS/Makefile
+++ b/BFS/Makefile
@@ -22,14 +22,14 @@ all: bin/host_code bin/dpu_code
 bin:
 	${QUIET}mkdir -p bin
 
-bin/dpu_code: ${DPU_SOURCES} ${COMMON_INCLUDES}
+bin/dpu_code: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
 	${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
 
-bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES}
+bin/host_code: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
 	${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
 
 clean:
-	rm -rf bin
+	${QUIET}rm -rf bin
 
 test: all
 	bin/host_code
diff --git a/BFS/baselines/cpu/run.sh b/BFS/baselines/cpu/run.sh
index 8d51442..1fe82e9 100755
--- a/BFS/baselines/cpu/run.sh
+++ b/BFS/baselines/cpu/run.sh
@@ -11,6 +11,6 @@ echo "Revision $(git describe --always)"
 make
 for nr_threads in 1 2 4 6 8 12 16 20 24 32; do
 	for f in loc-gowalla_edges roadNet-CA; do
-		OMP_NUM_THREADS=${nr_threads} timeout -k 1m 30m ./bfs -f ../../data/${f}.txt || true
+		OMP_NUM_THREADS=${nr_threads} timeout --foreground -k 1m 30m ./bfs -f ../../data/${f}.txt || true
 	done
 done
diff --git a/BFS/run.sh b/BFS/run.sh
index 0ad5af2..8a6e09c 100755
--- a/BFS/run.sh
+++ b/BFS/run.sh
@@ -15,7 +15,7 @@ for nr_dpus in 1 2 4 8 16 32 64 128 256 512; do
 			echo
 			if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets}; then
 				for i in `seq 1 20`; do
-					bin/host_code -f data/${f}.txt || true
+					timeout --foreground -k 1m 30m bin/host_code -f data/${f}.txt || true
 				done
 			fi
 		done
-- 
cgit v1.2.3