Closes Bears-R-Us#2734: Fix remaining missed symbol table entry creat…

…ion for distributed builds (Bears-R-Us#2735) This PR (closes Bears-R-Us#2734) fixes the remaining missed symbol table entry creation for distributed builds. This is related to Bears-R-Us#2732, which only covered occurrences that were in `KExtremeMsg` Co-authored-by: Pierce Hayes <pierce314159@users.noreply.github.com>
stress-tess · Aug 29, 2023 · 3c66f2a · 3c66f2a
1 parent 10f6d34
commit 3c66f2a
Show file tree

Hide file tree

Showing 25 changed files with 191 additions and 191 deletions.
diff --git a/src/ArgSortMsg.chpl b/src/ArgSortMsg.chpl
@@ -257,7 +257,7 @@ module ArgSortMsg
           var merged = mergeNumericArrays(numDigits, arrSize, totalDigits, bitWidths, negs, names, st);
 
           var iv = argsortDefault(merged, algorithm=algorithm);
-          st.addEntry(ivname, new shared SymEntry(iv));
+          st.addEntry(ivname, createSymEntry(iv));
 
           var repMsg = "created " + st.attrib(ivname);
           asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -360,17 +360,17 @@ module ArgSortMsg
                 when (DType.Int64) {
                     var e = toSymEntry(gEnt,int);
                     var iv = argsortDefault(e.a, algorithm=algorithm);
-                    st.addEntry(ivname, new shared SymEntry(iv));
+                    st.addEntry(ivname, createSymEntry(iv));
                 }
                 when (DType.UInt64) {
                     var e = toSymEntry(gEnt,uint);
                     var iv = argsortDefault(e.a, algorithm=algorithm);
-                    st.addEntry(ivname, new shared SymEntry(iv));
+                    st.addEntry(ivname, createSymEntry(iv));
                 }
                 when (DType.Float64) {
                     var e = toSymEntry(gEnt, real);
                     var iv = argsortDefault(e.a);
-                    st.addEntry(ivname, new shared SymEntry(iv));
+                    st.addEntry(ivname, createSymEntry(iv));
                 }
                 otherwise {
                     var errorMsg = notImplementedError(pn,gEnt.dtype);
@@ -385,7 +385,7 @@ module ArgSortMsg
             overMemLimit((8 * strings.size * 8)
                          + (2 * here.maxTaskPar * numLocales * 2**16 * 8));
             var iv = strings.argsort();
-            st.addEntry(ivname, new shared SymEntry(iv));
+            st.addEntry(ivname, createSymEntry(iv));
           }
           otherwise {
               var errorMsg = notImplementedError(pn, objtype: string);

diff --git a/src/ArraySetopsMsg.chpl b/src/ArraySetopsMsg.chpl
@@ -58,7 +58,7 @@ module ArraySetopsMsg
             var f = toSymEntry(gEnt2,int);
 
             var aV = intersect1d(e.a, f.a, isUnique);
-            st.addEntry(vname, new shared SymEntry(aV));
+            st.addEntry(vname, createSymEntry(aV));
 
             repMsg = "created " + st.attrib(vname);
             asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -69,7 +69,7 @@ module ArraySetopsMsg
             var f = toSymEntry(gEnt2,uint);
 
             var aV = intersect1d(e.a, f.a, isUnique);
-            st.addEntry(vname, new shared SymEntry(aV));
+            st.addEntry(vname, createSymEntry(aV));
 
             repMsg = "created " + st.attrib(vname);
             asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -112,7 +112,7 @@ module ArraySetopsMsg
              var f = toSymEntry(gEnt2,int);
 
              var aV = setxor1d(e.a, f.a, isUnique);
-             st.addEntry(vname, new shared SymEntry(aV));
+             st.addEntry(vname, createSymEntry(aV));
 
              repMsg = "created " + st.attrib(vname);
              asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -123,7 +123,7 @@ module ArraySetopsMsg
              var f = toSymEntry(gEnt2,uint);
 
              var aV = setxor1d(e.a, f.a, isUnique);
-             st.addEntry(vname, new shared SymEntry(aV));
+             st.addEntry(vname, createSymEntry(aV));
 
              repMsg = "created " + st.attrib(vname);
              asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -166,7 +166,7 @@ module ArraySetopsMsg
              var f = toSymEntry(gEnt2, int);
 
              var aV = setdiff1d(e.a, f.a, isUnique);
-             st.addEntry(vname, new shared SymEntry(aV));
+             st.addEntry(vname, createSymEntry(aV));
 
              var repMsg = "created " + st.attrib(vname);
              asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -177,7 +177,7 @@ module ArraySetopsMsg
              var f = toSymEntry(gEnt2, uint);
 
              var aV = setdiff1d(e.a, f.a, isUnique);
-             st.addEntry(vname, new shared SymEntry(aV));
+             st.addEntry(vname, createSymEntry(aV));
 
              var repMsg = "created " + st.attrib(vname);
              asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -219,7 +219,7 @@ module ArraySetopsMsg
            var f = toSymEntry(gEnt2,int);
 
            var aV = union1d(e.a, f.a);
-           st.addEntry(vname, new shared SymEntry(aV));
+           st.addEntry(vname, createSymEntry(aV));
 
            var repMsg = "created " + st.attrib(vname);
            asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -230,7 +230,7 @@ module ArraySetopsMsg
            var f = toSymEntry(gEnt2,uint);
 
            var aV = union1d(e.a, f.a);
-           st.addEntry(vname, new shared SymEntry(aV));
+           st.addEntry(vname, createSymEntry(aV));
 
            var repMsg = "created " + st.attrib(vname);
            asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);

diff --git a/src/BigIntMsg.chpl b/src/BigIntMsg.chpl
@@ -48,7 +48,7 @@ module BigIntMsg {
         }
 
         var retname = st.nextName();
-        st.addEntry(retname, new shared SymEntry(bigIntArray, max_bits));
+        st.addEntry(retname, createSymEntry(bigIntArray, max_bits));
         var syment = toSymEntry(getGenericTypedArrayEntry(retname, st), bigint);
         repMsg = "created %s".doFormat(st.attrib(retname));
         biLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
@@ -73,7 +73,7 @@ module BigIntMsg {
                 while !all_zero {
                   low = tmp:uint;
                   var retname = st.nextName();
-                  st.addEntry(retname, new shared SymEntry(low));
+                  st.addEntry(retname, createSymEntry(low));
                   retList.pushBack("created %s".doFormat(st.attrib(retname)));
 
                   all_zero = true;

diff --git a/src/CSVMsg.chpl b/src/CSVMsg.chpl
@@ -400,31 +400,31 @@ module CSVMsg {
                 when DType.Int64 {
                     var a = makeDistArray(record_count, int);
                     read_files_into_dist_array(a, dset, filenames, subdoms, skips, true, col_delim, offsets);
-                    var entry = new shared SymEntry(a);
+                    var entry = createSymEntry(a);
                     var rname = st.nextName();
                     st.addEntry(rname, entry);
                     rtnData.pushBack((dset, ObjType.PDARRAY, rname));
                 }
                 when DType.UInt64 {
                     var a = makeDistArray(record_count, uint);
                     read_files_into_dist_array(a, dset, filenames, subdoms, skips, true, col_delim, offsets);
-                    var entry = new shared SymEntry(a);
+                    var entry = createSymEntry(a);
                     var rname = st.nextName();
                     st.addEntry(rname, entry);
                     rtnData.pushBack((dset, ObjType.PDARRAY, rname));
                 }
                 when DType.Float64 {
                     var a = makeDistArray(record_count, real);
                     read_files_into_dist_array(a, dset, filenames, subdoms, skips, true, col_delim, offsets);
-                    var entry = new shared SymEntry(a);
+                    var entry = createSymEntry(a);
                     var rname = st.nextName();
                     st.addEntry(rname, entry);
                     rtnData.pushBack((dset, ObjType.PDARRAY, rname));
                 }
                 when DType.Bool {
                     var a = makeDistArray(record_count, bool);
                     read_files_into_dist_array(a, dset, filenames, subdoms, skips, true, col_delim, offsets);
-                    var entry = new shared SymEntry(a);
+                    var entry = createSymEntry(a);
                     var rname = st.nextName();
                     st.addEntry(rname, entry);
                     rtnData.pushBack((dset, ObjType.PDARRAY, rname));

diff --git a/src/Cast.chpl b/src/Cast.chpl
@@ -48,7 +48,7 @@ module Cast {
       castLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg);
       return "Error: %s".doFormat(errorMsg);
     }
-    var after = st.addEntry(name, new shared SymEntry(tmp));
+    var after = st.addEntry(name, createSymEntry(tmp));
 
     var returnMsg = "created " + st.attrib(name);
     castLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),returnMsg);
@@ -185,11 +185,11 @@ module Cast {
       // do something like segmented computation w/o the aggregation
       select errors {
         when ErrorMode.strict {
-          var entry = st.addEntry(name, new shared SymEntry(computeOnSegmentsWithoutAggregation(oa, va, SegFunction.StringToNumericStrict, bigint)));
+          var entry = st.addEntry(name, createSymEntry(computeOnSegmentsWithoutAggregation(oa, va, SegFunction.StringToNumericStrict, bigint)));
           returnMsg = "created " + st.attrib(name);
         }
         when ErrorMode.ignore {
-          var entry = st.addEntry(name, new shared SymEntry(computeOnSegmentsWithoutAggregation(oa, va, SegFunction.StringToNumericIgnore, bigint)));
+          var entry = st.addEntry(name, createSymEntry(computeOnSegmentsWithoutAggregation(oa, va, SegFunction.StringToNumericIgnore, bigint)));
           returnMsg = "created " + st.attrib(name);
         }
         when ErrorMode.return_validity {
@@ -200,7 +200,7 @@ module Cast {
           forall (t, v, vf) in zip(tmp, valid.a, valWithFlag) {
             (t, v) = vf;
           }
-          var entry = st.addEntry(name, new shared SymEntry(tmp));
+          var entry = st.addEntry(name, createSymEntry(tmp));
           returnMsg = "created " + st.attrib(name);
           returnMsg += "+created " + st.attrib(vname);
         }

diff --git a/src/ConcatenateMsg.chpl b/src/ConcatenateMsg.chpl
@@ -361,7 +361,7 @@ module ConcatenateMsg
                               start += o.size;
                             }
                         }
-                        st.addEntry(rname, new shared SymEntry(tmp, max_bits));
+                        st.addEntry(rname, createSymEntry(tmp, max_bits));
                         cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
                                          "created concatenated pdarray: %s".doFormat(st.attrib(rname)));
                     }

diff --git a/src/DataFrameIndexingMsg.chpl b/src/DataFrameIndexingMsg.chpl
@@ -89,9 +89,9 @@
         }
 
         var s_name = st.nextName();
