From c1f695c37d4ad89d578ae0ecaabb072035b13c8b Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Fri, 22 May 2020 18:42:51 +0000
Subject: [PATCH] Modify script to run nsys when enabled
---
.gitlab-ci.yml | 2 +-
basice2e/run.sh | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2047f2e..7bf1a15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,7 @@ basice2e:
- cp ../bin/libpowmosm75.so /opt/elixxir/lib/
- sed -i 's/bin\/server/bin\/server-cuda/g' run.sh
- sed -i 's/useGpu\:\ false/useGpu\:\ true/g' server-[12345].yaml
- - ./run.sh
+ - NSYSENABLED=TRUE ./run.sh
- mv results results-gpu
- cd ..
artifacts:
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 0557173..8c1a305 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -46,11 +46,10 @@ echo "$PERMCMD -- $PIDVAL"
for SERVERID in $(seq 5 -1 1)
do
IDX=$(($SERVERID - 1))
- if [ $SERVERID -eq 5 ]
+ SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
+ if [[ $SERVERID -eq 5 && -z "$NSYSENABLED" ]]
then
- SERVERCMD="nsys profile --trace=cuda -o server-$SERVERID ../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
- else
- SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
+ SERVERCMD="nsys profile --trace=cuda -o server-$SERVERID $SERVERCMD"
fi
$SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 &
PIDVAL=$!
@@ -72,8 +71,9 @@ jobs -p > results/serverpids
finish() {
echo "STOPPING SERVERS AND GATEWAYS..."
- killall -9 server
- sleep 5
+ if [ -z "NSYSENABLED" ]; then
+ nsys shutdown --kill=sigterm
+ fi
# NOTE: jobs -p doesn't work in a signal handler
for job in $(cat results/serverpids)
do
--
GitLab