Skip to content

Commit 314525c

Browse files
committed
Fixed test run scripts not including module name when launching the provdb and pserver
1 parent a0bc1ff commit 314525c

6 files changed

Lines changed: 12 additions & 10 deletions

File tree

src/modules/performance_analysis/pserver/GlobalAnomalyMetrics.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ void GlobalAnomalyMetrics::get_profile_data(FunctionProfile &into) const{
112112

113113
for(auto const &pelem : m_anomaly_metrics_full){
114114
int pid = pelem.first;
115+
116+
//Combine anomaly statistics over all ranks
115117
std::map<int, AggregateFuncAnomalyMetricsAllRanks> func_metrics_all_ranks; //fid -> global metrics
116118
for(auto const &relem : pelem.second){
117119
for(auto const &felem : relem.second){

test/run_ad.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mkdir -p temp perf
2121

2222
export CHIMBUKO_DISABLE_CUDA_JIT_WORKAROUND=1
2323

24-
mpirun --allow-run-as-root --oversubscribe -n 1 ${appdir}/pserver -logdir "./perf/" -ad "sstd" -model_force_update 1 &
24+
mpirun --allow-run-as-root --oversubscribe -n 1 ${appdir}/pserver performance_analysis -logdir "./perf/" -ad "sstd" -model_force_update 1 &
2525
ps_wid=$!
2626

2727
sleep 5

test/run_ad_with_provdb.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -f "../bin/provdb_admin" ]; then
2020
ip=$(hostname -i)
2121
port=1234
2222

23-
../bin/provdb_admin ${ip}:${port} -engine "$protocol" &
23+
../bin/provdb_admin performance_analysis ${ip}:${port} -engine "$protocol" &
2424
while [ ! -f provider.address.0 ]; do
2525
echo "Waiting for provider address"
2626
sleep 1;
@@ -33,7 +33,7 @@ if [ -f "../bin/provdb_admin" ]; then
3333
#Do a run with 2 shards and 1 server instance
3434
rm -f provdb.*.unqlite* provider.address*
3535

36-
../bin/provdb_admin ${ip}:${port} -engine "$protocol" -nshards 2 &
36+
../bin/provdb_admin performance_analysis ${ip}:${port} -engine "$protocol" -nshards 2 &
3737
while [ ! -f provider.address.0 ]; do
3838
echo "Waiting for provider address"
3939
sleep 1;
@@ -48,8 +48,8 @@ if [ -f "../bin/provdb_admin" ]; then
4848

4949
port2=1235
5050

51-
../bin/provdb_admin ${ip}:${port} -engine "$protocol" -nshards 2 -server_instance 0 2 &
52-
../bin/provdb_admin ${ip}:${port2} -engine "$protocol" -nshards 2 -server_instance 1 2 &
51+
../bin/provdb_admin performance_analysis ${ip}:${port} -engine "$protocol" -nshards 2 -server_instance 0 2 &
52+
../bin/provdb_admin performance_analysis ${ip}:${port2} -engine "$protocol" -nshards 2 -server_instance 1 2 &
5353

5454
while [ ! -f provider.address.0 ]; do
5555
echo "Waiting for provider address 0"

test/run_provdb_autoshutdown_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [ -f "../bin/provdb_admin" ]; then
2121
port=1234
2222
shards=2
2323

24-
../bin/provdb_admin ${ip}:${port} -autoshutdown true -nshards ${shards} -engine "${protocol}" &
24+
../bin/provdb_admin performance_analysis ${ip}:${port} -autoshutdown true -nshards ${shards} -engine "${protocol}" &
2525
admin=$!
2626
while [ ! -f provider.address.0 ]; do
2727
echo "Waiting for provider address"

test/run_provdb_client_test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ -f "../bin/provdb_admin" ]; then
2323
port=1234
2424
shards=1
2525

26-
../bin/provdb_admin ${ip}:${port} -engine "${protocol}" -autoshutdown false -nshards ${shards} &
26+
../bin/provdb_admin performance_analysis ${ip}:${port} -engine "${protocol}" -autoshutdown false -nshards ${shards} &
2727
admin=$!
2828
while [ ! -f provider.address.0 ]; do
2929
echo "Waiting for provider address"
@@ -44,7 +44,7 @@ if [ -f "../bin/provdb_admin" ]; then
4444
rm -f provdb.*.unqlite* provider.address* margo_dump*.state
4545
shards=2
4646

47-
../bin/provdb_admin ${ip}:${port} -engine "${protocol}" -autoshutdown false -nshards ${shards} &
47+
../bin/provdb_admin performance_analysis ${ip}:${port} -engine "${protocol}" -autoshutdown false -nshards ${shards} &
4848
admin=$!
4949
while [ ! -f provider.address.0 ]; do
5050
echo "Waiting for provider address"
@@ -64,7 +64,7 @@ if [ -f "../bin/provdb_admin" ]; then
6464
rm -f provdb.*.unqlite* provider.address* margo_dump*.state
6565
shards=1
6666

67-
../bin/provdb_admin "" -engine "na+sm" -autoshutdown false -nshards ${shards} &
67+
../bin/provdb_admin performance_analysis "" -engine "na+sm" -autoshutdown false -nshards ${shards} &
6868
admin=$!
6969
while [ ! -f provider.address.0 ]; do
7070
echo "Waiting for provider address"

test/run_provdb_pserver_client_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ -f "../bin/provdb_admin" ]; then
2424
port=1234
2525
shards=1
2626

27-
../bin/provdb_admin ${ip}:${port} -autoshutdown true -nshards 1 -engine "${protocol}" &
27+
../bin/provdb_admin performance_analysis ${ip}:${port} -autoshutdown true -nshards 1 -engine "${protocol}" &
2828
admin=$!
2929
while [ ! -f provider.address.0 ]; do
3030
echo "Waiting for provider address"

0 commit comments

Comments
 (0)