-        st.addEntry(s_name, new shared SymEntry(rsegs));
+        st.addEntry(s_name, createSymEntry(rsegs));
         var v_name = st.nextName();
-        st.addEntry(v_name, new shared SymEntry(rvals));
+        st.addEntry(v_name, createSymEntry(rvals));
 
         return "SegArray+%s+created %s+created %s".doFormat(col, st.attrib(s_name), st.attrib(v_name));
     }

diff --git a/src/FlattenMsg.chpl b/src/FlattenMsg.chpl
@@ -29,7 +29,7 @@ module FlattenMsg {
         repMsg = "created %s+created bytes.size %?".doFormat(st.attrib(stringsObj.name), stringsObj.nBytes);
         if returnSegs {
           const optName: string = st.nextName();
-          st.addEntry(optName, new shared SymEntry(segs));
+          st.addEntry(optName, createSymEntry(segs));
           repMsg += "+created %s".doFormat(st.attrib(optName));
         }
       } otherwise {
@@ -70,7 +70,7 @@ module FlattenMsg {
         var retString = getSegString(off, val, st);
         repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes);
         if returnSegs {
-          st.addEntry(optName, new shared SymEntry(segs));
+          st.addEntry(optName, createSymEntry(segs));
           repMsg += "+created %s".doFormat(st.attrib(optName));
         }
       }

