.

--- Signed-off-by: Andy Stone <[email protected]>
chapel-lang · Aug 28, 2024 · 8c05eb4 · 8c05eb4
1 parent 5a44dfb
commit 8c05eb4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/test/studies/bale/indexgather/ig.plot.drive.bash b/test/studies/bale/indexgather/ig.plot.drive.bash
@@ -8,17 +8,17 @@ export CHPLEXP_MAX_LOCALES=4
    \
   `#name           features  options          command`                         \
   `#-------------------------------------------------------------------------` \
-   chpl_fine_1lpn  comm      --var CHPLEXP_NUM_SUBLOCALES=1                    \
+   __skip__chpl_fine_1lpn  comm      --var CHPLEXP_NUM_SUBLOCALES=1                    \
                                              ./ig.plot.gather.bash             \
                                                                                \
-   chpl_fine_2lpn  comm      --skip-if-colocales-unsupported                   \
+   __skip__chpl_fine_2lpn  comm      --skip-if-colocales-unsupported                   \
 			     --var CHPLEXP_NUM_SUBLOCALES=2                    \
                                              ./ig.plot.gather.bash             \
                                                                                \
-   chpl_agg_1lpn   comm      --var CHPLEXP_NUM_SUBLOCALES=1                    \
+   __skip__chpl_agg_1lpn   comm      --var CHPLEXP_NUM_SUBLOCALES=1                    \
                                              ./ig.plot.gather.agg.bash         \
                                                                                \
-   chpl_agg_2lpn   comm      --skip-if-colocales-unsupported                   \
+   __skip__chpl_agg_2lpn   comm      --skip-if-colocales-unsupported                   \
                              --var CHPLEXP_NUM_SUBLOCALES=2                    \
                                              ./ig.plot.gather.agg.bash         \
                                                                                \

diff --git a/test/studies/bale/indexgather/ig.plot.gather.shmem.bash b/test/studies/bale/indexgather/ig.plot.gather.shmem.bash
@@ -32,7 +32,7 @@ export SHMEM_SYMMETRIC_SIZE=256M
 CORES_PER_NODE=$CHPLEXP_THREADS_PER_NODE
 pushd bale/src/bale_classic/build_cray/bin
 for x in "${locales[@]}"; do
-  launchAndLog "${x}x${CHPLEXP_NUM_SUBLOCALES}" ./ig -n 10000000 -M 11
+  launchAndLog "${x}" ./ig -n 10000000 -M 11
 done
 popd
 

diff --git a/util/test/chplExperimentGatherUtils/prelude.bash b/util/test/chplExperimentGatherUtils/prelude.bash
@@ -36,8 +36,15 @@ function launchAndLog () {
   local cmd=${2}
   local args=${@:3}
 
-  # Strip out colocales if there's only one
   nl="$1"
+
+  # Extract number of nodes
+  nl_nodes="$1"
+  if [[ $nl == *x* ]]; then
+    nl_nodes=$(echo "$nl" | sed -e "s/x.*$//")
+  fi
+
+  # Strip out colocales if there's only one
   if [[ $nl = *x1 ]]; then
     nl=$(echo "$nl" | sed -e "s/x1$//")
   fi