From 6bf7962e5c4d1272ccf596ed3ab98ca21b977aea Mon Sep 17 00:00:00 2001
From: Andy Stone <stonea@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:29:20 -0500
Subject: [PATCH] update stream plots

---
Signed-off-by: Andy Stone <stonea@users.noreply.github.com>
---
 .../examples/benchmarks/hpcc/stream.plot.drive.bash        | 7 +++++--
 .../examples/benchmarks/hpcc/stream.plot.gather.bash       | 7 ++++++-
 util/test/chplSetup/base.bash                              | 2 +-
 util/test/chplSetupEnv.bash                                | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/test/release/examples/benchmarks/hpcc/stream.plot.drive.bash b/test/release/examples/benchmarks/hpcc/stream.plot.drive.bash
index 4cc0be202ab4..24a561b9181a 100755
--- a/test/release/examples/benchmarks/hpcc/stream.plot.drive.bash
+++ b/test/release/examples/benchmarks/hpcc/stream.plot.drive.bash
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
+#--paint-with ./stream.plot.paint.py
+
 set -x -e
 "$CHPL_HOME/util/test/chplExperiment" \
-   --skip-if-config-error --paint-with ./stream.plot.paint.py \
+   --skip-if-config-error  \
    \
   `#name           features  options          command`                         \
   `#-------------------------------------------------------------------------` \
-   chpl            gasnet                    ./stream.plot.gather.bash
+   chpl            comm                      ./stream.plot.gather.bash         \
+   mpi             mpi       --no-build-chpl ./stream.plot.gather.mpi.bash
diff --git a/test/release/examples/benchmarks/hpcc/stream.plot.gather.bash b/test/release/examples/benchmarks/hpcc/stream.plot.gather.bash
index c94722bdce29..b992489c49ff 100755
--- a/test/release/examples/benchmarks/hpcc/stream.plot.gather.bash
+++ b/test/release/examples/benchmarks/hpcc/stream.plot.gather.bash
@@ -31,7 +31,12 @@ done
 # -----------------------------------------------------------------------------
 data=$(cat $runLog | sed -r -n 's/Performance \(GB\/s\) = //p')
 set +x
+
+# data is reported in GB/s convert to MB/s
+i=0; for x in ${data[@]}; do
+    scaled_data[i++]=$((x*1000))
+done
 echo -e "\t$experimentName" > $datFile
 paste \
   <(printf "%s\n" "${locales[@]}") \
-  <(printf "%s\n" "${data[@]}") >> "$datFile"
+  <(printf "%s\n" "${scaled_data[@]}") >> "$datFile"
diff --git a/util/test/chplSetup/base.bash b/util/test/chplSetup/base.bash
index 3703a19ed1a9..e2a7df29d241 100644
--- a/util/test/chplSetup/base.bash
+++ b/util/test/chplSetup/base.bash
@@ -5,4 +5,4 @@ for var in $chpl_vars; do
   unset "$var"
 done
 
-export CHPL_COMM=none  # use 'gasnet' feature if you wish to override this
+export CHPL_COMM=none  # use 'comm' feature if you wish to override this
diff --git a/util/test/chplSetupEnv.bash b/util/test/chplSetupEnv.bash
index 8d769ff8aba1..a41adbd3206a 100755
--- a/util/test/chplSetupEnv.bash
+++ b/util/test/chplSetupEnv.bash
@@ -26,7 +26,7 @@ if [[ "$_chplSetupEnv_sourced" == "0" ]]; then
 fi
 
 _chplSetupEnv_suffix="bash"
-_chplSetupEnv_pathsToRun=("$CHPL_HOME/util/test/chplSetup" "/data/cf/chapel/chplSetup/" "/chapel/data/chaptools/chplSetup" "/cray/css/users/chapelu/chplSetup" "$HOME/.chplSetup" "$(pwd)/chplSetup")
+_chplSetupEnv_pathsToRun=("$CHPL_HOME/util/test/chplSetup" "/hpcdc/project/chapel/chplSetup" "$HOME/.chplSetup" "$(pwd)/chplSetup")
 _chplSetupEnv_shortHost=$(hostname -s)
 _chplSetupEnv_featureSet=""
 _chplSetupEnv_dryRun=""