mppf submitted a patch for DistributedBag which fixes the issue where we spawn too many tasks. NUMLOCALES dropped to 4 to help 'fifo' tasking layer, and made changes from 'barrier' to 'barriers'

Author: LouisJenkinsCS

modules/packages/DistributedBag.chpl

@@ -140,6 +140,14 @@ class DistributedBag : Collection {
   pragma "no doc"
   var pid : int = -1;
 
+  iter targetLocalesNotHere() {
+    for loc in targetLocales {
+      if loc != here {
+        yield loc;
+      }
+    }
+  }
+
   // Node-local fields below. These fields are specific to the privatized instance.
   // To access them from another node, make sure you use 'getPrivatizedThis'
   pragma "no doc"
@@ -979,8 +987,8 @@ class Bag {
                   segment.releaseStatus();
                   coforall segmentIdx in 0..#here.maxTaskPar {
                     var stolenWork : [{0..#numLocales}] (int, c_ptr(eltType));
-                    coforall loc in parentHandle.targetLocales {
-                      if loc != here then on loc {
+                    coforall loc in parentHandle.targetLocalesNotHere() {
+                      on loc {
                         // As we jumped to the target node, 'localBag' returns
                         // the target's bag that we are attempting to steal from.
                         var targetBag = parentHandle.bag;

test/modules/packages/collections/CollectionCounter.chpl

@@ -1,6 +1,6 @@
 use DistributedBag;
 use DistributedDeque;
-use Barrier;
+use Barriers;
 
 // For this test, we implement a simple counter; we add a predetermined number
 // of elements, then concurrently remove all elements from it until it is empty,

test/modules/packages/collections/CollectionCounter.compopts

@@ -1,3 +1,3 @@
---no-loop-invariant-code-motion -sisDeque --main-module=CollectionCounter
---no-loop-invariant-code-motion -sisBag --main-module=CollectionCounter
---no-loop-invariant-code-motion -sisBoundedDeque --main-module=CollectionCounter
+-sisDeque
+-sisBag
+-sisBoundedDeque

test/modules/packages/collections/CollectionNQueens.chpl

@@ -1,4 +1,4 @@
-use Barrier;
+use Barriers;
 use DistributedBag;
 use DistributedDeque;
 
@@ -134,9 +134,9 @@ proc canPlaceQueen(board, row, col) {
 
   return true;
 }
-
-
-
+
+
+
 
 type boardType = nQueens * int;
 const totalSolutions = getTotalSolutions();

test/modules/packages/collections/CollectionNQueens.compopts

@@ -1,2 +1,2 @@
--sisDeque --main-module=CollectionNQueens
--sisBag --main-module=CollectionNQueens
+-sisDeque
+-sisBag

test/modules/packages/collections/DequeOrdering.compopts

@@ -1,2 +1,2 @@
---main-module=DequeOrdering
---main-module=DequeOrdering -sisBounded=true
+-sisBounded=false
+-sisBounded=true

test/modules/packages/collections/DequeParity.chpl

@@ -1,4 +1,4 @@
-use Barrier;
+use Barriers;
 use DistributedDeque;
 
 // For the parity test, we separate even and odd numbers on each side of the Deque.

test/modules/packages/collections/DequeParity.compopts

@@ -1,2 +1,2 @@
--sisBounded --main-module=DequeParity
---main-module=DequeParity
+-sisBounded=true
+-sisBounded=false

test/modules/packages/collections/NUMLOCALES

@@ -1 +1 @@
-8
+4