From 5b878cf13b87d8e25bc108419dd1039fbe189a4e Mon Sep 17 00:00:00 2001 From: Brad Chamberlain Date: Thu, 14 Sep 2023 23:15:36 -0700 Subject: [PATCH] Update tests to use hashedDist --- Signed-off-by: Brad Chamberlain --- test/arrays/userAPI/assocDistributedHashed.chpl | 2 +- test/deprecated/dmapType.chpl | 9 +++++++++ test/deprecated/dmapType.good | 7 +++++++ .../bradc/assoc/userAssoc-array-domain-zipper.chpl | 2 +- .../distributions/bradc/assoc/userAssoc-array-noelt.chpl | 2 +- .../bradc/assoc/userAssoc-array-priv-check.chpl | 2 +- .../distributions/bradc/assoc/userAssoc-basic-array.chpl | 2 +- .../bradc/assoc/userAssoc-basic-domain.chpl | 2 +- test/distributions/bradc/assoc/userAssoc-class.chpl | 2 +- .../bradc/assoc/userAssoc-dom-operations.chpl | 2 +- .../bradc/assoc/userAssoc-domain-priv-check.chpl | 2 +- .../bradc/assoc/userAssoc-domain-stress.chpl | 2 +- test/distributions/bradc/assoc/userAssoc-fcf.chpl | 4 ++-- test/distributions/ferguson/dist-assoc-assign.chpl | 2 +- test/distributions/ferguson/dist-assoc-bulkadd.chpl | 2 +- test/distributions/ferguson/dist-assoc-writeln.chpl | 2 +- test/functions/generic/poi/hashed-dist-with-mapper.chpl | 2 +- test/optimizations/autoLocalAccess/common.chpl | 4 ++-- .../autoLocalAccess/regularDeclaration.compopts | 2 +- test/studies/labelprop/labelprop-tweets.chpl | 2 +- 20 files changed, 36 insertions(+), 20 deletions(-) diff --git a/test/arrays/userAPI/assocDistributedHashed.chpl b/test/arrays/userAPI/assocDistributedHashed.chpl index 6a373b22db8f..ff5b840a2235 100644 --- a/test/arrays/userAPI/assocDistributedHashed.chpl +++ b/test/arrays/userAPI/assocDistributedHashed.chpl @@ -23,7 +23,7 @@ proc main() { output.writeln([1,2,3]); var myMapper = new MyMapper(); - var D: domain(string) dmapped Hashed(idxType=string, mapper=myMapper); + var D: domain(string) dmapped hashedDist(idxType=string, mapper=myMapper); var A:[D] real; D += "zero"; diff --git a/test/deprecated/dmapType.chpl b/test/deprecated/dmapType.chpl index aeeaefe212e1..0b657f7a147b 100644 --- a/test/deprecated/dmapType.chpl +++ b/test/deprecated/dmapType.chpl @@ -94,3 +94,12 @@ config var n = 10, leaksAndBreaks=false; writeln(Dist2.type:string); } +{ + use HashedDist; + var Dom: domain(int) dmapped new dmap(new Hashed(idxType=int));; + Dom += 1; + var A: [Dom] real; + writeln(A); + const Dist2: dmap(Hashed(int, DefaultMapper)) = new Hashed(int); + writeln(Dist2.type:string); +} diff --git a/test/deprecated/dmapType.good b/test/deprecated/dmapType.good index fe3e4733025e..a2dc08019fe9 100644 --- a/test/deprecated/dmapType.good +++ b/test/deprecated/dmapType.good @@ -20,6 +20,9 @@ dmapType.chpl:72: warning: 'BlockCyclic' is deprecated, please use 'blockCycDist dmapType.chpl:84: warning: 'DimensionalDist2D' is deprecated, please use 'dimensionalDist2D' instead dmapType.chpl:85: warning: 'DimensionalDist2D' is deprecated, please use 'dimensionalDist2D' instead dmapType.chpl:93: warning: 'DimensionalDist2D' is deprecated, please use 'dimensionalDist2D' instead +dmapType.chpl:99: warning: 'Hashed' is deprecated, please use 'hashedDist' instead +dmapType.chpl:103: warning: 'Hashed' is deprecated, please use 'hashedDist' instead +dmapType.chpl:103: warning: 'Hashed' is deprecated, please use 'hashedDist' instead dmapType.chpl:92: warning: 'DimensionalDist2D' is deprecated, please use 'dimensionalDist2D' instead dmapType.chpl:4: warning: The use of 'dmap' is deprecated for this distribution; please replace 'new dmap(new ())' with 'new ()' dmapType.chpl:8: warning: The use of 'dmap' is deprecated for this distribution; please replace 'dmap(())' with '()' @@ -35,6 +38,8 @@ dmapType.chpl:68: warning: The use of 'dmap' is deprecated for this distribution dmapType.chpl:72: warning: The use of 'dmap' is deprecated for this distribution; please replace 'dmap(())' with '()' dmapType.chpl:84: warning: The use of 'dmap' is deprecated for this distribution; please replace 'new dmap(new ())' with 'new ()' dmapType.chpl:92: warning: The use of 'dmap' is deprecated for this distribution; please replace 'dmap(())' with '()' +dmapType.chpl:99: warning: The use of 'dmap' is deprecated for this distribution; please replace 'new dmap(new ())' with 'new ()' +dmapType.chpl:103: warning: The use of 'dmap' is deprecated for this distribution; please replace 'dmap(())' with '()' 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 blockDist(1,int(64),unmanaged DefaultDist) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 @@ -57,3 +62,5 @@ blockCycDist(1,int(64)) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 dimensionalDist2D([domain(2,int(64),one)] locale,BlockDim(int(64)),BlockDim(int(64)),int(64)) +0.0 +hashedDist(int(64),DefaultMapper) diff --git a/test/distributions/bradc/assoc/userAssoc-array-domain-zipper.chpl b/test/distributions/bradc/assoc/userAssoc-array-domain-zipper.chpl index 6bebba97c14d..5fd0e4453a6f 100644 --- a/test/distributions/bradc/assoc/userAssoc-array-domain-zipper.chpl +++ b/test/distributions/bradc/assoc/userAssoc-array-domain-zipper.chpl @@ -11,7 +11,7 @@ record MyMapper { } var myMapper = new MyMapper(); -var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=myMapper)); +var newDist = new hashedDist(idxType=real, mapper=myMapper); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-array-noelt.chpl b/test/distributions/bradc/assoc/userAssoc-array-noelt.chpl index c5f369373e6a..ffd59e5c8aa4 100644 --- a/test/distributions/bradc/assoc/userAssoc-array-noelt.chpl +++ b/test/distributions/bradc/assoc/userAssoc-array-noelt.chpl @@ -8,7 +8,7 @@ record MyMapper { } } -var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); +var newDist = new hashedDist(idxType=real, mapper=new MyMapper()); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-array-priv-check.chpl b/test/distributions/bradc/assoc/userAssoc-array-priv-check.chpl index ce06d0faf130..de816078272a 100644 --- a/test/distributions/bradc/assoc/userAssoc-array-priv-check.chpl +++ b/test/distributions/bradc/assoc/userAssoc-array-priv-check.chpl @@ -9,7 +9,7 @@ record MyMapper { } proc doit() { - var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); + var newDist = new hashedDist(idxType=real, mapper=new MyMapper()); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-basic-array.chpl b/test/distributions/bradc/assoc/userAssoc-basic-array.chpl index 0fda30307c34..cdb06dd77be0 100644 --- a/test/distributions/bradc/assoc/userAssoc-basic-array.chpl +++ b/test/distributions/bradc/assoc/userAssoc-basic-array.chpl @@ -8,7 +8,7 @@ record MyMapper { } } -var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); +var newDist = new hashedDist(idxType=real, mapper=new MyMapper()); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-basic-domain.chpl b/test/distributions/bradc/assoc/userAssoc-basic-domain.chpl index 43816512c47a..6ee07cbb85d2 100644 --- a/test/distributions/bradc/assoc/userAssoc-basic-domain.chpl +++ b/test/distributions/bradc/assoc/userAssoc-basic-domain.chpl @@ -8,7 +8,7 @@ record MyMapper { } } -var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); +var newDist = new hashedDist(idxType=real, mapper=new MyMapper()); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-class.chpl b/test/distributions/bradc/assoc/userAssoc-class.chpl index 18c1e26bfa5e..da7ec1bb6c42 100644 --- a/test/distributions/bradc/assoc/userAssoc-class.chpl +++ b/test/distributions/bradc/assoc/userAssoc-class.chpl @@ -14,7 +14,7 @@ var myMapper = proc(ind:real, targetLocs: Locales.type) { return indAsInt % numlocs; }; -var D: domain(real) dmapped Hashed(idxType=real, mapper=new MyMapper()); +var D: domain(real) dmapped hashedDist(idxType=real, mapper=new MyMapper()); D += 1.3; D += 22.0; diff --git a/test/distributions/bradc/assoc/userAssoc-dom-operations.chpl b/test/distributions/bradc/assoc/userAssoc-dom-operations.chpl index b2769578b335..d495d8c4ee4e 100644 --- a/test/distributions/bradc/assoc/userAssoc-dom-operations.chpl +++ b/test/distributions/bradc/assoc/userAssoc-dom-operations.chpl @@ -2,7 +2,7 @@ use HashedDist; config const verbose = false; -var newDist = new dmap(new Hashed(idxType=real)); +var newDist = new hashedDist(idxType=real); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-domain-priv-check.chpl b/test/distributions/bradc/assoc/userAssoc-domain-priv-check.chpl index cf2a2c6f4b94..1880ff826bdc 100644 --- a/test/distributions/bradc/assoc/userAssoc-domain-priv-check.chpl +++ b/test/distributions/bradc/assoc/userAssoc-domain-priv-check.chpl @@ -9,7 +9,7 @@ record MyMapper { } proc doit() { - var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); + var newDist = new hashedDist(idxType=real, mapper=new MyMapper()); var D: domain(real) dmapped newDist; diff --git a/test/distributions/bradc/assoc/userAssoc-domain-stress.chpl b/test/distributions/bradc/assoc/userAssoc-domain-stress.chpl index b9dcfe77d307..f5d82af9f3b9 100644 --- a/test/distributions/bradc/assoc/userAssoc-domain-stress.chpl +++ b/test/distributions/bradc/assoc/userAssoc-domain-stress.chpl @@ -4,7 +4,7 @@ use Random; config const requestCapacity = true; config const updatesPerLocale = 10000; -var D: domain(int) dmapped Hashed(idxType=int); +var D: domain(int) dmapped hashedDist(idxType=int); if requestCapacity then D.requestCapacity(updatesPerLocale*numLocales); diff --git a/test/distributions/bradc/assoc/userAssoc-fcf.chpl b/test/distributions/bradc/assoc/userAssoc-fcf.chpl index 9ba99b53bd8a..26f295c7d3fc 100644 --- a/test/distributions/bradc/assoc/userAssoc-fcf.chpl +++ b/test/distributions/bradc/assoc/userAssoc-fcf.chpl @@ -8,7 +8,7 @@ record MyMapper { } } -var newDist = new dmap(new unmanaged Hashed(idxType=real, mapper=new MyMapper())); +var newDist = hashedDist(idxType=real, mapper=new MyMapper()); var myMapper = proc(ind:real, targetLocs: Locales.type) { const numlocs = targetLocs.domain.size; @@ -16,7 +16,7 @@ var myMapper = proc(ind:real, targetLocs: Locales.type) { return indAsInt % numlocs; }; -var D: domain(real) dmapped Hashed(idxType=real, mapper=myMapper); +var D: domain(real) dmapped hashedDist(idxType=real, mapper=myMapper); D += 1.3; D += 22.0; diff --git a/test/distributions/ferguson/dist-assoc-assign.chpl b/test/distributions/ferguson/dist-assoc-assign.chpl index ee02aff87459..e40cbfbba964 100644 --- a/test/distributions/ferguson/dist-assoc-assign.chpl +++ b/test/distributions/ferguson/dist-assoc-assign.chpl @@ -1,6 +1,6 @@ use HashedDist; -var D: domain(real) dmapped Hashed(idxType=real); +var D: domain(real) dmapped hashedDist(idxType=real); D += 1.3; var localD: domain(real); diff --git a/test/distributions/ferguson/dist-assoc-bulkadd.chpl b/test/distributions/ferguson/dist-assoc-bulkadd.chpl index e2ed10127fd9..e674eb314627 100644 --- a/test/distributions/ferguson/dist-assoc-bulkadd.chpl +++ b/test/distributions/ferguson/dist-assoc-bulkadd.chpl @@ -1,6 +1,6 @@ use HashedDist; -var D: domain(real) dmapped Hashed(idxType=real); +var D: domain(real) dmapped hashedDist(idxType=real); var inds = [2.1, ]; diff --git a/test/distributions/ferguson/dist-assoc-writeln.chpl b/test/distributions/ferguson/dist-assoc-writeln.chpl index 204dbb3d89a2..fe89ca06cfbc 100644 --- a/test/distributions/ferguson/dist-assoc-writeln.chpl +++ b/test/distributions/ferguson/dist-assoc-writeln.chpl @@ -9,7 +9,7 @@ record MyMapper { } } -var D: domain(int) dmapped Hashed(idxType=int, mapper=new MyMapper()); +var D: domain(int) dmapped hashedDist(idxType=int, mapper=new MyMapper()); D += 0; D += 1; diff --git a/test/functions/generic/poi/hashed-dist-with-mapper.chpl b/test/functions/generic/poi/hashed-dist-with-mapper.chpl index 67ce6d5731e6..590744fe580e 100644 --- a/test/functions/generic/poi/hashed-dist-with-mapper.chpl +++ b/test/functions/generic/poi/hashed-dist-with-mapper.chpl @@ -11,7 +11,7 @@ specifically: } proc main() { var myMapper = new MyMapper(); - var D: domain(string) dmapped Hashed(idxType=string, mapper=myMapper); + var D: domain(string) dmapped hashedDist(idxType=string, mapper=myMapper); D += "zero"; } */ diff --git a/test/optimizations/autoLocalAccess/common.chpl b/test/optimizations/autoLocalAccess/common.chpl index ccc56074c748..fbe63582f9f6 100644 --- a/test/optimizations/autoLocalAccess/common.chpl +++ b/test/optimizations/autoLocalAccess/common.chpl @@ -33,8 +33,8 @@ proc createDom(space) { return space dmapped stencilDist(space, fluff=(1,1)); } } - else if distType == Hashed { - var D: domain(int) dmapped Hashed(idxType=int); + else if distType == hashedDist { + var D: domain(int) dmapped hashedDist(idxType=int); for i in space { D += i; } diff --git a/test/optimizations/autoLocalAccess/regularDeclaration.compopts b/test/optimizations/autoLocalAccess/regularDeclaration.compopts index c435fb342afd..83c907c9bba6 100644 --- a/test/optimizations/autoLocalAccess/regularDeclaration.compopts +++ b/test/optimizations/autoLocalAccess/regularDeclaration.compopts @@ -2,4 +2,4 @@ -sdistType=blockCycDist --report-auto-local-access -M$CHPL_HOME/test/optimizations/autoLocalAccess/ -sdistType=cyclicDist --report-auto-local-access -M$CHPL_HOME/test/optimizations/autoLocalAccess/ -sdistType=stencilDist --report-auto-local-access -M$CHPL_HOME/test/optimizations/autoLocalAccess/ --sdistType=Hashed --report-auto-local-access -M$CHPL_HOME/test/optimizations/autoLocalAccess/ +-sdistType=hashedDist --report-auto-local-access -M$CHPL_HOME/test/optimizations/autoLocalAccess/ diff --git a/test/studies/labelprop/labelprop-tweets.chpl b/test/studies/labelprop/labelprop-tweets.chpl index 19d0f50d73fa..29703ac87804 100644 --- a/test/studies/labelprop/labelprop-tweets.chpl +++ b/test/studies/labelprop/labelprop-tweets.chpl @@ -84,7 +84,7 @@ proc main(args:[] string) { // domain assignment in Hashed // Pairs is for collecting twitter user ID to user ID mentions if distributed { - var Pairs: domain( (int, int) ) dmapped Hashed(idxType=(int, int)); + var Pairs: domain( (int, int) ) dmapped hashedD(idxType=(int, int)); run(todo, Pairs); } else { var Pairs: domain( (int, int) );