diff --git a/src/HDF5Msg.chpl b/src/HDF5Msg.chpl
@@ -859,7 +859,7 @@ module HDF5Msg {
                 const ushift = 64:uint;
                 while !all_zero {
                     low = tmp:uint;
-                    limbs.pushBack(new shared SymEntry(low));
+                    limbs.pushBack(createSymEntry(low));
 
                     all_zero = true;
                     forall t in tmp with (&& reduce all_zero) {
@@ -2960,7 +2960,7 @@ module HDF5Msg {
         C_HDF5.H5Fclose(file_id);
 
         var sname = st.nextName();
-        st.addEntry(sname, new shared SymEntry(shape));
+        st.addEntry(sname, createSymEntry(shape));
         var rname = readPdarrayFromFile(filenames, dset, dataclass, bytesize, isSigned, validFiles, st);
         return (dset, ObjType.ARRAYVIEW, "%s+%s".doFormat(rname, sname));
     }
@@ -3035,7 +3035,7 @@ module HDF5Msg {
         }
 
         var rname = st.nextName();
-        st.addEntry(rname, new shared SymEntry(bigIntArray, max_bits));
+        st.addEntry(rname, createSymEntry(bigIntArray, max_bits));
         return rname;
     }
 
@@ -3150,7 +3150,7 @@ module HDF5Msg {
 
         proc _buildEntryCalcOffsets(): shared SymEntry throws {
             var offsetsArray = segmentedCalcOffsets(entryVal.a, entryVal.a.domain);
-            return new shared SymEntry(offsetsArray);
+            return createSymEntry(offsetsArray);
         }
 
         proc _buildEntryLoadOffsets() throws {
@@ -3204,7 +3204,7 @@ module HDF5Msg {
         read_files_into_distributed_array(segDist, segSubdoms, filenames, dset + "/" + SEGMENTED_OFFSET_NAME, skips);
         fixupSegBoundaries(segDist, segSubdoms, valSubdoms);
         var sname = st.nextName();
-        st.addEntry(sname, new shared SymEntry(segDist));
+        st.addEntry(sname, createSymEntry(segDist));
         rtnMap.add("segments", "created " + st.attrib(sname));
 
         return rtnMap;
@@ -3227,7 +3227,7 @@ module HDF5Msg {
         read_files_into_distributed_array(codes, subdoms, filenames, "%s/%s".doFormat(dset, CODES_NAME), skips);
         // create symEntry
         var codesName = st.nextName();
-        var codesEntry = new shared SymEntry(codes);
+        var codesEntry = createSymEntry(codes);
         st.addEntry(codesName, codesEntry);
 
         // read the categories
@@ -3244,7 +3244,7 @@ module HDF5Msg {
         read_files_into_distributed_array(naCodes, nacodes_subdoms, filenames, "%s/%s".doFormat(dset, NACODES_NAME), nacodes_skips);
         // create symEntry
         var naCodesName = st.nextName();
-        var naCodesEntry = new shared SymEntry(naCodes);
+        var naCodesEntry = createSymEntry(naCodes);
         st.addEntry(naCodesName, naCodesEntry);
 
         rtnMap.add("codes", "created " + st.attrib(codesEntry.name));
@@ -3267,7 +3267,7 @@ module HDF5Msg {
             var segments = makeDistArray(segs_len, int);
             read_files_into_distributed_array(segments, segs_subdoms, filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), segs_skips);
             var segName = st.nextName();
-            var segEntry = new shared SymEntry(segments);
+            var segEntry = createSymEntry(segments);
             st.addEntry(segName, segEntry);
 
             // get domain and size info for permutation
@@ -3279,7 +3279,7 @@ module HDF5Msg {
             var perm = makeDistArray(perm_len, int);
             read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), perm_skips);
             var permName = st.nextName();
-            var permEntry = new shared SymEntry(perm);
+            var permEntry = createSymEntry(perm);
             st.addEntry(permName, permEntry);
 
             rtnMap.add("segments", "created " + st.attrib(segEntry.name));
@@ -3299,7 +3299,7 @@ module HDF5Msg {
         read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), perm_skips);
         // create symEntry
         var permName = st.nextName();
-        var permEntry = new shared SymEntry(perm);
+        var permEntry = createSymEntry(perm);
         st.addEntry(permName, permEntry);
 
         var seg_subdoms: [fD] domain(1);
@@ -3310,7 +3310,7 @@ module HDF5Msg {
         read_files_into_distributed_array(segs, seg_subdoms, filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), seg_skips);
         // create symEntry
         var segName = st.nextName();
-        var segEntry = new shared SymEntry(segs);
+        var segEntry = createSymEntry(segs);
         st.addEntry(segName, segEntry);
 
         var uki_subdoms: [fD] domain(1);
@@ -3321,7 +3321,7 @@ module HDF5Msg {
         read_files_into_distributed_array(uki, uki_subdoms, filenames, "%s/%s".doFormat(dset, UKI_NAME), uki_skips);
         // create symEntry
         var ukiName = st.nextName();
-        var ukiEntry = new shared SymEntry(uki);
+        var ukiEntry = createSymEntry(uki);
         st.addEntry(ukiName, ukiEntry);
 
         rtnMap.add("permutation", "created " + st.attrib(permEntry.name));

diff --git a/src/HashMsg.chpl b/src/HashMsg.chpl
@@ -54,9 +54,9 @@ module HashMsg {
     st.checkTable(codesName);
     var (upper, lower) = categoricalHash(categoriesName, codesName, st);
     var upperName = st.nextName();
-    st.addEntry(upperName, new shared SymEntry(upper));
+    st.addEntry(upperName, createSymEntry(upper));
     var lowerName = st.nextName();
-    st.addEntry(lowerName, new shared SymEntry(lower));
+    st.addEntry(lowerName, createSymEntry(lower));
     var createdMap = new map(keyType=string,valType=string);
     createdMap.add("upperHash", "created %s".doFormat(st.attrib(upperName)));
     createdMap.add("lowerHash", "created %s".doFormat(st.attrib(lowerName)));
@@ -83,9 +83,9 @@ module HashMsg {
     }
 
     var upperName = st.nextName();
-    st.addEntry(upperName, new shared SymEntry(upper));
+    st.addEntry(upperName, createSymEntry(upper));
     var lowerName = st.nextName();
-    st.addEntry(lowerName, new shared SymEntry(lower));
+    st.addEntry(lowerName, createSymEntry(lower));
 
     var createdMap = new map(keyType=string,valType=string);
     createdMap.add("upperHash", "created %s".doFormat(st.attrib(upperName)));

diff --git a/src/HistogramMsg.chpl b/src/HistogramMsg.chpl
@@ -48,19 +48,19 @@ module HistogramMsg
               hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
                                                            "%? <= %?".doFormat(bins,sBound));
               var hist = histogramReduceIntent(e.a, aMin, aMax, bins, binWidth);
-              st.addEntry(rname, new shared SymEntry(hist));
+              st.addEntry(rname, createSymEntry(hist));
           }
           else if (bins <= mBound) {
               hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
                                                            "%? <= %?".doFormat(bins,mBound));
               var hist = histogramLocalAtomic(e.a, aMin, aMax, bins, binWidth);
-              st.addEntry(rname, new shared SymEntry(hist));
+              st.addEntry(rname, createSymEntry(hist));
           }
           else {
               hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),
                                                             "%? > %?".doFormat(bins,mBound));
               var hist = histogramGlobalAtomic(e.a, aMin, aMax, bins, binWidth);
-              st.addEntry(rname, new shared SymEntry(hist));
+              st.addEntry(rname, createSymEntry(hist));
           }
         }