From e7a863e7c9e677d987695036424568a8185f2607 Mon Sep 17 00:00:00 2001 From: jeremiah-corrado <62707311+jeremiah-corrado@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:17:33 -0600 Subject: [PATCH] Remove string.doFormat, replacing with string.format (#3365) * remove unecessary string.doFormat, replacing with string.format Signed-off-by: Jeremiah Corrado * remove doFormat from new random-exponential functions Signed-off-by: Jeremiah Corrado * fix merge conflict resolution Signed-off-by: Jeremiah Corrado --------- Signed-off-by: Jeremiah Corrado --- src/ArgSortMsg.chpl | 18 +- src/ArraySetops.chpl | 6 +- src/AryUtil.chpl | 18 +- src/BigIntMsg.chpl | 4 +- src/BinOp.chpl | 56 +- src/BroadcastMsg.chpl | 4 +- src/CSVMsg.chpl | 66 +-- src/Cast.chpl | 8 +- src/CastMsg.chpl | 4 +- src/CommandMap.chpl | 2 +- src/ConcatenateMsg.chpl | 28 +- src/DataFrameIndexingMsg.chpl | 28 +- src/EfuncMsg.chpl | 8 +- src/EncodingMsg.chpl | 2 +- src/ExternalIntegration.chpl | 42 +- src/FileIO.chpl | 24 +- src/FlattenMsg.chpl | 14 +- src/GenSymIO.chpl | 10 +- src/HDF5Msg.chpl | 764 ++++++++++++------------- src/HashMsg.chpl | 8 +- src/Histogram.chpl | 4 +- src/HistogramMsg.chpl | 28 +- src/In1dMsg.chpl | 2 +- src/IndexingMsg.chpl | 136 ++--- src/JoinEqWithDTMsg.chpl | 12 +- src/LinalgMsg.chpl | 10 +- src/Logging.chpl | 12 +- src/ManipulationMsg.chpl | 24 +- src/MemoryMgmt.chpl | 4 +- src/Merge.chpl | 14 +- src/Message.chpl | 34 +- src/MetricsMsg.chpl | 6 +- src/MsgProcessing.chpl | 32 +- src/MultiTypeRegEntry.chpl | 14 +- src/MultiTypeSymEntry.chpl | 10 +- src/MultiTypeSymbolTable.chpl | 36 +- src/OperatorMsg.chpl | 96 ++-- src/ParquetMsg.chpl | 76 +-- src/RadixSortLSD.chpl | 4 +- src/RandMsg.chpl | 42 +- src/ReductionMsg.chpl | 18 +- src/RegistrationMsg.chpl | 20 +- src/Registry.chpl | 12 +- src/SegStringSort.chpl | 18 +- src/SegmentedComputation.chpl | 2 +- src/SegmentedMsg.chpl | 132 ++--- src/SegmentedString.chpl | 22 +- src/SequenceMsg.chpl | 12 +- src/ServerConfig.chpl | 12 +- src/ServerDaemon.chpl | 128 ++--- src/ServerErrorStrings.chpl | 28 +- src/ServerErrors.chpl | 6 +- src/SipHash.chpl | 14 +- src/SortMsg.chpl | 8 +- src/StatsMsg.chpl | 46 +- src/TimeClassMsg.chpl | 18 +- src/Unique.chpl | 4 +- src/UniqueMsg.chpl | 2 +- src/compat/e-132/ArkoudaIOCompat.chpl | 4 - src/compat/eq-133/ArkoudaIOCompat.chpl | 4 - src/compat/eq-134/ArkoudaIOCompat.chpl | 4 - src/compat/ge-20/ArkoudaIOCompat.chpl | 4 - 62 files changed, 1106 insertions(+), 1122 deletions(-) diff --git a/src/ArgSortMsg.chpl b/src/ArgSortMsg.chpl index ddac745f73..ffbdfe830a 100644 --- a/src/ArgSortMsg.chpl +++ b/src/ArgSortMsg.chpl @@ -173,7 +173,7 @@ module ArgSortMsg deltaIV = argsortDefault(newa); } otherwise { throw getErrorWithContext( - msg="Unsupported DataType: %?".doFormat(dtype2str(g.dtype)), + msg="Unsupported DataType: %?".format(dtype2str(g.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -233,7 +233,7 @@ module ArgSortMsg algorithm = algoName: SortingAlgorithm; } catch { throw getErrorWithContext( - msg="Unrecognized sorting algorithm: %s".doFormat(algoName), + msg="Unrecognized sorting algorithm: %s".format(algoName), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -245,7 +245,7 @@ module ArgSortMsg var arrNames = msgArgs.get("arr_names").getList(n); var arrTypes = msgArgs.get("arr_types").getList(n); asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "number of arrays: %i arrNames: %?, arrTypes: %?".doFormat(n,arrNames, arrTypes)); + "number of arrays: %i arrNames: %?, arrTypes: %?".format(n,arrNames, arrTypes)); var (arrSize, hasStr, allSmallStrs, extraArraysNeeded, numStrings, names, types) = validateArraysSameLength(n, arrNames, arrTypes, st); // If there were no string arrays, merge the arrays into a single array and sort @@ -329,7 +329,7 @@ module ArgSortMsg } otherwise { throw getErrorWithContext( - msg="Unrecognized sorting algorithm: %s".doFormat(algorithm:string), + msg="Unrecognized sorting algorithm: %s".format(algorithm:string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -338,7 +338,7 @@ module ArgSortMsg } } try! asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "argsort time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "argsort time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); return iv; } @@ -384,7 +384,7 @@ module ArgSortMsg } otherwise { throw getErrorWithContext( - msg="Unrecognized sorting algorithm: %s".doFormat(algorithm:string), + msg="Unrecognized sorting algorithm: %s".format(algorithm:string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -393,7 +393,7 @@ module ArgSortMsg } } try! asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "argsort time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "argsort time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); return iv; } @@ -412,7 +412,7 @@ module ArgSortMsg algorithm = algoName: SortingAlgorithm; } catch { throw getErrorWithContext( - msg="Unrecognized sorting algorithm: %s".doFormat(algoName), + msg="Unrecognized sorting algorithm: %s".format(algoName), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -424,7 +424,7 @@ module ArgSortMsg const ivname = st.nextName(); asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s name: %s ivname: %s".doFormat(cmd, name, ivname)); + "cmd: %s name: %s ivname: %s".format(cmd, name, ivname)); var objtype = msgArgs.getValueOf("objType").toUpper(): ObjType; select objtype { diff --git a/src/ArraySetops.chpl b/src/ArraySetops.chpl index 68d816fe20..7badbaef48 100644 --- a/src/ArraySetops.chpl +++ b/src/ArraySetops.chpl @@ -205,9 +205,9 @@ module ArraySetops const totNumElemsMoved = + reduce pullLocalCount; const percentTransfered = (totNumElemsMoved:real / allocSize)*100:int; asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Total number of elements moved to a different locale = %i".doFormat(totNumElemsMoved)); + "Total number of elements moved to a different locale = %i".format(totNumElemsMoved)); asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Percent of elements moved to a different locale = %i%%".doFormat(percentTransfered)); + "Percent of elements moved to a different locale = %i%%".format(percentTransfered)); if toGiveUp || (percentTransfered > percentTransferLimit) { // fall back to sort @@ -217,7 +217,7 @@ module ArraySetops } else { asLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Falling back to sort workflow since percent of elements moved to a different locale = %i%% exceeds percentTransferLimit = %i%%".doFormat(percentTransfered, percentTransferLimit)); + "Falling back to sort workflow since percent of elements moved to a different locale = %i%% exceeds percentTransferLimit = %i%%".format(percentTransfered, percentTransferLimit)); } sortHelper(sortedIdx, permutedVals, idx1, idx2, val1, val2); } diff --git a/src/AryUtil.chpl b/src/AryUtil.chpl index 65d44ae1f5..419f5a69e0 100644 --- a/src/AryUtil.chpl +++ b/src/AryUtil.chpl @@ -43,15 +43,15 @@ module AryUtil if (d.size == 0) { s = ""; // Unnecessary, but left for clarity } else if (d.size < printThresh || d.size <= 6) { - for i in 0..(d.size-2) {s += try! "%?".doFormat(A[i]) + " ";} - s += try! "%?".doFormat(A[d.size-1]); + for i in 0..(d.size-2) {s += try! "%?".format(A[i]) + " ";} + s += try! "%?".format(A[d.size-1]); } else { - s = try! "%? %? %? ... %? %? %?".doFormat(A[0], A[1], A[2], A[d.size-3], A[d.size-2], A[d.size-1]); + s = try! "%? %? %? ... %? %? %?".format(A[0], A[1], A[2], A[d.size-3], A[d.size-2], A[d.size-1]); } return s; } else { const shape = d.shape; - var s = "%?\n".doFormat(shape), + var s = "%?\n".format(shape), front_indices: d.rank*range, back_indices: d.rank*range; @@ -67,7 +67,7 @@ module AryUtil const frontDom = {(...front_indices)}, backDom = {(...back_indices)}; - s += "%? ... %?".doFormat(A[frontDom], A[backDom]); + s += "%? ... %?".format(A[frontDom], A[backDom]); return s; } @@ -272,7 +272,7 @@ module AryUtil proc validateArraysSameLength(n:int, names:[] string, types: [] string, st: borrowed SymTab) throws { // Check that fields contains the stated number of arrays if (names.size != n) { - var errorMsg = "Expected %i arrays but got %i".doFormat(n, names.size); + var errorMsg = "Expected %i arrays but got %i".format(n, names.size); auLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned ErrorWithContext(errorMsg, getLineNumber(), @@ -281,7 +281,7 @@ module AryUtil "ArgumentError"); } if (types.size != n) { - var errorMsg = "Expected %i types but got %i".doFormat(n, types.size); + var errorMsg = "Expected %i types but got %i".format(n, types.size); auLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned ErrorWithContext(errorMsg, getLineNumber(), @@ -342,7 +342,7 @@ module AryUtil thisSize = segs.size; } otherwise { - var errorMsg = "Unrecognized object type: %s".doFormat(objtype); + var errorMsg = "Unrecognized object type: %s".format(objtype); auLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned ErrorWithContext(errorMsg, getLineNumber(), @@ -356,7 +356,7 @@ module AryUtil size = thisSize; } else { if (thisSize != size) { - var errorMsg = "Arrays must all be same size; expected size %?, got size %?".doFormat(size, thisSize); + var errorMsg = "Arrays must all be same size; expected size %?, got size %?".format(size, thisSize); auLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned ErrorWithContext(errorMsg, getLineNumber(), diff --git a/src/BigIntMsg.chpl b/src/BigIntMsg.chpl index bb6ee010ad..64e243fc49 100644 --- a/src/BigIntMsg.chpl +++ b/src/BigIntMsg.chpl @@ -49,7 +49,7 @@ module BigIntMsg { var retname = st.nextName(); st.addEntry(retname, createSymEntry(bigIntArray, max_bits)); var syment = toSymEntry(getGenericTypedArrayEntry(retname, st), bigint); - repMsg = "created %s".doFormat(st.attrib(retname)); + repMsg = "created %s".format(st.attrib(retname)); biLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -73,7 +73,7 @@ module BigIntMsg { low = tmp:uint; var retname = st.nextName(); st.addEntry(retname, createSymEntry(low)); - retList.pushBack("created %s".doFormat(st.attrib(retname))); + retList.pushBack("created %s".format(st.attrib(retname))); all_zero = true; forall t in tmp with (&& reduce all_zero) { diff --git a/src/BinOp.chpl b/src/BinOp.chpl index 1c3afebb24..cbd2ab0b4a 100644 --- a/src/BinOp.chpl +++ b/src/BinOp.chpl @@ -177,7 +177,7 @@ module BinOp } } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // Since we know that both `l` and `r` are of type `int` and that @@ -264,7 +264,7 @@ module BinOp } } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (e.etype == int && r.etype == uint) || @@ -294,7 +294,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (l.etype == uint && r.etype == int) || (l.etype == int && r.etype == uint) { @@ -320,7 +320,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // If either RHS or LHS type is real, the same operations are supported and the @@ -361,7 +361,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == uint && r.etype == real) || (l.etype == real && r.etype == uint)) { select op { @@ -398,7 +398,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == int && r.etype == bool) || (l.etype == bool && r.etype == int)) { select op { @@ -426,7 +426,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == uint && r.etype == bool) || (l.etype == bool && r.etype == uint)) { select op { @@ -445,7 +445,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == real && r.etype == bool) || (l.etype == bool && r.etype == real)) { select op { @@ -464,7 +464,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (l.etype == bool && r.etype == bool) { select op { @@ -480,7 +480,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } var errorMsg = notImplementedError(pn,l.dtype,op,r.dtype); @@ -591,7 +591,7 @@ module BinOp } } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // Since we know that both `l` and `r` are of type `int` and that @@ -668,7 +668,7 @@ module BinOp } } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (e.etype == int && val.type == uint) || @@ -702,7 +702,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (l.etype == bool && val.type == bool) { @@ -727,7 +727,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // If either RHS or LHS type is real, the same operations are supported and the @@ -766,7 +766,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if e.etype == real && ((l.etype == uint && val.type == int) || (l.etype == int && val.type == uint)) { @@ -791,7 +791,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == uint && val.type == real) || (l.etype == real && val.type == uint)) { @@ -827,7 +827,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == int && val.type == bool) || (l.etype == bool && val.type == int)) { select op { @@ -855,7 +855,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((l.etype == real && val.type == bool) || (l.etype == bool && val.type == real)) { select op { @@ -874,7 +874,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } var errorMsg = unrecognizedTypeError(pn, "("+dtype2str(l.dtype)+","+dtype2str(dtype)+")"); @@ -985,7 +985,7 @@ module BinOp } } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // Since we know that both `l` and `r` are of type `int` and that @@ -1068,7 +1068,7 @@ module BinOp } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (e.etype == int && val.type == uint) || @@ -1102,7 +1102,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } // If either RHS or LHS type is real, the same operations are supported and the @@ -1141,7 +1141,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if e.etype == real && ((r.etype == uint && val.type == int) || (r.etype == int && val.type == uint)) { @@ -1166,7 +1166,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((r.etype == uint && val.type == real) || (r.etype == real && val.type == uint)) { @@ -1202,7 +1202,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((r.etype == int && val.type == bool) || (r.etype == bool && val.type == int)) { select op { @@ -1230,7 +1230,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if ((r.etype == real && val.type == bool) || (r.etype == bool && val.type == real)) { select op { @@ -1249,7 +1249,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } else if (r.etype == bool && val.type == bool) { select op { @@ -1269,7 +1269,7 @@ module BinOp return new MsgTuple(errorMsg, MsgType.ERROR); } } - var repMsg = "created %s".doFormat(st.attrib(rname)); + var repMsg = "created %s".format(st.attrib(rname)); return new MsgTuple(repMsg, MsgType.NORMAL); } var errorMsg = unrecognizedTypeError(pn, "("+dtype2str(dtype)+","+dtype2str(r.dtype)+")"); diff --git a/src/BroadcastMsg.chpl b/src/BroadcastMsg.chpl index 6785ae6f3b..08fc50640b 100644 --- a/src/BroadcastMsg.chpl +++ b/src/BroadcastMsg.chpl @@ -87,7 +87,7 @@ module BroadcastMsg { res.a = broadcast(perm.a, segs.a, vals.a); } otherwise { - throw new owned ErrorWithContext("Values array has unsupported dtype %s".doFormat(gv.dtype:string), + throw new owned ErrorWithContext("Values array has unsupported dtype %s".format(gv.dtype:string), getLineNumber(), getRoutineName(), getModuleName(), @@ -124,7 +124,7 @@ module BroadcastMsg { res.a = broadcast(segs.a, vals.a, size); } otherwise { - throw new owned ErrorWithContext("Values array has unsupported dtype %s".doFormat(gv.dtype:string), + throw new owned ErrorWithContext("Values array has unsupported dtype %s".format(gv.dtype:string), getLineNumber(), getRoutineName(), getModuleName(), diff --git a/src/CSVMsg.chpl b/src/CSVMsg.chpl index 1d33a0d576..4834a964f0 100644 --- a/src/CSVMsg.chpl +++ b/src/CSVMsg.chpl @@ -44,10 +44,10 @@ module CSVMsg { // Attempt to interpret filename as a glob expression and ls the first result var tmp = glob(filename); csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob-expanded filename: %s to size: %i files".doFormat(filename, tmp.size)); + "glob-expanded filename: %s to size: %i files".format(filename, tmp.size)); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -58,7 +58,7 @@ module CSVMsg { // Check to see if the file exists. If not, return an error message if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -105,14 +105,14 @@ module CSVMsg { filenames[i] = generateFilename(prefix, extension, i); } - csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Identified %i files for provided name, %s".doFormat(filenames.size, filename)); + csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Identified %i files for provided name, %s".format(filenames.size, filename)); - var matchingFilenames = glob("%s_LOCALE*%s".doFormat(prefix, extension)); + var matchingFilenames = glob("%s_LOCALE*%s".format(prefix, extension)); var filesExist: bool = matchingFilenames.size > 0; if !overwrite && filesExist { throw getErrorWithContext( - msg="Filenames for the provided name exist. Overwrite must be set to true in order to save with the name %s".doFormat(filename), + msg="Filenames for the provided name exist. Overwrite must be set to true in order to save with the name %s".format(filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -125,7 +125,7 @@ module CSVMsg { var existList = glob(fn); if existList.size == 1 { remove(fn); - csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Overwriting CSV File, %s".doFormat(fn)); + csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Overwriting CSV File, %s".format(fn)); } } } @@ -158,7 +158,7 @@ module CSVMsg { } otherwise { throw getErrorWithContext( - msg="Invalid DType Found, %s".doFormat(dtype2str(GSE.dtype)), + msg="Invalid DType Found, %s".format(dtype2str(GSE.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -204,7 +204,7 @@ module CSVMsg { } otherwise { throw getErrorWithContext( - msg="Invalid DType Found, %s".doFormat(dtype2str(gse.dtype)), + msg="Invalid DType Found, %s".format(dtype2str(gse.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -238,7 +238,7 @@ module CSVMsg { // if memLim > memUsed then we use chunks no bigger than 5% of total memory (memLim is 90% so dividing by 18 gives us 5%) const numBatches = if memLim > memUsed then ceil(memRequired:real / (memLim - memUsed)):int else ceil(memRequired:real / (memLim / 18)):int; - csvLogger.info(getModuleName(),getRoutineName(),getLineNumber(), "Start csv write with %i batches".doFormat(numBatches)); + csvLogger.info(getModuleName(),getRoutineName(),getLineNumber(), "Start csv write with %i batches".format(numBatches)); coforall loc in Locales do on loc { const localeFilename = filenames[loc.id]; @@ -283,7 +283,7 @@ module CSVMsg { nativeStr += try! [i in batchSlice] segString[i]; } otherwise { throw getErrorWithContext( - msg="Data Type %s cannot be written to CSV.".doFormat(dtypes[i]), + msg="Data Type %s cannot be written to CSV.".format(dtypes[i]), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -315,7 +315,7 @@ module CSVMsg { // Verify that the file exists if !exists(filename) { throw getErrorWithContext( - msg="The file %s does not exist".doFormat(filename), + msg="The file %s does not exist".format(filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -380,10 +380,10 @@ module CSVMsg { forall (i, dset) in zip(0..#datasets.size, datasets) { var idx: int; var col_exists = columns.find(dset, idx); - csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Column: %s, Exists: ".doFormat(dset)+formatJson(col_exists)+", IDX: %i".doFormat(idx)); + csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Column: %s, Exists: ".format(dset)+formatJson(col_exists)+", IDX: %i".format(idx)); if !col_exists { throw getErrorWithContext( - msg="The dataset %s was not found in %s".doFormat(dset, filename), + msg="The dataset %s was not found in %s".format(dset, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -403,7 +403,7 @@ module CSVMsg { // sure that is the case first if !A.hasSingleLocalSubdomain() then throw getErrorWithContext( - msg="The array A must have a single local subdomain on locale %i".doFormat(here.id), + msg="The array A must have a single local subdomain on locale %i".format(here.id), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -442,7 +442,7 @@ module CSVMsg { if(colIdx == -1) then throw getErrorWithContext( - msg="The dataset %s was not found in %s".doFormat(colName, filename), + msg="The dataset %s was not found in %s".format(colName, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -529,7 +529,7 @@ module CSVMsg { forall (filedom, filename, file_idx) in zip(locFiledoms, locFiles, 0..) with (ref A, | reduce hadError) { if (skips.contains(filename)) { csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "File %s does not contain data for this dataset, skipping".doFormat(filename)); + "File %s does not contain data for this dataset, skipping".format(filename)); continue; } else { read_csv_pattern(A, filename, filedom, dset, col_delim, hasHeaders, offsets[file_idx], allowErrors, hadError); @@ -554,7 +554,7 @@ module CSVMsg { if (!vf) { skips.add(fname); csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Adding invalid file to skips, %s".doFormat(fname)); + "Adding invalid file to skips, %s".format(fname)); continue; } subdoms[i] = {off..#ct}; @@ -622,12 +622,12 @@ module CSVMsg { data[low..#vbytes.size] = vbytes; } var ss = getSegString(str_offsets, data, st); - var rst = (dset, ObjType.STRINGS, "%s+%?".doFormat(ss.name, ss.nBytes)); + var rst = (dset, ObjType.STRINGS, "%s+%?".format(ss.name, ss.nBytes)); rtnData.pushBack(rst); } otherwise { throw getErrorWithContext( - msg="Data Type %s cannot be read into Arkouda.".doFormat(dtypes[i]), + msg="Data Type %s cannot be read into Arkouda.".format(dtypes[i]), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -664,7 +664,7 @@ module CSVMsg { data[low..#vbytes.size] = vbytes; } var ss = getSegString(str_offsets, data, st); - var rst = (dset, ObjType.STRINGS, "%s+%?".doFormat(ss.name, ss.nBytes)); + var rst = (dset, ObjType.STRINGS, "%s+%?".format(ss.name, ss.nBytes)); rtnData.pushBack(rst); } return rtnData; @@ -684,7 +684,7 @@ module CSVMsg { var n: int = 1000; var jsonfiles = msgArgs.getValueOf("filenames"); var files: string = if jsonfiles.size > 2*n then jsonfiles[0..#n]+'...'+jsonfiles[jsonfiles.size-n..#n] else jsonfiles; - var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".doFormat(nfiles, files); + var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".format(nfiles, files); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -699,7 +699,7 @@ module CSVMsg { var n: int = 1000; var jsondsets = msgArgs.getValueOf("datasets"); var dsets: string = if jsondsets.size > 2*n then jsondsets[0..#n]+'...'+jsondsets[jsondsets.size-n..#n] else jsondsets; - var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".doFormat( + var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".format( ndsets, dsets); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); @@ -716,9 +716,9 @@ module CSVMsg { } var tmp = glob(filelist[0]); csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob expanded %s to %i files".doFormat(filelist[0], tmp.size)); + "glob expanded %s to %i files".format(filelist[0], tmp.size)); if tmp.size == 0 { - var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".doFormat(filelist[0]); + var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".format(filelist[0]); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -746,27 +746,27 @@ module CSVMsg { (row_cts[i], headers[i], dtypes) = get_info(fname, dsetlist, col_delim); data_types.pushBack(dtypes); } catch e: FileNotFoundError { - fileErrorMsg = "File %s not found".doFormat(fname); + fileErrorMsg = "File %s not found".format(fname); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: PermissionError { - fileErrorMsg = "Permission error %s opening %s".doFormat(e.message(),fname); + fileErrorMsg = "Permission error %s opening %s".format(e.message(),fname); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: DatasetNotFoundError { - fileErrorMsg = "1 or more Datasets not found in file %s".doFormat(fname); + fileErrorMsg = "1 or more Datasets not found in file %s".format(fname); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: SegStringError { - fileErrorMsg = "SegmentedString error: %s".doFormat(e.message()); + fileErrorMsg = "SegmentedString error: %s".format(e.message()); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e : Error { - fileErrorMsg = "Other error in accessing file %s: %s".doFormat(fname,e.message()); + fileErrorMsg = "Other error in accessing file %s: %s".format(fname,e.message()); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } @@ -788,18 +788,18 @@ module CSVMsg { for (isValid, fname, dt, rc, hh) in zip(validFiles, filenames, data_types, row_cts, headers) { if isValid { if (dtype != dt) { - var errorMsg = "Inconsistent dtypes in file %s".doFormat(fname); + var errorMsg = "Inconsistent dtypes in file %s".format(fname); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } else if (hasHeader != hh){ - var errorMsg = "Inconsistent file formatting. %s has no header.".doFormat(fname); + var errorMsg = "Inconsistent file formatting. %s has no header.".format(fname); csvLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } csvLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Verified all dtypes across files for file %s".doFormat(fname)); + "Verified all dtypes across files for file %s".format(fname)); } var rtnMsg: string; diff --git a/src/Cast.chpl b/src/Cast.chpl index 6ed30210df..cce181acf0 100644 --- a/src/Cast.chpl +++ b/src/Cast.chpl @@ -20,7 +20,7 @@ module Cast { try { after.a = before.a : toType; } catch e: IllegalArgumentError { - const errorMsg = "Error: bad value in cast from %s to %s".doFormat( + const errorMsg = "Error: bad value in cast from %s to %s".format( fromType:string, toType:string); castLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return (false, errorMsg); @@ -44,7 +44,7 @@ module Cast { tmp = before.a:bigint; } } catch e: IllegalArgumentError { - const errorMsg = "Error: bad value in cast from %s to bigint".doFormat(fromType:string); + const errorMsg = "Error: bad value in cast from %s to bigint".format(fromType:string); castLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return (false, errorMsg); } @@ -64,7 +64,7 @@ module Cast { if fromType == real { try { forall (s, v) in zip(strings, before.a) { - s = "%.17r".doFormat(v); + s = "%.17r".format(v); } } catch e { const errorMsg = "Error: could not convert float64 value to decimal representation"; @@ -75,7 +75,7 @@ module Cast { try { strings = [s in before.a] s : string; } catch e: IllegalArgumentError { - const errorMsg = "Error: bad value in cast from %s to string".doFormat(fromType:string); + const errorMsg = "Error: bad value in cast from %s to string".format(fromType:string); castLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return (false, errorMsg); } diff --git a/src/CastMsg.chpl b/src/CastMsg.chpl index af328f0b32..26332be038 100644 --- a/src/CastMsg.chpl +++ b/src/CastMsg.chpl @@ -23,7 +23,7 @@ module CastMsg { targetDtype = str2dtype(msgArgs.getValueOf("targetDtype")), opt = msgArgs.getValueOf("opt"); castLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %s obgtype: %? targetDtype: %? opt: %?".doFormat( + "name: %s obgtype: %? targetDtype: %? opt: %?".format( name,objtype,targetDtype,opt)); select objtype { @@ -360,7 +360,7 @@ module CastMsg { proc transmuteFloatMsg(cmd: string, msgArgs: borrowed MessageArgs, st: borrowed SymTab): MsgTuple throws { param pn = Reflection.getRoutineName(); var name = msgArgs.getValueOf("name"); - castLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"name: %s".doFormat(name)); + castLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"name: %s".format(name)); var e = toSymEntry(getGenericTypedArrayEntry(name, st), real); var transmuted = makeDistArray(e.a.domain, uint); transmuted = [ei in e.a] ei.transmute(uint(64)); diff --git a/src/CommandMap.chpl b/src/CommandMap.chpl index 96457c716d..8dd145e70f 100644 --- a/src/CommandMap.chpl +++ b/src/CommandMap.chpl @@ -69,7 +69,7 @@ module CommandMap { usedModules.add(moduleMap[cmd]); repTuple = commandMap[cmd](cmd, msgArgs, st); } else { - repTuple = new MsgTuple("Unrecognized command: %s".doFormat(cmd), MsgType.ERROR); + repTuple = new MsgTuple("Unrecognized command: %s".format(cmd), MsgType.ERROR); } return repTuple; } diff --git a/src/ConcatenateMsg.chpl b/src/ConcatenateMsg.chpl index 73577fc821..d7130264de 100644 --- a/src/ConcatenateMsg.chpl +++ b/src/ConcatenateMsg.chpl @@ -35,12 +35,12 @@ module ConcatenateMsg var names = msgArgs.get("names").getList(n); cmLogger.debug(getModuleName(),getRoutineName(), getLineNumber(), - "number of arrays: %i names: %?".doFormat(n,names)); + "number of arrays: %i names: %?".format(n,names)); // Check that fields contains the stated number of arrays if (n != names.size) { var errorMsg = incompatibleArgumentsError(pn, - "Expected %i arrays but got %i".doFormat(n, names.size)); + "Expected %i arrays but got %i".format(n, names.size)); cmLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -62,18 +62,18 @@ module ConcatenateMsg valSize = segString.nBytes; } catch e: Error { throw getErrorWithContext( - msg="lookup for %s failed".doFormat(name), + msg="lookup for %s failed".format(name), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="UnknownSymbolError"); } cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %s".doFormat(name)); + "name: %s".format(name)); } when ObjType.PDARRAY { cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "pdarray name %s".doFormat(name)); + "pdarray name %s".format(name)); } otherwise { var errorMsg = notImplementedError(pn, objtype: string); @@ -91,7 +91,7 @@ module ConcatenateMsg } else { // Check that all dtype's are the same across the list of arrays to concat if (dtype != entryDtype) { var errorMsg = incompatibleArgumentsError(pn, - "Expected %s dtype but got %s dtype".doFormat(dtype2str(dtype), + "Expected %s dtype but got %s dtype".format(dtype2str(dtype), dtype2str(entryDtype))); cmLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); @@ -207,16 +207,16 @@ module ConcatenateMsg valStart += thisVals.size; } } - var repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + var repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); // var repMsg = "created " + st.attrib(retString.name) + "+created " + st.attrib(retString.name); cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray %s".doFormat(st.attrib(retString.name))); + "created concatenated pdarray %s".format(st.attrib(retString.name))); return new MsgTuple(repMsg, MsgType.NORMAL); } when ObjType.PDARRAY { var rname = st.nextName(); cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "creating pdarray %s of type %?".doFormat(rname,dtype)); + "creating pdarray %s of type %?".format(rname,dtype)); select (dtype) { when DType.Int64 { // create array to copy into @@ -245,7 +245,7 @@ module ConcatenateMsg } } cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray: %s".doFormat(st.attrib(rname))); + "created concatenated pdarray: %s".format(st.attrib(rname))); } when DType.Float64 { // create array to copy into @@ -274,7 +274,7 @@ module ConcatenateMsg } } cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray: %s".doFormat(st.attrib(rname))); + "created concatenated pdarray: %s".format(st.attrib(rname))); } when DType.Bool { // create array to copy into @@ -303,7 +303,7 @@ module ConcatenateMsg } } cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray: %s".doFormat(st.attrib(rname))); + "created concatenated pdarray: %s".format(st.attrib(rname))); } when DType.UInt64 { // create array to copy into @@ -332,7 +332,7 @@ module ConcatenateMsg } } cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray: %s".doFormat(st.attrib(rname))); + "created concatenated pdarray: %s".format(st.attrib(rname))); } when DType.BigInt { // create array to copy into @@ -371,7 +371,7 @@ module ConcatenateMsg } st.addEntry(rname, createSymEntry(tmp, max_bits)); cmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "created concatenated pdarray: %s".doFormat(st.attrib(rname))); + "created concatenated pdarray: %s".format(st.attrib(rname))); } otherwise { var errorMsg = notImplementedError("concatenate",dtype); diff --git a/src/DataFrameIndexingMsg.chpl b/src/DataFrameIndexingMsg.chpl index bb679526de..b477474b11 100644 --- a/src/DataFrameIndexingMsg.chpl +++ b/src/DataFrameIndexingMsg.chpl @@ -30,18 +30,18 @@ if rtnName { return rname; } - var repMsg = "pdarray+%s+created %s".doFormat(col, st.attrib(rname)); + var repMsg = "pdarray+%s+created %s".format(col, st.attrib(rname)); return repMsg; } var idxMin = min reduce idx.a; var idxMax = max reduce idx.a; if idxMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,idxMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,idxMin); dfiLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned IllegalArgumentError(errorMsg); } if idxMax >= columnVals.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,idxMax,columnVals.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,idxMax,columnVals.size-1); dfiLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned IllegalArgumentError(errorMsg); } @@ -57,7 +57,7 @@ return rname; } - var repMsg = "%s+%s+created %s".doFormat(objType, col, st.attrib(rname)); + var repMsg = "%s+%s+created %s".format(objType, col, st.attrib(rname)); return repMsg; } @@ -93,7 +93,7 @@ var v_name = st.nextName(); st.addEntry(v_name, createSymEntry(rvals)); - return "SegArray+%s+created %s+created %s".doFormat(col, st.attrib(s_name), st.attrib(v_name)); + return "SegArray+%s+created %s+created %s".format(col, st.attrib(s_name), st.attrib(v_name)); } proc dataframeBatchIndexingMsg(cmd: string, msgArgs: borrowed MessageArgs, st: borrowed SymTab): MsgTuple throws { @@ -114,7 +114,7 @@ if ele_parts[0] == "Categorical" { ref codes_name = ele_parts[2]; ref categories_name = ele_parts[3]; - dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is Categorical\nCodes Name: %s, Categories Name: %s".doFormat(i, codes_name, categories_name)); + dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is Categorical\nCodes Name: %s, Categories Name: %s".format(i, codes_name, categories_name)); var gCode: borrowed GenSymEntry = getGenericTypedArrayEntry(codes_name, st); var code_vals = toSymEntry(gCode, int); @@ -126,21 +126,21 @@ throw new IllegalArgumentError(repTup.msg); } - rpm = formatJson("Strings+%s+%s".doFormat(col_name, repTup.msg)); + rpm = formatJson("Strings+%s+%s".format(col_name, repTup.msg)); } else if ele_parts[0] == "Strings"{ - dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is Strings. Name: %s".doFormat(i, ele_parts[2])); + dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is Strings. Name: %s".format(i, ele_parts[2])); var repTup = segPdarrayIndex(ObjType.STRINGS, ele_parts[2], msgArgs.getValueOf("idx_name"), DType.UInt8, st); if repTup.msgType == MsgType.ERROR { throw new IllegalArgumentError(repTup.msg); } - rpm = formatJson("Strings+%s+%s".doFormat(col_name, repTup.msg)); + rpm = formatJson("Strings+%s+%s".format(col_name, repTup.msg)); } else if ele_parts[0] == "pdarray" || ele_parts[0] == "IPv4" || ele_parts[0] == "Fields" || ele_parts[0] == "Datetime" || ele_parts[0] == "BitVector"{ - dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is pdarray. Name: %s".doFormat(i, ele_parts[2])); + dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is pdarray. Name: %s".format(i, ele_parts[2])); var gCol: borrowed GenSymEntry = getGenericTypedArrayEntry(ele_parts[2], st); select (gCol.dtype) { when (DType.Int64) { @@ -171,10 +171,10 @@ } } else if ele_parts[0] == "SegArray" { - dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is SegArray".doFormat(i)); + dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Element at %i is SegArray".format(i)); ref segments_name = ele_parts[2]; ref values_name = ele_parts[3]; - dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Segments Name: %s, Values Name: %s".doFormat(segments_name, values_name)); + dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"Segments Name: %s, Values Name: %s".format(segments_name, values_name)); var gSeg: borrowed GenSymEntry = getGenericTypedArrayEntry(segments_name, st); var segments = toSymEntry(gSeg, int); @@ -209,11 +209,11 @@ throw new IllegalArgumentError(errorMsg); } } - repMsg = "[%s]".doFormat(",".join(repMsgList)); + repMsg = "[%s]".format(",".join(repMsgList)); dfiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } use CommandMap; registerFunction("dataframe_idx", dataframeBatchIndexingMsg, getModuleName()); -} \ No newline at end of file +} diff --git a/src/EfuncMsg.chpl b/src/EfuncMsg.chpl index 570e9c8c8f..06ea4b92cb 100644 --- a/src/EfuncMsg.chpl +++ b/src/EfuncMsg.chpl @@ -51,7 +51,7 @@ module EfuncMsg var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); eLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s efunc: %s pdarray: %s".doFormat(cmd,efunc,st.attrib(name))); + "cmd: %s efunc: %s pdarray: %s".format(cmd,efunc,st.attrib(name))); select (gEnt.dtype) { when (DType.Int64) { @@ -965,7 +965,7 @@ module EfuncMsg var name1 = msgArgs.getValueOf("condition"); var name2 = msgArgs.getValueOf("a"); eLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s efunc: %s scalar: %s dtype: %s name1: %s name2: %s rname: %s".doFormat( + "cmd: %s efunc: %s scalar: %s dtype: %s name1: %s name2: %s rname: %s".format( cmd,efunc,msgArgs.getValueOf("scalar"),dtype,name1,name2,rname)); var g1: borrowed GenSymEntry = getGenericTypedArrayEntry(name1, st); @@ -1080,7 +1080,7 @@ module EfuncMsg var name1 = msgArgs.getValueOf("condition"); var name2 = msgArgs.getValueOf("b"); eLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s efunc: %s scalar: %s dtype: %s name1: %s name2: %s rname: %s".doFormat( + "cmd: %s efunc: %s scalar: %s dtype: %s name1: %s name2: %s rname: %s".format( cmd,efunc,msgArgs.getValueOf("scalar"),dtype,name1,name2,rname)); var g1: borrowed GenSymEntry = getGenericTypedArrayEntry(name1, st); @@ -1195,7 +1195,7 @@ module EfuncMsg var name1 = msgArgs.getValueOf("condition"); eLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s efunc: %s scalar1: %s dtype1: %s scalar2: %s name: %s rname: %s".doFormat( + "cmd: %s efunc: %s scalar1: %s dtype1: %s scalar2: %s name: %s rname: %s".format( cmd,efunc,msgArgs.getValueOf("a"),dtype,msgArgs.getValueOf("b"),name1,rname)); var g1: borrowed GenSymEntry = getGenericTypedArrayEntry(name1, st); diff --git a/src/EncodingMsg.chpl b/src/EncodingMsg.chpl index 52417b92a0..af16c91ac7 100644 --- a/src/EncodingMsg.chpl +++ b/src/EncodingMsg.chpl @@ -31,7 +31,7 @@ module EncodingMsg { var (offsets, vals) = encodeDecode(stringsObj, toEncoding, fromEncoding); var encodedStrings = getSegString(offsets, vals, st); - repMsg = "created " + st.attrib(encodedStrings.name) + "+created bytes.size %?".doFormat(encodedStrings.nBytes); + repMsg = "created " + st.attrib(encodedStrings.name) + "+created bytes.size %?".format(encodedStrings.nBytes); emLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); diff --git a/src/ExternalIntegration.chpl b/src/ExternalIntegration.chpl index 4a73111abc..1278643fc6 100644 --- a/src/ExternalIntegration.chpl +++ b/src/ExternalIntegration.chpl @@ -78,7 +78,7 @@ module ExternalIntegration { hostip.split(); } catch (e: Error) { throw new IllegalArgumentError( - "invalid hostname -> ip address entry in /etc/hosts %?".doFormat( + "invalid hostname -> ip address entry in /etc/hosts %?".format( e)); } } @@ -187,26 +187,26 @@ module ExternalIntegration { Curl.curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, this.requestType:string); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Configured HttpChannel for type %s format %s".doFormat( + "Configured HttpChannel for type %s format %s".format( this.requestType, this.requestFormat)); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Executing Http request with payload %s".doFormat(payload)); + "Executing Http request with payload %s".format(payload)); var ret = Curl.curl_easy_perform(curl); if ret == 0 { eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Successfully executed Http request with payload %s".doFormat(payload)); + "Successfully executed Http request with payload %s".format(payload)); } else { if ret == 22 { throw getErrorWithContext(getLineNumber(),getRoutineName(),getModuleName(), - "error in HTTP request %s".doFormat(payload), + "error in HTTP request %s".format(payload), "ExternalSystemError"); } else { throw getErrorWithContext(getLineNumber(),getRoutineName(),getModuleName(), - "request with payload %s returned error code %i".doFormat(payload,ret), + "request with payload %s returned error code %i".format(payload,ret), "ExternalSystemError"); } } @@ -278,20 +278,20 @@ module ExternalIntegration { proc generateEndpointCreateUrl() : string throws { var k8sHost = ServerConfig.getEnv('K8S_HOST'); var namespace = ServerConfig.getEnv('NAMESPACE'); - return '%s/api/v1/namespaces/%s/endpoints'.doFormat(k8sHost,namespace); + return '%s/api/v1/namespaces/%s/endpoints'.format(k8sHost,namespace); } proc generateEndpointUpdateUrl() : string throws { var k8sHost = ServerConfig.getEnv('K8S_HOST'); var namespace = ServerConfig.getEnv('NAMESPACE'); var name = ServerConfig.getEnv('ENDPOINT_NAME'); - return '%s/api/v1/namespaces/%s/endpoints/%s'.doFormat(k8sHost,namespace,name); + return '%s/api/v1/namespaces/%s/endpoints/%s'.format(k8sHost,namespace,name); } proc generateServiceCreateUrl() : string throws { var k8sHost = ServerConfig.getEnv('K8S_HOST'); var namespace = ServerConfig.getEnv(name='NAMESPACE',default='default'); - return '%s/api/v1/namespaces/%s/services'.doFormat(k8sHost,namespace); + return '%s/api/v1/namespaces/%s/services'.format(k8sHost,namespace); } proc registerAsInternalService(appName: string, serviceName: string, servicePort: int, @@ -300,14 +300,14 @@ module ExternalIntegration { var servicePayload = "".join('{"apiVersion": "v1","kind": "Service","metadata": ', '{"name": "%s"},"spec": {"ports": [{"port": %i,' , '"protocol": "TCP","targetPort": %i}],"selector":', - ' {"app":"%s"}}}').doFormat( + ' {"app":"%s"}}}').format( serviceName, servicePort, targetPort, appName); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registering internal service via payload %s and url %s".doFormat( + "Registering internal service via payload %s and url %s".format( servicePayload,serviceUrl)); var channel = new HttpsChannel(url=serviceUrl, @@ -319,7 +319,7 @@ module ExternalIntegration { channel.write(servicePayload); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registered internal service via payload %s and url %s".doFormat( + "Registered internal service via payload %s and url %s".format( servicePayload,serviceUrl)); } @@ -334,12 +334,12 @@ module ExternalIntegration { var serviceUrl = generateServiceCreateUrl(); var servicePayload = "".join('{"apiVersion": "v1","kind": "Service","metadata": ', '{"name": "%s"},"spec": {"ports": [{"port": %i,', - '"protocol": "TCP","targetPort": %i}]}}').doFormat( + '"protocol": "TCP","targetPort": %i}]}}').format( serviceName, servicePort, serviceTargetPort); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registering external service via payload %s and url %s".doFormat( + "Registering external service via payload %s and url %s".format( servicePayload,serviceUrl)); var channel = new HttpsChannel(url=serviceUrl, @@ -350,7 +350,7 @@ module ExternalIntegration { channel.write(servicePayload); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registered external service via payload %s and url %s".doFormat( + "Registered external service via payload %s and url %s".format( servicePayload,serviceUrl)); // Create Kubernetes Endpoints @@ -358,7 +358,7 @@ module ExternalIntegration { var endpointPayload = "".join('{"kind": "Endpoints","apiVersion": "v1",', ' "metadata": {"name": "%s"}, "subsets": ', '[{"addresses": [{"ip": "%s"}],"ports": ', - '[{"port": %i, "protocol": "TCP"}]}]}').doFormat( + '[{"port": %i, "protocol": "TCP"}]}]}').format( serviceName, getConnectHostIp(), servicePort); @@ -370,12 +370,12 @@ module ExternalIntegration { token=ServerConfig.getEnv('SSL_TOKEN')); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registering endpoint via payload %s and url %s".doFormat( + "Registering endpoint via payload %s and url %s".format( endpointPayload,endpointUrl)); channel.write(endpointPayload); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Registered endpoint via payload %s and endpointUrl %s".doFormat( + "Registered endpoint via payload %s and endpointUrl %s".format( endpointPayload,endpointUrl)); } } @@ -389,7 +389,7 @@ module ExternalIntegration { proc generateServiceDeleteUrl(serviceName: string) throws { var k8sHost = ServerConfig.getEnv('K8S_HOST'); var namespace = ServerConfig.getEnv('NAMESPACE'); - return '%s/api/v1/namespaces/%s/services/%s'.doFormat(k8sHost,namespace,serviceName); + return '%s/api/v1/namespaces/%s/services/%s'.format(k8sHost,namespace,serviceName); } var url = generateServiceDeleteUrl(serviceName); @@ -400,7 +400,7 @@ module ExternalIntegration { token=ServerConfig.getEnv('SSL_TOKEN')); channel.write('{}'); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Deregistered service %s from Kubernetes via url %s".doFormat(serviceName, + "Deregistered service %s from Kubernetes via url %s".format(serviceName, url)); } @@ -464,7 +464,7 @@ module ExternalIntegration { when SystemType.KUBERNETES { deregisterFromKubernetes(serviceName); eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Deregistered service %s from Kubernetes".doFormat(serviceName)); + "Deregistered service %s from Kubernetes".format(serviceName)); } otherwise { eiLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), diff --git a/src/FileIO.chpl b/src/FileIO.chpl index ab6a56faee..f583767836 100644 --- a/src/FileIO.chpl +++ b/src/FileIO.chpl @@ -137,7 +137,7 @@ module FileIO { filenames[i] = generateFilename(prefix, extension, i); } fioLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "generateFilenames targetLocales.size %i, filenames.size %i".doFormat(targetLocalesSize, filenames.size)); + "generateFilenames targetLocales.size %i, filenames.size %i".format(targetLocalesSize, filenames.size)); return filenames; } @@ -147,8 +147,8 @@ module FileIO { * the user along with a file index and extension. */ proc generateFilename(prefix : string, extension : string, idx : int) : string throws { - var suffix = '%04i'.doFormat(idx); - return "%s_LOCALE%s%s".doFormat(prefix, suffix, extension); + var suffix = '%04i'.format(idx); + return "%s_LOCALE%s%s".format(prefix, suffix, extension); } /* @@ -157,7 +157,7 @@ module FileIO { * being overwritten. */ proc getMatchingFilenames(prefix : string, extension : string) throws { - return glob("%s_LOCALE*%s".doFormat(prefix, extension)); + return glob("%s_LOCALE*%s".format(prefix, extension)); } /* @@ -262,7 +262,7 @@ module FileIO { var tmp = glob(filename); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -271,7 +271,7 @@ module FileIO { } if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -306,7 +306,7 @@ module FileIO { var tmp = glob(filename); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -314,9 +314,9 @@ module FileIO { filename = tmp[tmp.domain.first]; } fioLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "FILENAME: %s".doFormat(filename)); + "FILENAME: %s".format(filename)); if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -347,7 +347,7 @@ module FileIO { var n: int = 1000; var jsonfiles = msgArgs.getValueOf("filenames"); var files: string = if jsonfiles.size > 2*n then jsonfiles[0..#n]+'...'+jsonfiles[jsonfiles.size-n..#n] else jsonfiles; - var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".doFormat(nfiles, files); + var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".format(nfiles, files); fioLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -363,9 +363,9 @@ module FileIO { } var tmp = glob(filelist[0]); fioLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob expanded %s to %i files".doFormat(filelist[0], tmp.size)); + "glob expanded %s to %i files".format(filelist[0], tmp.size)); if tmp.size == 0 { - var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".doFormat(filelist[0]); + var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".format(filelist[0]); fioLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } diff --git a/src/FlattenMsg.chpl b/src/FlattenMsg.chpl index b2a5c9819d..59aed08122 100644 --- a/src/FlattenMsg.chpl +++ b/src/FlattenMsg.chpl @@ -26,14 +26,14 @@ module FlattenMsg { const strings = getSegString(msgArgs.getValueOf("values"), st); var (off, val, segs) = strings.flatten(delim, returnSegs, regex); var stringsObj = getSegString(off, val, st); - repMsg = "created %s+created bytes.size %?".doFormat(st.attrib(stringsObj.name), stringsObj.nBytes); + repMsg = "created %s+created bytes.size %?".format(st.attrib(stringsObj.name), stringsObj.nBytes); if returnSegs { const optName: string = st.nextName(); st.addEntry(optName, createSymEntry(segs)); - repMsg += "+created %s".doFormat(st.attrib(optName)); + repMsg += "+created %s".format(st.attrib(optName)); } } otherwise { - throw new owned ErrorWithContext("Not implemented for objtype %s".doFormat(objtype), + throw new owned ErrorWithContext("Not implemented for objtype %s".format(objtype), getLineNumber(), getRoutineName(), getModuleName(), @@ -60,7 +60,7 @@ module FlattenMsg { const pattern: string = msgArgs.getValueOf("pattern"); fmLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "cmd: %s objtype: %?".doFormat(cmd, objtype)); + "cmd: %s objtype: %?".format(cmd, objtype)); select objtype { when "Matcher" { @@ -68,14 +68,14 @@ module FlattenMsg { const strings = getSegString(name, st); var (off, val, segs) = strings.split(pattern, maxsplit, returnSegs); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); if returnSegs { st.addEntry(optName, createSymEntry(segs)); - repMsg += "+created %s".doFormat(st.attrib(optName)); + repMsg += "+created %s".format(st.attrib(optName)); } } otherwise { - throw new owned ErrorWithContext("Not implemented for objtype %s".doFormat(objtype), + throw new owned ErrorWithContext("Not implemented for objtype %s".format(objtype), getLineNumber(), getRoutineName(), getModuleName(), diff --git a/src/GenSymIO.chpl b/src/GenSymIO.chpl index ee9c050c20..70fcad02cc 100644 --- a/src/GenSymIO.chpl +++ b/src/GenSymIO.chpl @@ -43,7 +43,7 @@ module GenSymIO { overMemLimit(2*size*dtypeSize(dtype)); gsLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "dtype: %? shape: %? size: %i".doFormat(dtype,shape,size)); + "dtype: %? shape: %? size: %i".format(dtype,shape,size)); proc bytesToSymEntry(type t) throws { var entry = createSymEntry((...shape), t); @@ -68,7 +68,7 @@ module GenSymIO { } else if dtype == DType.UInt8 { bytesToSymEntry(uint(8)); } else { - const msg = "Unhandled data type %s".doFormat(msgArgs.getValueOf("dtype")); + const msg = "Unhandled data type %s".format(msgArgs.getValueOf("dtype")); gsLogger.error(getModuleName(),getRoutineName(),getLineNumber(),msg); return new MsgTuple(msg, MsgType.ERROR); } @@ -87,7 +87,7 @@ module GenSymIO { gsLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),msg); return new MsgTuple(msg, MsgType.NORMAL); } else { - throw new Error("Unsupported Type %s".doFormat(g.entryType)); + throw new Error("Unsupported Type %s".format(g.entryType)); } } catch e: Error { const msg = "Error creating offsets for SegString"; @@ -125,7 +125,7 @@ module GenSymIO { var arrayBytes: bytes; var abstractEntry = st.lookup(msgArgs.getValueOf("array")); if !abstractEntry.isAssignableTo(SymbolEntryType.TypedArraySymEntry) { - var errorMsg = "Error: Unhandled SymbolEntryType %s".doFormat(abstractEntry.entryType); + var errorMsg = "Error: Unhandled SymbolEntryType %s".format(abstractEntry.entryType); gsLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return MsgTuple.error(errorMsg); } @@ -157,7 +157,7 @@ module GenSymIO { } else if entry.dtype == DType.UInt8 { arrayBytes = distArrToBytes(toSymEntry(entry, uint(8), nd).a); } else { - const errorMsg = "Error: Unhandled dtype %s".doFormat(entry.dtype); + const errorMsg = "Error: Unhandled dtype %s".format(entry.dtype); gsLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return MsgTuple.error(errorMsg); } diff --git a/src/HDF5Msg.chpl b/src/HDF5Msg.chpl index fe24c09275..7a9568c46f 100644 --- a/src/HDF5Msg.chpl +++ b/src/HDF5Msg.chpl @@ -101,7 +101,7 @@ module HDF5Msg { proc validateWriteMode(mode: int) throws { if (mode != APPEND && mode != TRUNCATE) { throw getErrorWithContext( - msg="Unknown write mode %i found.".doFormat(mode), + msg="Unknown write mode %i found.".format(mode), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -120,8 +120,8 @@ module HDF5Msg { var extension: string; (prefix,extension) = getFileMetadata(filename); - const f = "%s%s".doFormat(prefix, extension); - var matchingFilenames = glob("%s*%s".doFormat(prefix, extension)); + const f = "%s%s".format(prefix, extension); + var matchingFilenames = glob("%s*%s".format(prefix, extension)); var fileExists: bool = matchingFilenames.size > 0; if (mode == TRUNCATE || (mode == APPEND && !fileExists)) { @@ -139,7 +139,7 @@ module HDF5Msg { } if file_id < 0 { // Negative file_id means error - throw getErrorWithContext(msg="The file %s cannot be created".doFormat(f), + throw getErrorWithContext(msg="The file %s cannot be created".format(f), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -177,9 +177,9 @@ module HDF5Msg { filenames[i] = generateFilename(prefix, extension, i); } fioLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "generateFilenames targetLocales.size %i, filenames.size %i".doFormat(targetSize, filenames.size)); + "generateFilenames targetLocales.size %i, filenames.size %i".format(targetSize, filenames.size)); - var matchingFilenames = glob("%s_LOCALE*%s".doFormat(prefix, extension)); + var matchingFilenames = glob("%s_LOCALE*%s".format(prefix, extension)); var filesExist: bool = matchingFilenames.size > 0; if (mode == TRUNCATE || (mode == APPEND && !filesExist)) { @@ -201,7 +201,7 @@ module HDF5Msg { if file_id < 0 { // Negative file_id means error throw getErrorWithContext( - msg="The file %s cannot be created".doFormat(fn), + msg="The file %s cannot be created".format(fn), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -260,7 +260,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unsupported Index DType %s".doFormat(dtype2str(gse.dtype)), + msg="Unsupported Index DType %s".format(dtype2str(gse.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -283,7 +283,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unsupported ObjType %s".doFormat(objType: string), + msg="Unsupported ObjType %s".format(objType: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -302,7 +302,7 @@ module HDF5Msg { var del_status: int = C_HDF5.H5Ldelete(file_id, dset_name.localize().c_str(), C_HDF5.H5P_DEFAULT); if del_status < 0 { throw getErrorWithContext( - msg="Unable to overwrite dataset named %s in %s.".doFormat(dset_name, filename), + msg="Unable to overwrite dataset named %s in %s.".format(dset_name, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -311,7 +311,7 @@ module HDF5Msg { } else if dset_exists > 0 { throw getErrorWithContext( - msg=" Dataset named %s already exists in %s. If you would like to overwrite the group please use update_hdf.".doFormat(dset_name, filename), + msg=" Dataset named %s already exists in %s. If you would like to overwrite the group please use update_hdf.".format(dset_name, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -319,7 +319,7 @@ module HDF5Msg { } else if dset_exists < 0 { throw getErrorWithContext( - msg="Failure validating the status of dataset named %s.".doFormat(dset_name), + msg="Failure validating the status of dataset named %s.".format(dset_name), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -337,20 +337,20 @@ module HDF5Msg { var del_status: int = C_HDF5.H5Ldelete(file_id, group.localize().c_str(), C_HDF5.H5P_DEFAULT); if del_status < 0 { throw getErrorWithContext( - msg="Unable to overwrite group named %s in %s.".doFormat(group, filename), + msg="Unable to overwrite group named %s in %s.".format(group, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="RuntimeError"); } // recreate the group to write overwrite data too - var groupId: C_HDF5.hid_t = C_HDF5.H5Gcreate2(file_id, "/%s".doFormat(group).c_str(), + var groupId: C_HDF5.hid_t = C_HDF5.H5Gcreate2(file_id, "/%s".format(group).c_str(), C_HDF5.H5P_DEFAULT, C_HDF5.H5P_DEFAULT, C_HDF5.H5P_DEFAULT); C_HDF5.H5Gclose(groupId); } else if group_exists > 0 { throw getErrorWithContext( - msg="A group named %s already exists in %s. If you would like to overwrite the group please use update_hdf.".doFormat(group, filename), + msg="A group named %s already exists in %s. If you would like to overwrite the group please use update_hdf.".format(group, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -358,7 +358,7 @@ module HDF5Msg { } else if group_exists < 0 { throw getErrorWithContext( - msg="Failure validating the status of group named %s.".doFormat(group), + msg="Failure validating the status of group named %s.".format(group), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -366,7 +366,7 @@ module HDF5Msg { } else { // create the group - var groupId: C_HDF5.hid_t = C_HDF5.H5Gcreate2(file_id, "/%s".doFormat(group).c_str(), + var groupId: C_HDF5.hid_t = C_HDF5.H5Gcreate2(file_id, "/%s".format(group).c_str(), C_HDF5.H5P_DEFAULT, C_HDF5.H5P_DEFAULT, C_HDF5.H5P_DEFAULT); C_HDF5.H5Gclose(groupId); } @@ -701,7 +701,7 @@ module HDF5Msg { */ proc writeLocalDset(file_id: C_HDF5.hid_t, dset_name: string, A, dimension: int, type t) throws{ h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Writing dataset, %s".doFormat(dset_name)); + "Writing dataset, %s".format(dset_name)); // Convert the Chapel dtype to HDF5 var dtype_id: C_HDF5.hid_t = getDataType(t); @@ -717,7 +717,7 @@ module HDF5Msg { coforall (loc, idx) in zip(A.targetLocales(), filenames.domain) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -784,7 +784,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -843,8 +843,8 @@ module HDF5Msg { // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/Limb_%i".doFormat(dset_name, i), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/Limb_%i".doFormat(dset_name, i), objType, getDataType(uint)); + writeLocalDset(file_id, "%s/Limb_%i".format(dset_name, i), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/Limb_%i".format(dset_name, i), objType, getDataType(uint)); } } otherwise { @@ -894,7 +894,7 @@ module HDF5Msg { coforall (loc, idx) in zip(limbs[0].a.targetLocales(), filenames.domain) with (ref max_bits, ref num_limbs) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -912,7 +912,7 @@ module HDF5Msg { // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeDistDset(filenames, "/%s/Limb_%i".doFormat(dset_name, i), "pdarray", overwrite, l.a, st); + writeDistDset(filenames, "/%s/Limb_%i".format(dset_name, i), "pdarray", overwrite, l.a, st); } } otherwise { @@ -928,7 +928,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1013,7 +1013,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1066,8 +1066,8 @@ module HDF5Msg { // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/Limb_%i".doFormat(dset_name, i), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/Limb_%i".doFormat(dset_name, i), objType, getDataType(uint)); + writeLocalDset(file_id, "%s/Limb_%i".format(dset_name, i), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/Limb_%i".format(dset_name, i), objType, getDataType(uint)); } dtype = getHDF5Type(uint); } @@ -1117,7 +1117,7 @@ module HDF5Msg { coforall (loc, idx) in zip(limbs[0].a.targetLocales(), filenames.domain) with (ref max_bits, ref num_limbs) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -1133,7 +1133,7 @@ module HDF5Msg { // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeDistDset(filenames, "/%s/Limb_%i".doFormat(dset_name, i), "pdarray", overwrite, l.a, st); + writeDistDset(filenames, "/%s/Limb_%i".format(dset_name, i), "pdarray", overwrite, l.a, st); } } otherwise { @@ -1149,7 +1149,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1174,10 +1174,10 @@ module HDF5Msg { var zero = 0: uint(64); // create empty values dataset - C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".doFormat(group, SEGMENTED_VALUE_NAME).c_str(), 1, + C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".format(group, SEGMENTED_VALUE_NAME).c_str(), 1, c_ptrTo(zero), ctype, nil); - dset_id = C_HDF5.H5Dopen(fileId, "/%s/%s".doFormat(group, SEGMENTED_VALUE_NAME).c_str(), C_HDF5.H5P_DEFAULT); + dset_id = C_HDF5.H5Dopen(fileId, "/%s/%s".format(group, SEGMENTED_VALUE_NAME).c_str(), C_HDF5.H5P_DEFAULT); // Create the attribute space var attrSpaceId: C_HDF5.hid_t = C_HDF5.H5Screate(C_HDF5.H5S_SCALAR); @@ -1194,10 +1194,10 @@ module HDF5Msg { if (writeOffsets) { // create empty segments dataset - C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME).c_str(), 1, + C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".format(group, SEGMENTED_OFFSET_NAME).c_str(), 1, c_ptrTo(zero), getHDF5Type(int), nil); - dset_id = C_HDF5.H5Dopen(fileId, "/%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME).c_str(), C_HDF5.H5P_DEFAULT); + dset_id = C_HDF5.H5Dopen(fileId, "/%s/%s".format(group, SEGMENTED_OFFSET_NAME).c_str(), C_HDF5.H5P_DEFAULT); attrSpaceId = C_HDF5.H5Screate(C_HDF5.H5S_SCALAR); attr_id = C_HDF5.H5Acreate2(dset_id, "ObjType".c_str(), getHDF5Type(int), attrSpaceId, C_HDF5.H5P_DEFAULT, C_HDF5.H5P_DEFAULT); @@ -1226,10 +1226,10 @@ module HDF5Msg { */ private proc writeSegmentedComponentToHdf(fileId: int, group: string, component: string, ref items: [] ?etype) throws { var numItems = items.size: uint(64); - C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".doFormat(group, component).c_str(), 1, + C_HDF5.H5LTmake_dataset_WAR(fileId, "/%s/%s".format(group, component).c_str(), 1, c_ptrTo(numItems), getDataType(etype), c_ptrTo(items)); - writeArkoudaMetaData(fileId, "%s/%s".doFormat(group, component), "pdarray", getDataType(etype)); + writeArkoudaMetaData(fileId, "%s/%s".format(group, component), "pdarray", getDataType(etype)); } /* @@ -1258,7 +1258,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1282,7 +1282,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1293,36 +1293,36 @@ module HDF5Msg { proc writeSegmentedLocalDset(file_id: C_HDF5.hid_t, group: string, vals, segs, write_offsets: bool, type t, max_bits: int = -1) throws { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Writing group, %s".doFormat(group)); + "Writing group, %s".format(group)); var dtype_id: C_HDF5.hid_t = if t == bigint then getDataType(uint) else getDataType(t); if t == bigint { // SegArray with BigInt values var limbs = bigintToUint(vals); - writeBigIntMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), max_bits, limbs.size); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), "pdarray", dtype_id); + writeBigIntMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), max_bits, limbs.size); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), "pdarray", dtype_id); // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/%s/Limb_%i".doFormat(group, SEGMENTED_VALUE_NAME, i), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/%s/Limb_%i".doFormat(group, SEGMENTED_VALUE_NAME, i), "pdarray", getDataType(uint)); + writeLocalDset(file_id, "%s/%s/Limb_%i".format(group, SEGMENTED_VALUE_NAME, i), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/%s/Limb_%i".format(group, SEGMENTED_VALUE_NAME, i), "pdarray", getDataType(uint)); } } else { // SegArray with standard numeric or bool values or standard Strings entry var vd = vals.size:C_HDF5.hsize_t; var localVals: [0..#vals.size] t = vals.a; - C_HDF5.H5LTmake_dataset(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME).c_str(), 1:c_int, vd, dtype_id, c_ptrTo(localVals)); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), "pdarray", dtype_id); + C_HDF5.H5LTmake_dataset(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME).c_str(), 1:c_int, vd, dtype_id, c_ptrTo(localVals)); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), "pdarray", dtype_id); } if write_offsets { var localSegs: [0..#segs.size] int = segs.a; var sd = segs.size:C_HDF5.hsize_t; - C_HDF5.H5LTmake_dataset(file_id, "%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME).c_str(), 1:c_int, sd, getDataType(int), c_ptrTo(localSegs)); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME), "pdarray", getDataType(int)); + C_HDF5.H5LTmake_dataset(file_id, "%s/%s".format(group, SEGMENTED_OFFSET_NAME).c_str(), 1:c_int, sd, getDataType(int), c_ptrTo(localSegs)); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_OFFSET_NAME), "pdarray", getDataType(int)); } } @@ -1331,22 +1331,22 @@ module HDF5Msg { */ proc writeNestedSegmentedLocalDset(file_id: C_HDF5.hid_t, group: string, vals, segs, write_offsets: bool, type t) throws { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Writing group, %s".doFormat(group)); + "Writing group, %s".format(group)); var dtype_id: C_HDF5.hid_t = getDataType(t); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), "Strings", dtype_id); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), "Strings", dtype_id); // write the strings value object ref strVals = vals.bytesEntry; ref strSegs = vals.offsetsEntry; - writeSegmentedLocalDset(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), strVals, strSegs, write_offsets, t); + writeSegmentedLocalDset(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), strVals, strSegs, write_offsets, t); // write the offsets of the SegArray - This needs to always be written var localSegs: [0..#segs.size] int = segs.a; var sd = segs.size:C_HDF5.hsize_t; - C_HDF5.H5LTmake_dataset(file_id, "%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME).c_str(), 1:c_int, sd, getDataType(int), c_ptrTo(localSegs)); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_OFFSET_NAME), "pdarray", getDataType(int)); + C_HDF5.H5LTmake_dataset(file_id, "%s/%s".format(group, SEGMENTED_OFFSET_NAME).c_str(), 1:c_int, sd, getDataType(int), c_ptrTo(localSegs)); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_OFFSET_NAME), "pdarray", getDataType(int)); } proc writeSegmentedDistDset(filenames: [] string, group: string, objType: string, overwrite: bool, values, segments, st: borrowed SymTab, type t, max_bits: int = -1) throws { @@ -1356,7 +1356,7 @@ module HDF5Msg { var dtype: C_HDF5.hid_t = if t == bigint then getDataType(uint) else getDataType(t); const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -1373,7 +1373,7 @@ module HDF5Msg { if (locDom.isEmpty() || locDom.size <= 0) { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "write1DDistStringsAggregators: locale.id %i has empty locDom.size %i, will get empty dataset." - .doFormat(loc.id, locDom.size)); + .format(loc.id, locDom.size)); writeNilSegmentedGroupToHdf(file_id, group, true, dtype); } else { // write the segments @@ -1395,13 +1395,13 @@ module HDF5Msg { var limbs = bigintToUint(localVals); // create the group - validateGroup(file_id, localeFilename, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), false); // stored as group - group uses the dataset name - writeBigIntMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), max_bits, limbs.size); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), "pdarray", dtype); + validateGroup(file_id, localeFilename, "%s/%s".format(group, SEGMENTED_VALUE_NAME), false); // stored as group - group uses the dataset name + writeBigIntMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), max_bits, limbs.size); + writeArkoudaMetaData(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), "pdarray", dtype); // write limbs for (i, l) in zip(0..#limbs.size, limbs) { - writeSegmentedComponentToHdf(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), "Limb_%i".doFormat(i), l); + writeSegmentedComponentToHdf(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), "Limb_%i".format(i), l); } } else { @@ -1430,7 +1430,7 @@ module HDF5Msg { var dtype: C_HDF5.hid_t = getDataType(t); const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -1447,7 +1447,7 @@ module HDF5Msg { if (locDom.isEmpty() || locDom.size <= 0) { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "write1DDistStringsAggregators: locale.id %i has empty locDom.size %i, will get empty dataset." - .doFormat(loc.id, locDom.size)); + .format(loc.id, locDom.size)); writeNilSegmentedGroupToHdf(file_id, group, true, dtype); } else { // create local copy of the string offsets (values) according to the locality of the SegArray Segments @@ -1478,14 +1478,14 @@ module HDF5Msg { } // create the group for SegString components - write the segments and offsets - validateGroup(file_id, localeFilename, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), overwrite); + validateGroup(file_id, localeFilename, "%s/%s".format(group, SEGMENTED_VALUE_NAME), overwrite); localOffsets = localOffsets - startValIdx; - writeSegmentedComponentToHdf(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), SEGMENTED_OFFSET_NAME, localOffsets); - writeSegmentedComponentToHdf(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), SEGMENTED_VALUE_NAME, localVals); + writeSegmentedComponentToHdf(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), SEGMENTED_OFFSET_NAME, localOffsets); + writeSegmentedComponentToHdf(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), SEGMENTED_VALUE_NAME, localVals); } else { - validateGroup(file_id, localeFilename, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), overwrite); - writeNilSegmentedGroupToHdf(file_id, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), true, dtype); + validateGroup(file_id, localeFilename, "%s/%s".format(group, SEGMENTED_VALUE_NAME), overwrite); + writeNilSegmentedGroupToHdf(file_id, "%s/%s".format(group, SEGMENTED_VALUE_NAME), true, dtype); } } // write attributes for arkouda meta info @@ -1515,7 +1515,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1557,7 +1557,7 @@ module HDF5Msg { when (DType.BigInt) { var values = toSymEntry(valEnt, bigint); // create the group - validateGroup(file_id, f, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), overwrite); // stored as group - group uses the dataset name + validateGroup(file_id, f, "%s/%s".format(group, SEGMENTED_VALUE_NAME), overwrite); // stored as group - group uses the dataset name //localize values and write dataset writeSegmentedLocalDset(file_id, group, values, segments, true, bigint); dtype = getDataType(uint); @@ -1565,14 +1565,14 @@ module HDF5Msg { when (DType.Strings){ var values = toSegStringSymEntry(valEnt); // create the group - validateGroup(file_id, f, "%s/%s".doFormat(group, SEGMENTED_VALUE_NAME), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, SEGMENTED_VALUE_NAME), overwrite); //localize values and write dataset writeNestedSegmentedLocalDset(file_id, group, values, segments, true, uint(8)); dtype = getDataType(uint(8)); } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType %s".doFormat(dtype2str(valEnt.dtype)), + msg="Unsupported SegArray DType %s".format(dtype2str(valEnt.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1612,7 +1612,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType %s".doFormat(dtype2str(valEnt.dtype)), + msg="Unsupported SegArray DType %s".format(dtype2str(valEnt.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1622,7 +1622,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1634,18 +1634,18 @@ module HDF5Msg { proc writeLocalCategoricalRequiredData(file_id: C_HDF5.hid_t, f: string, group: string, codes, categories, naCodes, overwrite: bool) throws { // localize codes and write dataset var localCodes: [0..#codes.size] int = codes.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, CODES_NAME), c_ptrTo(localCodes), codes.size, int); + writeLocalDset(file_id, "/%s/%s".format(group, CODES_NAME), c_ptrTo(localCodes), codes.size, int); // ensure that the container for categories exists - validateGroup(file_id, f, "%s/%s".doFormat(group, CATEGORIES_NAME), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, CATEGORIES_NAME), overwrite); //localize categories values and write dataset - writeSegmentedLocalDset(file_id, "/%s/%s".doFormat(group, CATEGORIES_NAME), categories.values, categories.offsets, true, uint(8)); + writeSegmentedLocalDset(file_id, "/%s/%s".format(group, CATEGORIES_NAME), categories.values, categories.offsets, true, uint(8)); // localize _akNAcode and write to dset var localNACodes: [0..#naCodes.size] int = naCodes.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, NACODES_NAME), c_ptrTo(localNACodes), naCodes.size, int); + writeLocalDset(file_id, "/%s/%s".format(group, NACODES_NAME), c_ptrTo(localNACodes), naCodes.size, int); } proc writeLocalCategoricalOptionalData(file_id: C_HDF5.hid_t, group: string, permutation: string, segments: string, st: borrowed SymTab) throws { @@ -1654,14 +1654,14 @@ module HDF5Msg { // localize permutation and write dataset var localPerm: [0..#perm.size] int = perm.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, PERMUTATION_NAME), c_ptrTo(localPerm), perm.size, int); + writeLocalDset(file_id, "/%s/%s".format(group, PERMUTATION_NAME), c_ptrTo(localPerm), perm.size, int); var segment_entry = st.lookup(segments); var segs = toSymEntry(toGenSymEntry(segment_entry), int); // localize segments and write dataset var localSegs: [0..#segs.size] int = segs.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, SEGMENTS_NAME), c_ptrTo(localSegs), segs.size, int); + writeLocalDset(file_id, "/%s/%s".format(group, SEGMENTS_NAME), c_ptrTo(localSegs), segs.size, int); } proc categorical_tohdfMsg(msgArgs: borrowed MessageArgs, st: borrowed SymTab) throws { @@ -1695,7 +1695,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1723,7 +1723,7 @@ module HDF5Msg { coforall (loc, idx) in zip(codes.a.targetLocales(), filenames.domain) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -1736,13 +1736,13 @@ module HDF5Msg { } // write codes - writeDistDset(filenames, "/%s/%s".doFormat(group, CODES_NAME), "pdarray", overwrite, codes.a, st); + writeDistDset(filenames, "/%s/%s".format(group, CODES_NAME), "pdarray", overwrite, codes.a, st); // write categories - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); // write NA Codes - writeDistDset(filenames, "/%s/%s".doFormat(group, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); + writeDistDset(filenames, "/%s/%s".format(group, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); // writes perms and segs if they exist if perm_seg_exist { @@ -1750,13 +1750,13 @@ module HDF5Msg { var perm = toSymEntry(toGenSymEntry(perm_entry), int); var segment_entry = st.lookup(msgArgs.getValueOf("segments")); var segs = toSymEntry(toGenSymEntry(segment_entry), int); - writeDistDset(filenames, "/%s/%s".doFormat(group, PERMUTATION_NAME), "pdarray", overwrite, perm.a, st); - writeDistDset(filenames, "/%s/%s".doFormat(group, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); + writeDistDset(filenames, "/%s/%s".format(group, PERMUTATION_NAME), "pdarray", overwrite, perm.a, st); + writeDistDset(filenames, "/%s/%s".format(group, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); } } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1798,7 +1798,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1811,16 +1811,16 @@ module HDF5Msg { validateGroup(file_id, f, group, overwrite); var localseg: [0..#segments.size] int = segments.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, SEGMENTS_NAME), c_ptrTo(localseg), segments.size, int); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, SEGMENTS_NAME), "pdarray", getDataType(int)); + writeLocalDset(file_id, "/%s/%s".format(group, SEGMENTS_NAME), c_ptrTo(localseg), segments.size, int); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, SEGMENTS_NAME), "pdarray", getDataType(int)); var localperm: [0..#perm.size] int = perm.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, PERMUTATION_NAME), c_ptrTo(localperm), perm.size, int); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, PERMUTATION_NAME), "pdarray", getDataType(int)); + writeLocalDset(file_id, "/%s/%s".format(group, PERMUTATION_NAME), c_ptrTo(localperm), perm.size, int); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, PERMUTATION_NAME), "pdarray", getDataType(int)); var localuki: [0..#uki.size] int = uki.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, UKI_NAME), c_ptrTo(localuki), uki.size, int); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, UKI_NAME), "pdarray", getDataType(int)); + writeLocalDset(file_id, "/%s/%s".format(group, UKI_NAME), c_ptrTo(localuki), uki.size, int); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, UKI_NAME), "pdarray", getDataType(int)); // loop keys and create/write dataset for each for (i, name, ot, dt) in zip(0..#num_keys, key_names, key_objTypes, key_dtypes) { @@ -1834,7 +1834,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] int = key.a; - writeLocalDset(file_id, "/%s/KEY_%i".doFormat(group, i), c_ptrTo(localkey), key.size, int); + writeLocalDset(file_id, "/%s/KEY_%i".format(group, i), c_ptrTo(localkey), key.size, int); dtype = getDataType(int); } when DType.UInt64 { @@ -1843,7 +1843,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] uint = key.a; - writeLocalDset(file_id, "/%s/KEY_%i".doFormat(group, i), c_ptrTo(localkey), key.size, uint); + writeLocalDset(file_id, "/%s/KEY_%i".format(group, i), c_ptrTo(localkey), key.size, uint); dtype = getDataType(uint); } when DType.Float64 { @@ -1852,7 +1852,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] real = key.a; - writeLocalDset(file_id, "/%s/KEY_%i".doFormat(group, i), c_ptrTo(localkey), key.size, real); + writeLocalDset(file_id, "/%s/KEY_%i".format(group, i), c_ptrTo(localkey), key.size, real); dtype = getDataType(real); } when DType.Bool { @@ -1861,7 +1861,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] bool = key.a; - writeLocalDset(file_id, "/%s/KEY_%i".doFormat(group, i), c_ptrTo(localkey), key.size, bool); + writeLocalDset(file_id, "/%s/KEY_%i".format(group, i), c_ptrTo(localkey), key.size, bool); dtype = C_HDF5.H5T_NATIVE_HBOOL; } when DType.BigInt { @@ -1870,40 +1870,40 @@ module HDF5Msg { var limbs = bigintToUint(key); // create the group - validateGroup(file_id, f, "/%s/KEY_%i".doFormat(group, i), overwrite); // stored as group - group uses the dataset name + validateGroup(file_id, f, "/%s/KEY_%i".format(group, i), overwrite); // stored as group - group uses the dataset name var max_bits = key.max_bits; - writeBigIntMetaData(file_id, "/%s/KEY_%i".doFormat(group, i), max_bits, limbs.size); + writeBigIntMetaData(file_id, "/%s/KEY_%i".format(group, i), max_bits, limbs.size); // write limbs for (j, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/KEY_%i/Limb_%i".doFormat(group, i, j), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/KEY_%i/Limb_%i".doFormat(group, i, j), "pdarray", getDataType(uint)); + writeLocalDset(file_id, "%s/KEY_%i/Limb_%i".format(group, i, j), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/KEY_%i/Limb_%i".format(group, i, j), "pdarray", getDataType(uint)); } dtype = getDataType(uint); } otherwise { throw getErrorWithContext( - msg="Unsupported DType %s".doFormat(str2dtype(dt)), + msg="Unsupported DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="IllegalArgumentError"); } } - writeArkoudaMetaData(file_id, "/%s/KEY_%i".doFormat(group, i), "pdarray", dtype); + writeArkoudaMetaData(file_id, "/%s/KEY_%i".format(group, i), "pdarray", dtype); } when ObjType.STRINGS { // create/overwrite the group - validateGroup(file_id, f, "%s/KEY_%i".doFormat(group, i), overwrite); + validateGroup(file_id, f, "%s/KEY_%i".format(group, i), overwrite); var key_entry: SegStringSymEntry = toSegStringSymEntry(st.lookup(name)); var key = new SegString("", key_entry); - writeSegmentedLocalDset(file_id, "/%s/KEY_%i".doFormat(group, i), key.values, key.offsets, true, uint(8)); - writeArkoudaMetaData(file_id, "/%s/KEY_%i".doFormat(group, i), "Strings", getHDF5Type(uint(8))); + writeSegmentedLocalDset(file_id, "/%s/KEY_%i".format(group, i), key.values, key.offsets, true, uint(8)); + writeArkoudaMetaData(file_id, "/%s/KEY_%i".format(group, i), "Strings", getHDF5Type(uint(8))); } when ObjType.CATEGORICAL { // create/overwrite the group - validateGroup(file_id, f, "%s/KEY_%i".doFormat(group, i), overwrite); + validateGroup(file_id, f, "%s/KEY_%i".format(group, i), overwrite); var cat_comps = jsonToMap(name); var codes_entry = st.lookup(cat_comps["codes"]); var codes = toSymEntry(toGenSymEntry(codes_entry), int); @@ -1911,16 +1911,16 @@ module HDF5Msg { var cats = new SegString("", cat_entry); var naCodes_entry = st.lookup(cat_comps["NA_codes"]); var naCodes = toSymEntry(toGenSymEntry(naCodes_entry), int); - writeLocalCategoricalRequiredData(file_id, f, "%s/KEY_%i".doFormat(group, i), codes, cats, naCodes, overwrite); + writeLocalCategoricalRequiredData(file_id, f, "%s/KEY_%i".format(group, i), codes, cats, naCodes, overwrite); if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { - writeLocalCategoricalOptionalData(file_id, "%s/KEY_%i".doFormat(group, i), cat_comps["permutation"], cat_comps["segments"], st); + writeLocalCategoricalOptionalData(file_id, "%s/KEY_%i".format(group, i), cat_comps["permutation"], cat_comps["segments"], st); } - writeArkoudaMetaData(file_id, "/%s/KEY_%i".doFormat(group, i), "Categorical", getHDF5Type(uint(8))); + writeArkoudaMetaData(file_id, "/%s/KEY_%i".format(group, i), "Categorical", getHDF5Type(uint(8))); } otherwise { throw getErrorWithContext( - msg="Unsupported ObjType %s".doFormat(ot: string), + msg="Unsupported ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1940,7 +1940,7 @@ module HDF5Msg { coforall (loc, idx) in zip(perm.a.targetLocales(), filenames.domain) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -1953,13 +1953,13 @@ module HDF5Msg { } // write groupby.segments - writeDistDset(filenames, "/%s/%s".doFormat(group, SEGMENTS_NAME), "pdarray", overwrite, segments.a, st); + writeDistDset(filenames, "/%s/%s".format(group, SEGMENTS_NAME), "pdarray", overwrite, segments.a, st); //write groupby.permutation - writeDistDset(filenames, "/%s/%s".doFormat(group, PERMUTATION_NAME), "pdarray", overwrite, perm.a, st); + writeDistDset(filenames, "/%s/%s".format(group, PERMUTATION_NAME), "pdarray", overwrite, perm.a, st); // write groupby._uki - writeDistDset(filenames, "/%s/%s".doFormat(group, UKI_NAME), "pdarray", overwrite, uki.a, st); + writeDistDset(filenames, "/%s/%s".format(group, UKI_NAME), "pdarray", overwrite, uki.a, st); // loop keys and create/write dataset for each for (i, name, ot, dt) in zip(0..#num_keys, key_names, key_objTypes, key_dtypes) { @@ -1969,19 +1969,19 @@ module HDF5Msg { select str2dtype(dt) { when DType.Int64 { var e = toSymEntry(toGenSymEntry(entry), int); - writeDistDset(filenames, "%s/KEY_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/KEY_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.UInt64 { var e = toSymEntry(toGenSymEntry(entry), uint); - writeDistDset(filenames, "%s/KEY_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/KEY_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.Float64 { var e = toSymEntry(toGenSymEntry(entry), real); - writeDistDset(filenames, "%s/KEY_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/KEY_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.Bool { var e = toSymEntry(toGenSymEntry(entry), bool); - writeDistDset(filenames, "%s/KEY_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/KEY_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.BigInt { var e = toSymEntry(toGenSymEntry(entry), bigint); @@ -1993,7 +1993,7 @@ module HDF5Msg { coforall (loc, idx) in zip(limbs[0].a.targetLocales(), filenames.domain) with (ref max_bits, ref num_limbs) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -2001,20 +2001,20 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/KEY_%i".doFormat(group, i), overwrite); - writeBigIntMetaData(file_id, "%s/KEY_%i".doFormat(group, i), max_bits, num_limbs); - writeArkoudaMetaData(file_id, "%s/KEY_%i".doFormat(group, i), "pdarray", getDataType(uint)); + validateGroup(file_id, localeFilename, "%s/KEY_%i".format(group, i), overwrite); + writeBigIntMetaData(file_id, "%s/KEY_%i".format(group, i), max_bits, num_limbs); + writeArkoudaMetaData(file_id, "%s/KEY_%i".format(group, i), "pdarray", getDataType(uint)); } // write limbs for (j, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeDistDset(filenames, "/%s/KEY_%i/Limb_%i".doFormat(group, i, j), "pdarray", overwrite, l.a, st); + writeDistDset(filenames, "/%s/KEY_%i/Limb_%i".format(group, i, j), "pdarray", overwrite, l.a, st); } } otherwise { throw getErrorWithContext( - msg="Unsupported DType %s".doFormat(str2dtype(dt)), + msg="Unsupported DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2027,7 +2027,7 @@ module HDF5Msg { var segString = new SegString("", entry); var valEntry = segString.values; var segEntry = segString.offsets; - writeSegmentedDistDset(filenames, "/%s/KEY_%i".doFormat(group, i), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/KEY_%i".format(group, i), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); } when ObjType.CATEGORICAL { var cat_comps = jsonToMap(name); @@ -2047,18 +2047,18 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/KEY_%i".doFormat(group, i), overwrite); - writeArkoudaMetaData(file_id, "%s/KEY_%i".doFormat(group, i), ot:string, getHDF5Type(uint(8))); + validateGroup(file_id, localeFilename, "%s/KEY_%i".format(group, i), overwrite); + writeArkoudaMetaData(file_id, "%s/KEY_%i".format(group, i), ot:string, getHDF5Type(uint(8))); } // write codes - writeDistDset(filenames, "/%s/KEY_%i/%s".doFormat(group, i, CODES_NAME), "pdarray", overwrite, codes.a, st); + writeDistDset(filenames, "/%s/KEY_%i/%s".format(group, i, CODES_NAME), "pdarray", overwrite, codes.a, st); // write categories - writeSegmentedDistDset(filenames, "/%s/KEY_%i/%s".doFormat(group, i, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/KEY_%i/%s".format(group, i, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); // write NA Codes - writeDistDset(filenames,"/%s/KEY_%i/%s".doFormat(group, i, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); + writeDistDset(filenames,"/%s/KEY_%i/%s".format(group, i, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); // writes perms and segs if they exist if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { @@ -2066,13 +2066,13 @@ module HDF5Msg { var cat_perm = toSymEntry(toGenSymEntry(cat_perm_entry), int); var segment_entry = st.lookup(cat_comps["segments"]); var segs = toSymEntry(toGenSymEntry(segment_entry), int); - writeDistDset(filenames, "/%s/KEY_%i/%s".doFormat(group, i, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); - writeDistDset(filenames, "/%s/KEY_%i/%s".doFormat(group, i, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); + writeDistDset(filenames, "/%s/KEY_%i/%s".format(group, i, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); + writeDistDset(filenames, "/%s/KEY_%i/%s".format(group, i, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); } } otherwise { throw getErrorWithContext( - msg="Unsupported ObjType %s".doFormat(ot: string), + msg="Unsupported ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2083,7 +2083,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2120,7 +2120,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -2136,32 +2136,32 @@ module HDF5Msg { when DType.Int64 { var idx_col = toSymEntry(idx_gen, int); var localIdx: [0..#idx_col.size] int = idx_col.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, int); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", getDataType(int)); + writeLocalDset(file_id, "/%s/%s".format(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, int); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, INDEX_NAME), "pdarray", getDataType(int)); } when DType.UInt64 { var idx_col = toSymEntry(idx_gen, uint); var localIdx: [0..#idx_col.size] uint = idx_col.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, uint); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", getDataType(uint)); + writeLocalDset(file_id, "/%s/%s".format(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, uint); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, INDEX_NAME), "pdarray", getDataType(uint)); } when DType.Float64 { var idx_col = toSymEntry(idx_gen, real); var localIdx: [0..#idx_col.size] real = idx_col.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, real); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", getDataType(real)); + writeLocalDset(file_id, "/%s/%s".format(group, INDEX_NAME), c_ptrTo(localIdx), idx_col.size, real); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, INDEX_NAME), "pdarray", getDataType(real)); } when DType.Strings { // ensure that the container for index exists - validateGroup(file_id, f, "%s/%s".doFormat(group, INDEX_NAME), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, INDEX_NAME), overwrite); var key_entry: SegStringSymEntry = toSegStringSymEntry(idx_gen); var idx_col = new SegString("", key_entry); - writeSegmentedLocalDset(file_id, "/%s/%s".doFormat(group, INDEX_NAME), idx_col.values, idx_col.offsets, true, uint(8)); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, INDEX_NAME), "Strings", getHDF5Type(uint(8))); + writeSegmentedLocalDset(file_id, "/%s/%s".format(group, INDEX_NAME), idx_col.values, idx_col.offsets, true, uint(8)); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, INDEX_NAME), "Strings", getHDF5Type(uint(8))); } otherwise { throw getErrorWithContext( - msg="Unsupported Index DType %s".doFormat(dtype2str(idx_gen.dtype)), + msg="Unsupported Index DType %s".format(dtype2str(idx_gen.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2181,7 +2181,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] int = key.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, dset), c_ptrTo(localkey), key.size, int); + writeLocalDset(file_id, "/%s/%s".format(group, dset), c_ptrTo(localkey), key.size, int); dtype = getDataType(int); } when DType.UInt64 { @@ -2190,7 +2190,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] uint = key.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, dset), c_ptrTo(localkey), key.size, uint); + writeLocalDset(file_id, "/%s/%s".format(group, dset), c_ptrTo(localkey), key.size, uint); dtype = getDataType(uint); } when DType.Float64 { @@ -2199,7 +2199,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] real = key.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, dset), c_ptrTo(localkey), key.size, real); + writeLocalDset(file_id, "/%s/%s".format(group, dset), c_ptrTo(localkey), key.size, real); dtype = getDataType(real); } when DType.Bool { @@ -2208,7 +2208,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] bool = key.a; - writeLocalDset(file_id, "/%s/%s".doFormat(group, dset), c_ptrTo(localkey), key.size, bool); + writeLocalDset(file_id, "/%s/%s".format(group, dset), c_ptrTo(localkey), key.size, bool); dtype = getDataType(bool); } when DType.BigInt { @@ -2217,40 +2217,40 @@ module HDF5Msg { var limbs = bigintToUint(key); // create the group - validateGroup(file_id, f, "/%s/%s".doFormat(group, dset), overwrite); // stored as group - group uses the dataset name + validateGroup(file_id, f, "/%s/%s".format(group, dset), overwrite); // stored as group - group uses the dataset name var max_bits = key.max_bits; - writeBigIntMetaData(file_id, "/%s/%s".doFormat(group, dset), max_bits, limbs.size); + writeBigIntMetaData(file_id, "/%s/%s".format(group, dset), max_bits, limbs.size); // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/%s/Limb_%i".doFormat(group, dset, i), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/%s/Limb_%i".doFormat(group, dset, i), "pdarray", getDataType(uint)); + writeLocalDset(file_id, "%s/%s/Limb_%i".format(group, dset, i), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/%s/Limb_%i".format(group, dset, i), "pdarray", getDataType(uint)); } dtype = getDataType(uint); } otherwise { throw getErrorWithContext( - msg="Unsupported pdarray DType %s".doFormat(str2dtype(dt)), + msg="Unsupported pdarray DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="IllegalArgumentError"); } } - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, dset), ot, dtype); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, dset), ot, dtype); } when ObjType.STRINGS { // create/overwrite the group - validateGroup(file_id, f, "%s/%s".doFormat(group, dset), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, dset), overwrite); var key_entry: SegStringSymEntry = toSegStringSymEntry(st.lookup(name)); var key = new SegString("", key_entry); - writeSegmentedLocalDset(file_id, "/%s/%s".doFormat(group, dset), key.values, key.offsets, true, uint(8)); - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, dset), "Strings", getHDF5Type(uint(8))); + writeSegmentedLocalDset(file_id, "/%s/%s".format(group, dset), key.values, key.offsets, true, uint(8)); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, dset), "Strings", getHDF5Type(uint(8))); } when ObjType.CATEGORICAL { // create/overwrite the group - validateGroup(file_id, f, "%s/%s".doFormat(group, dset), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, dset), overwrite); var cat_comps = jsonToMap(name); var codes_entry = st.lookup(cat_comps["codes"]); var codes = toSymEntry(toGenSymEntry(codes_entry), int); @@ -2258,15 +2258,15 @@ module HDF5Msg { var cats = new SegString("", cat_entry); var naCodes_entry = st.lookup(cat_comps["NA_codes"]); var naCodes = toSymEntry(toGenSymEntry(naCodes_entry), int); - writeLocalCategoricalRequiredData(file_id, f, "%s/%s".doFormat(group, dset), codes, cats, naCodes, overwrite); + writeLocalCategoricalRequiredData(file_id, f, "%s/%s".format(group, dset), codes, cats, naCodes, overwrite); if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { - writeLocalCategoricalOptionalData(file_id, "%s/%s".doFormat(group, dset), cat_comps["permutation"], cat_comps["segments"], st); + writeLocalCategoricalOptionalData(file_id, "%s/%s".format(group, dset), cat_comps["permutation"], cat_comps["segments"], st); } - writeArkoudaMetaData(file_id, "/%s/%s".doFormat(group, dset), "Categorical", getHDF5Type(uint(8))); + writeArkoudaMetaData(file_id, "/%s/%s".format(group, dset), "Categorical", getHDF5Type(uint(8))); } when ObjType.SEGARRAY { - validateGroup(file_id, f, "%s/%s".doFormat(group, dset), overwrite); + validateGroup(file_id, f, "%s/%s".format(group, dset), overwrite); var sa_comps = jsonToMap(name); var segments = toSymEntry(toGenSymEntry(st.lookup(sa_comps["segments"])), int); @@ -2276,31 +2276,31 @@ module HDF5Msg { when DType.Int64 { var values = toSymEntry(vals_entry, int); //localize values and write dataset - writeSegmentedLocalDset(file_id, "%s/%s".doFormat(group, dset), values, segments, true, int); + writeSegmentedLocalDset(file_id, "%s/%s".format(group, dset), values, segments, true, int); dtype = getDataType(int); } when DType.UInt64 { var values = toSymEntry(vals_entry, uint); //localize values and write dataset - writeSegmentedLocalDset(file_id, "%s/%s".doFormat(group, dset), values, segments, true, uint); + writeSegmentedLocalDset(file_id, "%s/%s".format(group, dset), values, segments, true, uint); dtype = getDataType(uint); } when DType.Float64 { var values = toSymEntry(vals_entry, real); //localize values and write dataset - writeSegmentedLocalDset(file_id, "%s/%s".doFormat(group, dset), values, segments, true, real); + writeSegmentedLocalDset(file_id, "%s/%s".format(group, dset), values, segments, true, real); dtype = getDataType(real); } when DType.Bool { var values = toSymEntry(vals_entry, bool); //localize values and write dataset - writeSegmentedLocalDset(file_id, "%s/%s".doFormat(group, dset), values, segments, true, bool); + writeSegmentedLocalDset(file_id, "%s/%s".format(group, dset), values, segments, true, bool); dtype = getDataType(bool); } when (DType.BigInt) { var values = toSymEntry(vals_entry, bigint); // create the group - validateGroup(file_id, f, "%s/%s/%s".doFormat(group, dset, SEGMENTED_VALUE_NAME), overwrite); // stored as group - group uses the dataset name + validateGroup(file_id, f, "%s/%s/%s".format(group, dset, SEGMENTED_VALUE_NAME), overwrite); // stored as group - group uses the dataset name //localize values and write dataset writeSegmentedLocalDset(file_id, group, values, segments, true, bigint); dtype = getDataType(uint); @@ -2308,14 +2308,14 @@ module HDF5Msg { when (DType.Strings){ var values = toSegStringSymEntry(vals_entry); // create the group - validateGroup(file_id, f, "%s/%s/%s".doFormat(group, dset, SEGMENTED_VALUE_NAME), overwrite); + validateGroup(file_id, f, "%s/%s/%s".format(group, dset, SEGMENTED_VALUE_NAME), overwrite); //localize values and write dataset - writeNestedSegmentedLocalDset(file_id, "%s/%s".doFormat(group, dset), values, segments, true, uint(8)); + writeNestedSegmentedLocalDset(file_id, "%s/%s".format(group, dset), values, segments, true, uint(8)); dtype = getDataType(uint(8)); } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType %s".doFormat(str2dtype(dt)), + msg="Unsupported SegArray DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2326,7 +2326,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unsupported ObjType %s".doFormat(ot: string), + msg="Unsupported ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2346,7 +2346,7 @@ module HDF5Msg { coforall (loc, idx) in zip(Locales, filenames.domain) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -2361,26 +2361,26 @@ module HDF5Msg { select idx_gen.dtype { when DType.Int64 { var idx_col = toSymEntry(idx_gen, int); - writeDistDset(filenames, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); + writeDistDset(filenames, "/%s/%s".format(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); } when DType.UInt64 { var idx_col = toSymEntry(idx_gen, uint); - writeDistDset(filenames, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); + writeDistDset(filenames, "/%s/%s".format(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); } when DType.Float64 { var idx_col = toSymEntry(idx_gen, real); - writeDistDset(filenames, "/%s/%s".doFormat(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); + writeDistDset(filenames, "/%s/%s".format(group, INDEX_NAME), "pdarray", overwrite, idx_col.a, st); } when DType.Strings { var key_entry: SegStringSymEntry = toSegStringSymEntry(idx_gen); var idx_col = new SegString("", key_entry); var valEntry = idx_col.values; var segEntry = idx_col.offsets; - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, INDEX_NAME), "Strings", overwrite, valEntry.a, segEntry.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, INDEX_NAME), "Strings", overwrite, valEntry.a, segEntry.a, st, uint(8)); } otherwise { throw getErrorWithContext( - msg="Unsupported Index DType %s".doFormat(dtype2str(idx_gen.dtype)), + msg="Unsupported Index DType %s".format(dtype2str(idx_gen.dtype)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2396,19 +2396,19 @@ module HDF5Msg { select str2dtype(dt) { when DType.Int64 { var e = toSymEntry(toGenSymEntry(entry), int); - writeDistDset(filenames, "%s/%s".doFormat(group, dset), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/%s".format(group, dset), ot: string, overwrite, e.a, st); } when DType.UInt64 { var e = toSymEntry(toGenSymEntry(entry), uint); - writeDistDset(filenames, "%s/%s".doFormat(group, dset), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/%s".format(group, dset), ot: string, overwrite, e.a, st); } when DType.Float64 { var e = toSymEntry(toGenSymEntry(entry), real); - writeDistDset(filenames, "%s/%s".doFormat(group, dset), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/%s".format(group, dset), ot: string, overwrite, e.a, st); } when DType.Bool { var e = toSymEntry(toGenSymEntry(entry), bool); - writeDistDset(filenames, "%s/%s".doFormat(group, dset), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/%s".format(group, dset), ot: string, overwrite, e.a, st); } when DType.BigInt { var e = toSymEntry(toGenSymEntry(entry), bigint); @@ -2420,7 +2420,7 @@ module HDF5Msg { coforall (loc, idx) in zip(limbs[0].a.targetLocales(), filenames.domain) with (ref max_bits, ref num_limbs) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -2428,20 +2428,20 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/%s".doFormat(group, dset), overwrite); - writeBigIntMetaData(file_id, "%s/%s".doFormat(group, dset), max_bits, num_limbs); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, dset), "pdarray", getDataType(uint)); + validateGroup(file_id, localeFilename, "%s/%s".format(group, dset), overwrite); + writeBigIntMetaData(file_id, "%s/%s".format(group, dset), max_bits, num_limbs); + writeArkoudaMetaData(file_id, "%s/%s".format(group, dset), "pdarray", getDataType(uint)); } // write limbs for (i, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeDistDset(filenames, "/%s/%s/Limb_%i".doFormat(group, dset, i), "pdarray", overwrite, l.a, st); + writeDistDset(filenames, "/%s/%s/Limb_%i".format(group, dset, i), "pdarray", overwrite, l.a, st); } } otherwise { throw getErrorWithContext( - msg="Unsupported DType %s".doFormat(str2dtype(dt)), + msg="Unsupported DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2454,7 +2454,7 @@ module HDF5Msg { var segString = new SegString("", entry); var valEntry = segString.values; var segEntry = segString.offsets; - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); } when ObjType.CATEGORICAL { var cat_comps = jsonToMap(name); @@ -2474,18 +2474,18 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/%s".doFormat(group, dset), overwrite); - writeArkoudaMetaData(file_id, "%s/%s".doFormat(group, dset), ot:string, getHDF5Type(uint(8))); + validateGroup(file_id, localeFilename, "%s/%s".format(group, dset), overwrite); + writeArkoudaMetaData(file_id, "%s/%s".format(group, dset), ot:string, getHDF5Type(uint(8))); } // write codes - writeDistDset(filenames, "/%s/%s/%s".doFormat(group, dset, CODES_NAME), "pdarray", overwrite, codes.a, st); + writeDistDset(filenames, "/%s/%s/%s".format(group, dset, CODES_NAME), "pdarray", overwrite, codes.a, st); // write categories - writeSegmentedDistDset(filenames, "/%s/%s/%s".doFormat(group, dset, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/%s/%s".format(group, dset, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); // write NA Codes - writeDistDset(filenames,"/%s/%s/%s".doFormat(group, dset, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); + writeDistDset(filenames,"/%s/%s/%s".format(group, dset, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); // writes perms and segs if they exist if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { @@ -2493,8 +2493,8 @@ module HDF5Msg { var cat_perm = toSymEntry(toGenSymEntry(cat_perm_entry), int); var segment_entry = st.lookup(cat_comps["segments"]); var segs = toSymEntry(toGenSymEntry(segment_entry), int); - writeDistDset(filenames, "/%s/%s/%s".doFormat(group, dset, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); - writeDistDset(filenames, "/%s/%s/%s".doFormat(group, dset, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); + writeDistDset(filenames, "/%s/%s/%s".format(group, dset, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); + writeDistDset(filenames, "/%s/%s/%s".format(group, dset, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); } } when ObjType.SEGARRAY { @@ -2505,31 +2505,31 @@ module HDF5Msg { select vals_entry.dtype { when DType.Int64 { var values = toSymEntry(vals_entry, int); - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values.a, segments.a, st, int); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values.a, segments.a, st, int); } when DType.UInt64 { var values = toSymEntry(vals_entry, uint); - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values.a, segments.a, st, uint); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values.a, segments.a, st, uint); } when DType.Float64 { var values = toSymEntry(vals_entry, real); - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values.a, segments.a, st, real); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values.a, segments.a, st, real); } when DType.Bool { var values = toSymEntry(vals_entry, bool); - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values.a, segments.a, st, bool); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values.a, segments.a, st, bool); } when DType.BigInt { var values = toSymEntry(vals_entry, bigint); - writeSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values.a, segments.a, st, bigint, values.max_bits); + writeSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values.a, segments.a, st, bigint, values.max_bits); } when DType.Strings { var values = toSegStringSymEntry(vals_entry); - writeNestedSegmentedDistDset(filenames, "/%s/%s".doFormat(group, dset), ot: string, overwrite, values, segments.a, st, uint(8)); + writeNestedSegmentedDistDset(filenames, "/%s/%s".format(group, dset), ot: string, overwrite, values, segments.a, st, uint(8)); } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType %s".doFormat(str2dtype(dt)), + msg="Unsupported SegArray DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2539,7 +2539,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unsupported ObjType %s".doFormat(ot: string), + msg="Unsupported ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2551,7 +2551,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2584,7 +2584,7 @@ module HDF5Msg { var file_id = C_HDF5.H5Fopen(f.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); - var errorMsg = "Failure accessing file %s.".doFormat(f); + var errorMsg = "Failure accessing file %s.".format(f); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -2606,7 +2606,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] int = key.a; - writeLocalDset(file_id, "/%s/IDX_%i".doFormat(group, i), c_ptrTo(localkey), key.size, int); + writeLocalDset(file_id, "/%s/IDX_%i".format(group, i), c_ptrTo(localkey), key.size, int); dtype = getDataType(int); } when DType.UInt64 { @@ -2615,7 +2615,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] uint = key.a; - writeLocalDset(file_id, "/%s/IDX_%i".doFormat(group, i), c_ptrTo(localkey), key.size, uint); + writeLocalDset(file_id, "/%s/IDX_%i".format(group, i), c_ptrTo(localkey), key.size, uint); dtype = getDataType(uint); } when DType.Float64 { @@ -2624,7 +2624,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] real = key.a; - writeLocalDset(file_id, "/%s/IDX_%i".doFormat(group, i), c_ptrTo(localkey), key.size, real); + writeLocalDset(file_id, "/%s/IDX_%i".format(group, i), c_ptrTo(localkey), key.size, real); dtype = getDataType(real); } when DType.Bool { @@ -2633,7 +2633,7 @@ module HDF5Msg { // localize permutation and write dataset var localkey: [0..#key.size] bool = key.a; - writeLocalDset(file_id, "/%s/IDX_%i".doFormat(group, i), c_ptrTo(localkey), key.size, bool); + writeLocalDset(file_id, "/%s/IDX_%i".format(group, i), c_ptrTo(localkey), key.size, bool); dtype = getDataType(bool); } when DType.BigInt { @@ -2642,21 +2642,21 @@ module HDF5Msg { var limbs = bigintToUint(key); // create the group - validateGroup(file_id, f, "/%s/IDX_%i".doFormat(group, i), overwrite); // stored as group - group uses the dataset name + validateGroup(file_id, f, "/%s/IDX_%i".format(group, i), overwrite); // stored as group - group uses the dataset name var max_bits = key.max_bits; - writeBigIntMetaData(file_id, "/%s/IDX_%i".doFormat(group, i), max_bits, limbs.size); + writeBigIntMetaData(file_id, "/%s/IDX_%i".format(group, i), max_bits, limbs.size); // write limbs for (j, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeLocalDset(file_id, "%s/IDX_%i/Limb_%i".doFormat(group, i, j), c_ptrTo(local_limb), l.size, uint); - writeArkoudaMetaData(file_id, "%s/IDX_%i/Limb_%i".doFormat(group, i, j), "pdarray", getDataType(uint)); + writeLocalDset(file_id, "%s/IDX_%i/Limb_%i".format(group, i, j), c_ptrTo(local_limb), l.size, uint); + writeArkoudaMetaData(file_id, "%s/IDX_%i/Limb_%i".format(group, i, j), "pdarray", getDataType(uint)); } dtype = getDataType(uint); } otherwise { throw getErrorWithContext( - msg="Unsupported pdarray DType %s".doFormat(str2dtype(dt)), + msg="Unsupported pdarray DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2666,15 +2666,15 @@ module HDF5Msg { } when ObjType.STRINGS { // create/overwrite the group - validateGroup(file_id, f, "%s/IDX_%i".doFormat(group, i), overwrite); + validateGroup(file_id, f, "%s/IDX_%i".format(group, i), overwrite); var key_entry: SegStringSymEntry = toSegStringSymEntry(st.lookup(name)); var key = new SegString("", key_entry); - writeSegmentedLocalDset(file_id, "/%s/IDX_%i".doFormat(group, i), key.values, key.offsets, true, uint(8)); - writeArkoudaMetaData(file_id, "/%s/IDX_%i".doFormat(group, i), "Strings", getHDF5Type(uint(8))); + writeSegmentedLocalDset(file_id, "/%s/IDX_%i".format(group, i), key.values, key.offsets, true, uint(8)); + writeArkoudaMetaData(file_id, "/%s/IDX_%i".format(group, i), "Strings", getHDF5Type(uint(8))); } when ObjType.CATEGORICAL { // create/overwrite the group - validateGroup(file_id, f, "%s/IDX_%i".doFormat(group, i), overwrite); + validateGroup(file_id, f, "%s/IDX_%i".format(group, i), overwrite); var cat_comps = jsonToMap(name); var codes_entry = st.lookup(cat_comps["codes"]); var codes = toSymEntry(toGenSymEntry(codes_entry), int); @@ -2682,16 +2682,16 @@ module HDF5Msg { var cats = new SegString("", cat_entry); var naCodes_entry = st.lookup(cat_comps["NA_codes"]); var naCodes = toSymEntry(toGenSymEntry(naCodes_entry), int); - writeLocalCategoricalRequiredData(file_id, f, "%s/IDX_%i".doFormat(group, i), codes, cats, naCodes, overwrite); + writeLocalCategoricalRequiredData(file_id, f, "%s/IDX_%i".format(group, i), codes, cats, naCodes, overwrite); if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { - writeLocalCategoricalOptionalData(file_id, "%s/IDX_%i".doFormat(group, i), cat_comps["permutation"], cat_comps["segments"], st); + writeLocalCategoricalOptionalData(file_id, "%s/IDX_%i".format(group, i), cat_comps["permutation"], cat_comps["segments"], st); } - writeArkoudaMetaData(file_id, "/%s/IDX_%i".doFormat(group, i), "Categorical", getHDF5Type(uint(8))); + writeArkoudaMetaData(file_id, "/%s/IDX_%i".format(group, i), "Categorical", getHDF5Type(uint(8))); } otherwise { throw getErrorWithContext( - msg="Unsupported Index ObjType %s".doFormat(ot: string), + msg="Unsupported Index ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2709,7 +2709,7 @@ module HDF5Msg { coforall (loc, idx) in zip(Locales, filenames.domain) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -2727,19 +2727,19 @@ module HDF5Msg { select str2dtype(dt) { when DType.Int64 { var e = toSymEntry(toGenSymEntry(entry), int); - writeDistDset(filenames, "%s/IDX_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/IDX_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.UInt64 { var e = toSymEntry(toGenSymEntry(entry), uint); - writeDistDset(filenames, "%s/IDX_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/IDX_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.Float64 { var e = toSymEntry(toGenSymEntry(entry), real); - writeDistDset(filenames, "%s/IDX_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/IDX_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.Bool { var e = toSymEntry(toGenSymEntry(entry), bool); - writeDistDset(filenames, "%s/IDX_%i".doFormat(group, i), ot: string, overwrite, e.a, st); + writeDistDset(filenames, "%s/IDX_%i".format(group, i), ot: string, overwrite, e.a, st); } when DType.BigInt { var e = toSymEntry(toGenSymEntry(entry), bigint); @@ -2751,7 +2751,7 @@ module HDF5Msg { coforall (loc, idx) in zip(limbs[0].a.targetLocales(), filenames.domain) with (ref max_bits, ref num_limbs) do on loc { const localeFilename = filenames[idx]; h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s exists? %?".doFormat(localeFilename, exists(localeFilename))); + "%s exists? %?".format(localeFilename, exists(localeFilename))); var file_id = C_HDF5.H5Fopen(localeFilename.c_str(), C_HDF5.H5F_ACC_RDWR, C_HDF5.H5P_DEFAULT); defer { // Close the file on scope exit @@ -2759,20 +2759,20 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/IDX_%i".doFormat(group, i), overwrite); - writeBigIntMetaData(file_id, "%s/IDX_%i".doFormat(group, i), max_bits, num_limbs); - writeArkoudaMetaData(file_id, "%s/IDX_%i".doFormat(group, i), "pdarray", getDataType(uint)); + validateGroup(file_id, localeFilename, "%s/IDX_%i".format(group, i), overwrite); + writeBigIntMetaData(file_id, "%s/IDX_%i".format(group, i), max_bits, num_limbs); + writeArkoudaMetaData(file_id, "%s/IDX_%i".format(group, i), "pdarray", getDataType(uint)); } // write limbs for (j, l) in zip(0..#limbs.size, limbs) { var local_limb: [0..#l.size] uint = l.a; - writeDistDset(filenames, "/%s/IDX_%i/Limb_%i".doFormat(group, i, j), "pdarray", overwrite, l.a, st); + writeDistDset(filenames, "/%s/IDX_%i/Limb_%i".format(group, i, j), "pdarray", overwrite, l.a, st); } } otherwise { throw getErrorWithContext( - msg="Unsupported DType %s".doFormat(str2dtype(dt)), + msg="Unsupported DType %s".format(str2dtype(dt)), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2785,7 +2785,7 @@ module HDF5Msg { var segString = new SegString("", entry); var valEntry = segString.values; var segEntry = segString.offsets; - writeSegmentedDistDset(filenames, "/%s/IDX_%i".doFormat(group, i), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/IDX_%i".format(group, i), ot: string, overwrite, valEntry.a, segEntry.a, st, uint(8)); } when ObjType.CATEGORICAL { var cat_comps = jsonToMap(name); @@ -2805,18 +2805,18 @@ module HDF5Msg { } // create the group and generate metadata - validateGroup(file_id, localeFilename, "%s/IDX_%i".doFormat(group, i), overwrite); - writeArkoudaMetaData(file_id, "%s/IDX_%i".doFormat(group, i), ot:string, getHDF5Type(uint(8))); + validateGroup(file_id, localeFilename, "%s/IDX_%i".format(group, i), overwrite); + writeArkoudaMetaData(file_id, "%s/IDX_%i".format(group, i), ot:string, getHDF5Type(uint(8))); } // write codes - writeDistDset(filenames, "/%s/IDX_%i/%s".doFormat(group, i, CODES_NAME), "pdarray", overwrite, codes.a, st); + writeDistDset(filenames, "/%s/IDX_%i/%s".format(group, i, CODES_NAME), "pdarray", overwrite, codes.a, st); // write categories - writeSegmentedDistDset(filenames, "/%s/IDX_%i/%s".doFormat(group, i, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); + writeSegmentedDistDset(filenames, "/%s/IDX_%i/%s".format(group, i, CATEGORIES_NAME), "strings", overwrite, cats.values.a, cats.offsets.a, st, uint(8)); // write NA Codes - writeDistDset(filenames,"/%s/IDX_%i/%s".doFormat(group, i, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); + writeDistDset(filenames,"/%s/IDX_%i/%s".format(group, i, NACODES_NAME), "pdarray", overwrite, naCodes.a, st); // writes perms and segs if they exist if cat_comps.contains["permutation"] && cat_comps.contains["segments"] { @@ -2824,13 +2824,13 @@ module HDF5Msg { var cat_perm = toSymEntry(toGenSymEntry(cat_perm_entry), int); var segment_entry = st.lookup(cat_comps["segments"]); var segs = toSymEntry(toGenSymEntry(segment_entry), int); - writeDistDset(filenames, "/%s/IDX_%i/%s".doFormat(group, i, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); - writeDistDset(filenames, "/%s/IDX_%i/%s".doFormat(group, i, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); + writeDistDset(filenames, "/%s/IDX_%i/%s".format(group, i, PERMUTATION_NAME), "pdarray", overwrite, cat_perm.a, st); + writeDistDset(filenames, "/%s/IDX_%i/%s".format(group, i, SEGMENTS_NAME), "pdarray", overwrite, segs.a, st); } } otherwise { throw getErrorWithContext( - msg="Unsupported Index ObjType %s".doFormat(ot: string), + msg="Unsupported Index ObjType %s".format(ot: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2841,7 +2841,7 @@ module HDF5Msg { } otherwise { throw getErrorWithContext( - msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".doFormat(file_format), + msg="Unknown file format. Expecting 0 (single file) or 1 (file per locale). Found %i".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -2889,7 +2889,7 @@ module HDF5Msg { index_tohdfMsg(msgArgs, st); } otherwise { - var errorMsg = "Unable to write object type %s to HDF5 file.".doFormat(objType); + var errorMsg = "Unable to write object type %s to HDF5 file.".format(objType); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -2913,7 +2913,7 @@ module HDF5Msg { } var errorMsg="%s cannot be opened to check if hdf5, \ - check file permissions or format".doFormat(filename); + check file permissions or format".format(filename); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -2996,10 +2996,10 @@ module HDF5Msg { // Attempt to interpret filename as a glob expression and ls the first result var tmp = glob(filename); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob-expanded filename: %s to size: %i files".doFormat(filename, tmp.size)); + "glob-expanded filename: %s to size: %i files".format(filename, tmp.size)); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -3010,13 +3010,13 @@ module HDF5Msg { // Check to see if the file exists. If not, return an error message if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if !isHdf5File(filename) { - var errorMsg = "File %s is not an HDF5 file".doFormat(filename); + var errorMsg = "File %s is not an HDF5 file".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -3030,7 +3030,7 @@ module HDF5Msg { repMsg = formatJson(items); } catch e : Error { - var errorMsg = "Failed to process HDF5 file %?".doFormat(e.message()); + var errorMsg = "Failed to process HDF5 file %?".format(e.message()); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -3051,7 +3051,7 @@ module HDF5Msg { if !isValid { skips.add(filename); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Adding invalid file to skips, %s".doFormat(filename)); + "Adding invalid file to skips, %s".format(filename)); continue; } var file_id = C_HDF5.H5Fopen(filename.c_str(), C_HDF5.H5F_ACC_RDONLY, @@ -3069,12 +3069,12 @@ module HDF5Msg { if lengths[i] == 0 { skips.add(filename); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Adding filename:%s to skips, dsetName:%s, dims[0]:%?".doFormat(filename, dsetName, dims[0])); + "Adding filename:%s to skips, dsetName:%s, dims[0]:%?".format(filename, dsetName, dims[0])); } } catch e: Error { throw getErrorWithContext( - msg="in getting dataset info %s".doFormat(e.message()), + msg="in getting dataset info %s".format(e.message()), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3101,11 +3101,11 @@ module HDF5Msg { where (MyDmap == Dmap.blockDist || MyDmap == Dmap.defaultRectangular) { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "entry.a.targetLocales() = %?".doFormat(A.targetLocales())); + "entry.a.targetLocales() = %?".format(A.targetLocales())); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Filedomains: %?".doFormat(filedomains)); + "Filedomains: %?".format(filedomains)); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "skips: %?".doFormat(skips)); + "skips: %?".format(skips)); coforall loc in A.targetLocales() do on loc { // Create local copies of args @@ -3120,7 +3120,7 @@ module HDF5Msg { if (skips.contains(filename)) { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "File %s does not contain data for this dataset, skipping".doFormat(filename)); + "File %s does not contain data for this dataset, skipping".format(filename)); } else { // Look for overlap between A's local subdomain and this file const intersection = domain_intersection(A.localSubdomain(), filedom); @@ -3147,7 +3147,7 @@ module HDF5Msg { c_ptrTo(memStride), c_ptrTo(memCount), nil); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Locale %? intersection %? dataset slice %?".doFormat(loc,intersection, + "Locale %? intersection %? dataset slice %?".format(loc,intersection, (intersection.low - filedom.low, intersection.high - filedom.low))); /* @@ -3199,7 +3199,7 @@ module HDF5Msg { * catch block after confirming the best way to handle HDF5 error */ h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(), - "checking if isBoolDataset %? with file %s".doFormat(e.message())); + "checking if isBoolDataset %? with file %s".format(e.message())); } return boolDataset; } @@ -3229,7 +3229,7 @@ module HDF5Msg { * catch block after confirming the best way to handle HDF5 error */ h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(), - "checking if bigIntDataset %? with file %s".doFormat(e.message())); + "checking if bigIntDataset %? with file %s".format(e.message())); } return bigIntDataset; } @@ -3268,7 +3268,7 @@ module HDF5Msg { d = vd.size; } else { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "fD:%? segments subdom:%? is malformed signaling no segment data in file, skipping".doFormat(i, sd)); + "fD:%? segments subdom:%? is malformed signaling no segment data in file, skipping".format(i, sd)); } } @@ -3302,7 +3302,7 @@ module HDF5Msg { } else{ // Return error that file does not have required attrs - var errorMsg = "Rank Attribute was not located in %s. This attribute is required to process multi-dimensional data.".doFormat(filenames[0]); + var errorMsg = "Rank Attribute was not located in %s. This attribute is required to process multi-dimensional data.".format(filenames[0]); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( msg=errorMsg, @@ -3321,7 +3321,7 @@ module HDF5Msg { } else { // Return error that file does not have required attrs - var errorMsg = "Shape Attribute was not located in %s. This attribute is required to process multi-dimensional data.".doFormat(filenames[0]); + var errorMsg = "Shape Attribute was not located in %s. This attribute is required to process multi-dimensional data.".format(filenames[0]); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( msg=errorMsg, @@ -3337,7 +3337,7 @@ module HDF5Msg { var sname = st.nextName(); st.addEntry(sname, createSymEntry(shape)); var rname = readPdarrayFromFile(filenames, dset, dataclass, bytesize, isSigned, validFiles, st); - return (dset, ObjType.ARRAYVIEW, "%s+%s".doFormat(rname, sname)); + return (dset, ObjType.ARRAYVIEW, "%s+%s".format(rname, sname)); } proc readBigIntPdarrayFromFile(filenames: [?fD] string, dset: string, dataclass, bytesize: int, isSigned: bool, validFiles: [] bool, st: borrowed SymTab): string throws { @@ -3347,7 +3347,7 @@ module HDF5Msg { obj_id = C_HDF5.H5Oopen(file_id, dset.c_str(), C_HDF5.H5P_DEFAULT); if obj_id < 0 { throw getErrorWithContext( - msg="Dataset, %s, not found.".doFormat(dset), + msg="Dataset, %s, not found.".format(dset), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3383,9 +3383,9 @@ module HDF5Msg { var subdoms: [fD] domain(1); var skips = new set(string); var len: int; - (subdoms, len, skips) = get_subdoms(filenames, "%s/Limb_%i".doFormat(dset, l), validFiles); + (subdoms, len, skips) = get_subdoms(filenames, "%s/Limb_%i".format(dset, l), validFiles); var limb = createSymEntry(len, uint); - read_files_into_distributed_array(limb.a, subdoms, filenames, "%s/Limb_%i".doFormat(dset, l), skips); + read_files_into_distributed_array(limb.a, subdoms, filenames, "%s/Limb_%i".format(dset, l), skips); limbs.pushBack(limb); } @@ -3434,7 +3434,7 @@ module HDF5Msg { when C_HDF5.H5T_INTEGER { if (!isSigned && 8 == bytesize) { var entryUInt = createSymEntry(len, uint); - h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Initialized uint entry for dataset %s".doFormat(dset)); + h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Initialized uint entry for dataset %s".format(dset)); read_files_into_distributed_array(entryUInt.a, subdoms, filenames, dset, skips); rname = st.nextName(); if isBoolDataset(filenames[idx], dset) { @@ -3448,7 +3448,7 @@ module HDF5Msg { } else { var entryInt = createSymEntry(len, int); - h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Initialized int entry for dataset %s".doFormat(dset)); + h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Initialized int entry for dataset %s".format(dset)); read_files_into_distributed_array(entryInt.a, subdoms, filenames, dset, skips); rname = st.nextName(); if isBoolDataset(filenames[idx], dset) { @@ -3471,7 +3471,7 @@ module HDF5Msg { } otherwise { var errorMsg = "detected unhandled datatype: objType? pdarray, class %i, size %i, " + - "signed? %?".doFormat(dataclass, bytesize, isSigned); + "signed? %?".format(dataclass, bytesize, isSigned); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( msg=errorMsg, @@ -3508,7 +3508,7 @@ module HDF5Msg { (subdoms, len, skips) = get_subdoms(filenames, dset + "/" + SEGMENTED_VALUE_NAME, validFiles); if (bytesize != 1) || isSigned { - var errorMsg = "Error: detected unhandled datatype: objType? SegString, class %i, size %i, signed? %?".doFormat( + var errorMsg = "Error: detected unhandled datatype: objType? SegString, class %i, size %i, signed? %?".format( dataclass, bytesize, isSigned); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( @@ -3542,7 +3542,7 @@ module HDF5Msg { proc strings_readhdfMsg(filenames: [?fD] string, dset: string, dataclass, bytesize: int, isSigned: bool, calcStringOffsets: bool, validFiles: [] bool, st: borrowed SymTab): (string, ObjType, string) throws { var stringsEntry = readStringsFromFile(filenames, dset, dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); - return (dset, ObjType.STRINGS, "%s+%?".doFormat(stringsEntry.name, stringsEntry.nBytes)); + return (dset, ObjType.STRINGS, "%s+%?".format(stringsEntry.name, stringsEntry.nBytes)); } proc readSegArrayFromFile(filenames: [?fD] string, dset: string, dataclass, bytesize: int, isSigned: bool, calcStringOffsets: bool, ref validFiles: [] bool, st: borrowed SymTab) throws { @@ -3558,19 +3558,19 @@ module HDF5Msg { var (v, idx) = maxloc reduce zip(validFiles, validFiles.domain); var first_file = filenames[idx]; - if isStringsObject(first_file, "%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME)) { - (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME, SEGMENTED_OFFSET_NAME), validFiles); - var stringsEntry = readStringsFromFile(filenames, "%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); - rtnMap.add("values", "created %s+created bytes.size %?".doFormat(st.attrib(stringsEntry.name), stringsEntry.nBytes)); + if isStringsObject(first_file, "%s/%s".format(dset, SEGMENTED_VALUE_NAME)) { + (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s/%s".format(dset, SEGMENTED_VALUE_NAME, SEGMENTED_OFFSET_NAME), validFiles); + var stringsEntry = readStringsFromFile(filenames, "%s/%s".format(dset, SEGMENTED_VALUE_NAME), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + rtnMap.add("values", "created %s+created bytes.size %?".format(st.attrib(stringsEntry.name), stringsEntry.nBytes)); } else { - if isBigIntPdarray(first_file, "%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME)) { - (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s/Limb_0".doFormat(dset, SEGMENTED_VALUE_NAME), validFiles); + if isBigIntPdarray(first_file, "%s/%s".format(dset, SEGMENTED_VALUE_NAME)) { + (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s/Limb_0".format(dset, SEGMENTED_VALUE_NAME), validFiles); } else { - (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME), validFiles); + (valSubdoms, len, vskips) = get_subdoms(filenames, "%s/%s".format(dset, SEGMENTED_VALUE_NAME), validFiles); } - var vname = readPdarrayFromFile(filenames, "%s/%s".doFormat(dset, SEGMENTED_VALUE_NAME), dataclass, bytesize, isSigned, validFiles, st); + var vname = readPdarrayFromFile(filenames, "%s/%s".format(dset, SEGMENTED_VALUE_NAME), dataclass, bytesize, isSigned, validFiles, st); rtnMap.add("values", "created " + st.attrib(vname)); } @@ -3596,40 +3596,40 @@ module HDF5Msg { var subdoms: [fD] domain(1); var skips = new set(string); var len: int; - (subdoms, len, skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, CODES_NAME), validFiles); + (subdoms, len, skips) = get_subdoms(filenames, "%s/%s".format(dset, CODES_NAME), validFiles); // read codes into distributed array var codes = makeDistArray(len, int); - read_files_into_distributed_array(codes, subdoms, filenames, "%s/%s".doFormat(dset, CODES_NAME), skips); + read_files_into_distributed_array(codes, subdoms, filenames, "%s/%s".format(dset, CODES_NAME), skips); // create symEntry var codesName = st.nextName(); var codesEntry = createSymEntry(codes); st.addEntry(codesName, codesEntry); // read the categories - var (objTypeList, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".doFormat(dset, CATEGORIES_NAME), calcStringOffsets); - var cats = readStringsFromFile(filenames, "%s/%s".doFormat(dset, CATEGORIES_NAME), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + var (objTypeList, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".format(dset, CATEGORIES_NAME), calcStringOffsets); + var cats = readStringsFromFile(filenames, "%s/%s".format(dset, CATEGORIES_NAME), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); // read _akNACodes var nacodes_subdoms: [fD] domain(1); var nacodes_skips = new set(string); var nacodes_len: int; - (nacodes_subdoms, nacodes_len, nacodes_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, NACODES_NAME), validFiles); + (nacodes_subdoms, nacodes_len, nacodes_skips) = get_subdoms(filenames, "%s/%s".format(dset, NACODES_NAME), validFiles); // read codes into distributed array var naCodes = makeDistArray(nacodes_len, int); - read_files_into_distributed_array(naCodes, nacodes_subdoms, filenames, "%s/%s".doFormat(dset, NACODES_NAME), nacodes_skips); + read_files_into_distributed_array(naCodes, nacodes_subdoms, filenames, "%s/%s".format(dset, NACODES_NAME), nacodes_skips); // create symEntry var naCodesName = st.nextName(); var naCodesEntry = createSymEntry(naCodes); st.addEntry(naCodesName, naCodesEntry); rtnMap.add("codes", "created " + st.attrib(codesEntry.name)); - rtnMap.add("categories", "created %s+created %?".doFormat(st.attrib(cats.name), cats.nBytes)); + rtnMap.add("categories", "created %s+created %?".format(st.attrib(cats.name), cats.nBytes)); rtnMap.add("_akNAcode", "created " + st.attrib(naCodesEntry.name)); // check first file for segments and permutation. If exist here should be everywhere var file_id = C_HDF5.H5Fopen(filenames[0].c_str(), C_HDF5.H5F_ACC_RDONLY, C_HDF5.H5P_DEFAULT); - var segments_exist = C_HDF5.H5Lexists(file_id, "%s/%s".doFormat(dset, SEGMENTS_NAME).c_str(), C_HDF5.H5P_DEFAULT); - var perm_exists = C_HDF5.H5Lexists(file_id, "%s/%s".doFormat(dset, PERMUTATION_NAME).c_str(), C_HDF5.H5P_DEFAULT); + var segments_exist = C_HDF5.H5Lexists(file_id, "%s/%s".format(dset, SEGMENTS_NAME).c_str(), C_HDF5.H5P_DEFAULT); + var perm_exists = C_HDF5.H5Lexists(file_id, "%s/%s".format(dset, PERMUTATION_NAME).c_str(), C_HDF5.H5P_DEFAULT); C_HDF5.H5Fclose(file_id); if segments_exist > 0 && perm_exists > 0 { @@ -3637,10 +3637,10 @@ module HDF5Msg { var segs_subdoms: [fD] domain(1); var segs_skips = new set(string); var segs_len: int; - (segs_subdoms, segs_len, segs_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), validFiles); + (segs_subdoms, segs_len, segs_skips) = get_subdoms(filenames, "%s/%s".format(dset, SEGMENTS_NAME), validFiles); // read segments into distributed array var segments = makeDistArray(segs_len, int); - read_files_into_distributed_array(segments, segs_subdoms, filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), segs_skips); + read_files_into_distributed_array(segments, segs_subdoms, filenames, "%s/%s".format(dset, SEGMENTS_NAME), segs_skips); var segName = st.nextName(); var segEntry = createSymEntry(segments); st.addEntry(segName, segEntry); @@ -3649,10 +3649,10 @@ module HDF5Msg { var perm_subdoms: [fD] domain(1); var perm_skips = new set(string); var perm_len: int; - (perm_subdoms, perm_len, perm_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), validFiles); + (perm_subdoms, perm_len, perm_skips) = get_subdoms(filenames, "%s/%s".format(dset, PERMUTATION_NAME), validFiles); // read permutation into distributed array var perm = makeDistArray(perm_len, int); - read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), perm_skips); + read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".format(dset, PERMUTATION_NAME), perm_skips); var permName = st.nextName(); var permEntry = createSymEntry(perm); st.addEntry(permName, permEntry); @@ -3669,9 +3669,9 @@ module HDF5Msg { var perm_subdoms: [fD] domain(1); var perm_skips = new set(string); var perm_len: int; - (perm_subdoms, perm_len, perm_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), validFiles); + (perm_subdoms, perm_len, perm_skips) = get_subdoms(filenames, "%s/%s".format(dset, PERMUTATION_NAME), validFiles); var perm = makeDistArray(perm_len, int); - read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".doFormat(dset, PERMUTATION_NAME), perm_skips); + read_files_into_distributed_array(perm, perm_subdoms, filenames, "%s/%s".format(dset, PERMUTATION_NAME), perm_skips); // create symEntry var permName = st.nextName(); var permEntry = createSymEntry(perm); @@ -3680,9 +3680,9 @@ module HDF5Msg { var seg_subdoms: [fD] domain(1); var seg_skips = new set(string); var seg_len: int; - (seg_subdoms, seg_len, seg_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), validFiles); + (seg_subdoms, seg_len, seg_skips) = get_subdoms(filenames, "%s/%s".format(dset, SEGMENTS_NAME), validFiles); var segs = makeDistArray(seg_len, int); - read_files_into_distributed_array(segs, seg_subdoms, filenames, "%s/%s".doFormat(dset, SEGMENTS_NAME), seg_skips); + read_files_into_distributed_array(segs, seg_subdoms, filenames, "%s/%s".format(dset, SEGMENTS_NAME), seg_skips); // create symEntry var segName = st.nextName(); var segEntry = createSymEntry(segs); @@ -3691,9 +3691,9 @@ module HDF5Msg { var uki_subdoms: [fD] domain(1); var uki_skips = new set(string); var uki_len: int; - (uki_subdoms, uki_len, uki_skips) = get_subdoms(filenames, "%s/%s".doFormat(dset, UKI_NAME), validFiles); + (uki_subdoms, uki_len, uki_skips) = get_subdoms(filenames, "%s/%s".format(dset, UKI_NAME), validFiles); var uki = makeDistArray(uki_len, int); - read_files_into_distributed_array(uki, uki_subdoms, filenames, "%s/%s".doFormat(dset, UKI_NAME), uki_skips); + read_files_into_distributed_array(uki, uki_subdoms, filenames, "%s/%s".format(dset, UKI_NAME), uki_skips); // create symEntry var ukiName = st.nextName(); var ukiEntry = createSymEntry(uki); @@ -3709,7 +3709,7 @@ module HDF5Msg { obj_id = C_HDF5.H5Oopen(file_id, dset.c_str(), C_HDF5.H5P_DEFAULT); if obj_id < 0 { throw getErrorWithContext( - msg="Dataset, %s, not found.".doFormat(dset), + msg="Dataset, %s, not found.".format(dset), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3741,29 +3741,29 @@ module HDF5Msg { var isSigned: bool; var readDset: string; var readCreate: string; - (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/KEY_%i".doFormat(dset, k), calcStringOffsets); + (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/KEY_%i".format(dset, k), calcStringOffsets); select keyObjType { when ObjType.PDARRAY { - var pda_name = readPdarrayFromFile(filenames, "%s/KEY_%i".doFormat(dset, k), dataclass, bytesize, isSigned, validFiles, st); - readCreate = "created %s".doFormat(st.attrib(pda_name)); + var pda_name = readPdarrayFromFile(filenames, "%s/KEY_%i".format(dset, k), dataclass, bytesize, isSigned, validFiles, st); + readCreate = "created %s".format(st.attrib(pda_name)); } when ObjType.STRINGS { - var segString = readStringsFromFile(filenames, "%s/KEY_%i".doFormat(dset, k), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); - readCreate = "created %s+created %?".doFormat(st.attrib(segString.name), segString.nBytes); + var segString = readStringsFromFile(filenames, "%s/KEY_%i".format(dset, k), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + readCreate = "created %s+created %?".format(st.attrib(segString.name), segString.nBytes); } when ObjType.CATEGORICAL { - (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/KEY_%i".doFormat(dset, k), validFiles, calcStringOffsets, st); + (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/KEY_%i".format(dset, k), validFiles, calcStringOffsets, st); } otherwise { throw getErrorWithContext( - msg="Unsupported GroupBy key type, %s".doFormat(keyObjType: string), + msg="Unsupported GroupBy key type, %s".format(keyObjType: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="TypeError"); } } - rtnMap.add("KEY_%i".doFormat(k), "%s+|+%s".doFormat(keyObjType: string, readCreate)); + rtnMap.add("KEY_%i".format(k), "%s+|+%s".format(keyObjType: string, readCreate)); } return (dset, ObjType.GROUPBY, formatJson(rtnMap)); } @@ -3775,7 +3775,7 @@ module HDF5Msg { var group_id: C_HDF5.hid_t = C_HDF5.H5Oopen(file_id, dset.c_str(), C_HDF5.H5P_DEFAULT); if group_id < 0 { throw getErrorWithContext( - msg="Dataset, %s, not found.".doFormat(dset), + msg="Dataset, %s, not found.".format(dset), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3795,33 +3795,33 @@ module HDF5Msg { var isSigned: bool; var readDset: string; var readCreate: string; - (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".doFormat(dset, col), calcStringOffsets); + (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".format(dset, col), calcStringOffsets); select keyObjType { when ObjType.PDARRAY, ObjType.IPV4, ObjType.DATETIME, ObjType.TIMEDELTA { - var pda_name = readPdarrayFromFile(filenames, "%s/%s".doFormat(dset, col), dataclass, bytesize, isSigned, validFiles, st); - readCreate = "created %s".doFormat(st.attrib(pda_name)); + var pda_name = readPdarrayFromFile(filenames, "%s/%s".format(dset, col), dataclass, bytesize, isSigned, validFiles, st); + readCreate = "created %s".format(st.attrib(pda_name)); } when ObjType.STRINGS { - var segString = readStringsFromFile(filenames, "%s/%s".doFormat(dset, col), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); - readCreate = "created %s+created %?".doFormat(st.attrib(segString.name), segString.nBytes); + var segString = readStringsFromFile(filenames, "%s/%s".format(dset, col), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + readCreate = "created %s+created %?".format(st.attrib(segString.name), segString.nBytes); } when ObjType.CATEGORICAL { - (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/%s".doFormat(dset, col), validFiles, calcStringOffsets, st); + (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/%s".format(dset, col), validFiles, calcStringOffsets, st); } when ObjType.SEGARRAY { - var segMap = readSegArrayFromFile(filenames, "%s/%s".doFormat(dset, col), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + var segMap = readSegArrayFromFile(filenames, "%s/%s".format(dset, col), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); readCreate = formatJson(segMap); } otherwise { throw getErrorWithContext( - msg="Unsupported DataFrame column type, %s".doFormat(keyObjType: string), + msg="Unsupported DataFrame column type, %s".format(keyObjType: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="TypeError"); } } - rtnMap.add(col, "%s+|+%s".doFormat(keyObjType: string, readCreate)); + rtnMap.add(col, "%s+|+%s".format(keyObjType: string, readCreate)); } return (dset, ObjType.DATAFRAME, formatJson(rtnMap)); } @@ -3835,7 +3835,7 @@ module HDF5Msg { var group_id: C_HDF5.hid_t = C_HDF5.H5Oopen(file_id, dset.c_str(), C_HDF5.H5P_DEFAULT); if group_id < 0 { throw getErrorWithContext( - msg="Dataset, %s, not found.".doFormat(dset), + msg="Dataset, %s, not found.".format(dset), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3857,29 +3857,29 @@ module HDF5Msg { var isSigned: bool; var readDset: string; var readCreate: string; - (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".doFormat(dset, idx), calcStringOffsets); + (keyObjType, dataclass, bytesize, isSigned) = get_info(filenames[0], "%s/%s".format(dset, idx), calcStringOffsets); select keyObjType { when ObjType.PDARRAY, ObjType.IPV4, ObjType.DATETIME, ObjType.TIMEDELTA { - var pda_name = readPdarrayFromFile(filenames, "%s/%s".doFormat(dset, idx), dataclass, bytesize, isSigned, validFiles, st); - readCreate = "created %s".doFormat(st.attrib(pda_name)); + var pda_name = readPdarrayFromFile(filenames, "%s/%s".format(dset, idx), dataclass, bytesize, isSigned, validFiles, st); + readCreate = "created %s".format(st.attrib(pda_name)); } when ObjType.STRINGS { - var segString = readStringsFromFile(filenames, "%s/%s".doFormat(dset, idx), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); - readCreate = "created %s+created %?".doFormat(st.attrib(segString.name), segString.nBytes); + var segString = readStringsFromFile(filenames, "%s/%s".format(dset, idx), dataclass, bytesize, isSigned, calcStringOffsets, validFiles, st); + readCreate = "created %s+created %?".format(st.attrib(segString.name), segString.nBytes); } when ObjType.CATEGORICAL { - (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/%s".doFormat(dset, idx), validFiles, calcStringOffsets, st); + (readDset, _, readCreate) = categorical_readhdfMsg(filenames, "%s/%s".format(dset, idx), validFiles, calcStringOffsets, st); } otherwise { throw getErrorWithContext( - msg="Unsupported Index value type, %s".doFormat(keyObjType: string), + msg="Unsupported Index value type, %s".format(keyObjType: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass="TypeError"); } } - rtnList.pushBack("%s+|+%s".doFormat(keyObjType: string, readCreate)); + rtnList.pushBack("%s+|+%s".format(keyObjType: string, readCreate)); } return (dset, objType, formatJson(rtnList)); } @@ -3894,7 +3894,7 @@ module HDF5Msg { obj_id = C_HDF5.H5Oopen(file_id, dset.c_str(), C_HDF5.H5P_DEFAULT); if obj_id < 0 { throw getErrorWithContext( - msg="Dataset, %s, not found.".doFormat(dset), + msg="Dataset, %s, not found.".format(dset), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3933,7 +3933,7 @@ module HDF5Msg { C_HDF5.H5P_DEFAULT); if (dset < 0) { throw getErrorWithContext( - msg="dataset %s does not exist".doFormat(dsetName), + msg="dataset %s does not exist".format(dsetName), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3956,7 +3956,7 @@ module HDF5Msg { // Verify that the file exists if !exists(filename) { throw getErrorWithContext( - msg="The file %s does not exist".doFormat(filename), + msg="The file %s does not exist".format(filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3970,7 +3970,7 @@ module HDF5Msg { */ if !isHdf5File(filename) { throw getErrorWithContext( - msg="%s is not an HDF5 file".doFormat(filename), + msg="%s is not an HDF5 file".format(filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3983,7 +3983,7 @@ module HDF5Msg { if file_id < 0 { // HF5open returns negative value on failure C_HDF5.H5Fclose(file_id); throw getErrorWithContext( - msg="in accessing %s HDF5 file content".doFormat(filename), + msg="in accessing %s HDF5 file content".format(filename), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -3993,7 +3993,7 @@ module HDF5Msg { if C_HDF5.H5Lexists(file_id, dsetName.c_str(), C_HDF5.H5P_DEFAULT) <= 0 { C_HDF5.H5Fclose(file_id); throw getErrorWithContext( - msg="The dataset %s does not exist in the file %s".doFormat(dsetName, + msg="The dataset %s does not exist in the file %s".format(dsetName, filename), lineNumber=getLineNumber(), routineName=getRoutineName(), @@ -4015,7 +4015,7 @@ module HDF5Msg { if (offsetClass != C_HDF5.H5T_INTEGER) { throw getErrorWithContext( msg="dataset %s has incorrect one or more sub-datasets" + - " %s %s".doFormat(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), + " %s %s".format(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -4024,53 +4024,53 @@ module HDF5Msg { } var valueDset = dsetName + "/" + SEGMENTED_VALUE_NAME; if isStringsObject(filename, valueDset){ - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, SEGMENTED_VALUE_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, SEGMENTED_VALUE_NAME)); } else if isBigIntPdarray(filename, valueDset) { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, "Limb_0")); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, "Limb_0")); } else { try (dataclass, bytesize, isSigned) = try get_dataset_info(file_id, valueDset); } } else if objType == ObjType.CATEGORICAL { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(dsetName, CODES_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(dsetName, CODES_NAME)); } else if objType == ObjType.GROUPBY { // for groupby this information will not be used, but needs to be returned for the workflow - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(dsetName, PERMUTATION_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(dsetName, PERMUTATION_NAME)); } else if objType == ObjType.INDEX || objType == ObjType.MULTIINDEX { // This will not be used, but is required to be returned - var idx_objType = getObjType(file_id, "%s/IDX_0".doFormat(dsetName)); + var idx_objType = getObjType(file_id, "%s/IDX_0".format(dsetName)); if idx_objType == ObjType.PDARRAY { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/IDX_0".doFormat(dsetName)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/IDX_0".format(dsetName)); } else if idx_objType == ObjType.STRINGS { if ( !calcStringOffsets ) { - var offsetDset = "%s/IDX_0/%s".doFormat(dsetName, SEGMENTED_OFFSET_NAME); + var offsetDset = "%s/IDX_0/%s".format(dsetName, SEGMENTED_OFFSET_NAME); var (offsetClass, offsetByteSize, offsetSign) = try get_dataset_info(file_id, offsetDset); if (offsetClass != C_HDF5.H5T_INTEGER) { throw getErrorWithContext( msg="dataset %s has incorrect one or more sub-datasets" + - " %s %s".doFormat(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), + " %s %s".format(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass='SegStringError'); } } - var valueDset = "%s/IDX_0/%s".doFormat(dsetName, SEGMENTED_VALUE_NAME); + var valueDset = "%s/IDX_0/%s".format(dsetName, SEGMENTED_VALUE_NAME); if isStringsObject(filename, valueDset){ - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, SEGMENTED_VALUE_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, SEGMENTED_VALUE_NAME)); } else if isBigIntPdarray(filename, valueDset) { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, "Limb_0")); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, "Limb_0")); } else { try (dataclass, bytesize, isSigned) = try get_dataset_info(file_id, valueDset); } } else if idx_objType == ObjType.CATEGORICAL { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/IDX_0/%s".doFormat(dsetName, CODES_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/IDX_0/%s".format(dsetName, CODES_NAME)); } else { throw getErrorWithContext( @@ -4082,31 +4082,31 @@ module HDF5Msg { } } else if objType == ObjType.DATAFRAME { // for dataframe this information will not be used, but needs to be returned for the workflow - var idx_objType = getObjType(file_id, "%s/%s".doFormat(dsetName, INDEX_NAME)); + var idx_objType = getObjType(file_id, "%s/%s".format(dsetName, INDEX_NAME)); if idx_objType == ObjType.PDARRAY { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(dsetName, INDEX_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(dsetName, INDEX_NAME)); } else if idx_objType == ObjType.STRINGS { if ( !calcStringOffsets ) { - var offsetDset = "%s/%s/%s".doFormat(dsetName, INDEX_NAME, SEGMENTED_OFFSET_NAME); + var offsetDset = "%s/%s/%s".format(dsetName, INDEX_NAME, SEGMENTED_OFFSET_NAME); var (offsetClass, offsetByteSize, offsetSign) = try get_dataset_info(file_id, offsetDset); if (offsetClass != C_HDF5.H5T_INTEGER) { throw getErrorWithContext( msg="dataset %s has incorrect one or more sub-datasets" + - " %s %s".doFormat(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), + " %s %s".format(dsetName,SEGMENTED_OFFSET_NAME,SEGMENTED_VALUE_NAME), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), errorClass='SegStringError'); } } - var valueDset = "%s/%s/%s".doFormat(dsetName, INDEX_NAME, SEGMENTED_VALUE_NAME); + var valueDset = "%s/%s/%s".format(dsetName, INDEX_NAME, SEGMENTED_VALUE_NAME); if isStringsObject(filename, valueDset){ - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, SEGMENTED_VALUE_NAME)); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, SEGMENTED_VALUE_NAME)); } else if isBigIntPdarray(filename, valueDset) { - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(valueDset, "Limb_0")); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(valueDset, "Limb_0")); } else { try (dataclass, bytesize, isSigned) = try get_dataset_info(file_id, valueDset); @@ -4123,14 +4123,14 @@ module HDF5Msg { } else { if isBigIntPdarray(filename, dsetName) { // for bigint pdarray this info is the same for all limbs - (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".doFormat(dsetName, "Limb_0")); + (dataclass, bytesize, isSigned) = get_dataset_info(file_id, "%s/%s".format(dsetName, "Limb_0")); } else { (dataclass, bytesize, isSigned) = get_dataset_info(file_id, dsetName); } } } catch e : Error { throw getErrorWithContext( - msg="in get_info %s".doFormat(e.message()), + msg="in get_info %s".format(e.message()), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -4142,11 +4142,11 @@ module HDF5Msg { proc assign_tags(A, filedomains: [?FD] domain(1), filenames: [FD] string, dsetName: string, skips: set(string)) throws { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "entry.a.targetLocales() = %?".doFormat(A.targetLocales())); + "entry.a.targetLocales() = %?".format(A.targetLocales())); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Filedomains: %?".doFormat(filedomains)); + "Filedomains: %?".format(filedomains)); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "skips: %?".doFormat(skips)); + "skips: %?".format(skips)); coforall loc in A.targetLocales() do on loc { // Create local copies of args @@ -4161,7 +4161,7 @@ module HDF5Msg { if (skips.contains(filename)) { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "File %s does not contain data for this dataset, skipping".doFormat(filename)); + "File %s does not contain data for this dataset, skipping".format(filename)); } else { // Look for overlap between A's local subdomains and this file const intersection = domain_intersection(A.localSubdomain(), filedom); @@ -4245,7 +4245,7 @@ module HDF5Msg { var n: int = 1000; var jsondsets = msgArgs.getValueOf("dsets"); var dsets: string = if jsondsets.size > 2*n then jsondsets[0..#n]+'...'+jsondsets[jsondsets.size-n..#n] else jsondsets; - var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".doFormat( + var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".format( ndsets, dsets); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); @@ -4260,7 +4260,7 @@ module HDF5Msg { var n: int = 1000; var jsonfiles = msgArgs.getValueOf("filenames"); var files: string = if jsonfiles.size > 2*n then jsonfiles[0..#n]+'...'+jsonfiles[jsonfiles.size-n..#n] else jsonfiles; - var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".doFormat(nfiles, files); + var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".format(nfiles, files); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -4276,9 +4276,9 @@ module HDF5Msg { } var tmp = glob(filelist[0]); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob expanded %s to %i files".doFormat(filelist[0], tmp.size)); + "glob expanded %s to %i files".format(filelist[0], tmp.size)); if tmp.size == 0 { - var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".doFormat(filelist[0]); + var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".format(filelist[0]); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -4310,32 +4310,32 @@ module HDF5Msg { try { (objTypeList[i], dclasses[i], bytesizes[i], signFlags[i]) = get_info(fname, dsetName, calcStringOffsets); } catch e: FileNotFoundError { - fileErrorMsg = "File %s not found".doFormat(fname); + fileErrorMsg = "File %s not found".format(fname); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: PermissionError { - fileErrorMsg = "Permission error %s opening %s".doFormat(e.message(),fname); + fileErrorMsg = "Permission error %s opening %s".format(e.message(),fname); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: DatasetNotFoundError { - fileErrorMsg = "Dataset %s not found in file %s".doFormat(dsetName,fname); + fileErrorMsg = "Dataset %s not found in file %s".format(dsetName,fname); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: NotHDF5FileError { - fileErrorMsg = "The file %s is not an HDF5 file: %s".doFormat(fname,e.message()); + fileErrorMsg = "The file %s is not an HDF5 file: %s".format(fname,e.message()); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e: SegStringError { - fileErrorMsg = "SegmentedString error: %s".doFormat(e.message()); + fileErrorMsg = "SegmentedString error: %s".format(e.message()); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } } catch e : Error { - fileErrorMsg = "Other error in accessing file %s: %s".doFormat(fname,e.message()); + fileErrorMsg = "Other error in accessing file %s: %s".format(fname,e.message()); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } @@ -4360,23 +4360,23 @@ module HDF5Msg { for (isValid, name, ot, dc, bs, sf) in zip(validFiles, filenames, objTypeList, dclasses, bytesizes, signFlags) { if isValid { if (ot != objType) { - var errorMsg = "Inconsistent objecttype in dataset %s of file %s. Expected: %s, Found: %s".doFormat(dsetName, name, objType:string, ot:string); + var errorMsg = "Inconsistent objecttype in dataset %s of file %s. Expected: %s, Found: %s".format(dsetName, name, objType:string, ot:string); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } else if (dc != dataclass) { - var errorMsg = "Inconsistent dtype in dataset %s of file %s".doFormat(dsetName, name); + var errorMsg = "Inconsistent dtype in dataset %s of file %s".format(dsetName, name); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } else if (strictTypes && ((bs != bytesize) || (sf != isSigned))) { - var errorMsg = "Inconsistent precision or sign in dataset %s of file %s\nWith strictTypes, mixing of precision and signedness not allowed (set strictTypes=False to suppress)".doFormat(dsetName, name); + var errorMsg = "Inconsistent precision or sign in dataset %s of file %s\nWith strictTypes, mixing of precision and signedness not allowed (set strictTypes=False to suppress)".format(dsetName, name); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } } h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Verified all dtypes across files for dataset %s".doFormat(dsetName)); + "Verified all dtypes across files for dataset %s".format(dsetName)); if tagData { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Tagging Data with File Code"); @@ -4418,7 +4418,7 @@ module HDF5Msg { } if allowErrors && fileErrorCount > 0 { h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "allowErrors:true, fileErrorCount:%?".doFormat(fileErrorCount)); + "allowErrors:true, fileErrorCount:%?".format(fileErrorCount)); } var repMsg: string = buildReadAllMsgJson(rtnData, allowErrors, fileErrorCount, fileErrors, st); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); @@ -4441,10 +4441,10 @@ module HDF5Msg { // Attempt to interpret filename as a glob expression and ls the first result var tmp = glob(filename); h5Logger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob-expanded filename: %s to size: %i files".doFormat(filename, tmp.size)); + "glob-expanded filename: %s to size: %i files".format(filename, tmp.size)); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -4455,13 +4455,13 @@ module HDF5Msg { // Check to see if the file exists. If not, return an error message if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if !isHdf5File(filename) { - var errorMsg = "File %s is not an HDF5 file".doFormat(filename); + var errorMsg = "File %s is not an HDF5 file".format(filename); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -4484,7 +4484,7 @@ module HDF5Msg { } else { throw getErrorWithContext( - msg="Unknown file formatting, %i.".doFormat(file_format), + msg="Unknown file formatting, %i.".format(file_format), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -4503,7 +4503,7 @@ module HDF5Msg { } } } catch e : Error { - var errorMsg = "Failed to process HDF5 file %?".doFormat(e.message()); + var errorMsg = "Failed to process HDF5 file %?".format(e.message()); h5Logger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } diff --git a/src/HashMsg.chpl b/src/HashMsg.chpl index 7c766adcdb..1f95076974 100644 --- a/src/HashMsg.chpl +++ b/src/HashMsg.chpl @@ -58,8 +58,8 @@ module HashMsg { var lowerName = st.nextName(); 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))); + createdMap.add("upperHash", "created %s".format(st.attrib(upperName))); + createdMap.add("lowerHash", "created %s".format(st.attrib(lowerName))); repMsg = formatJson(createdMap); hmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); @@ -88,8 +88,8 @@ module HashMsg { 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))); + createdMap.add("upperHash", "created %s".format(st.attrib(upperName))); + createdMap.add("lowerHash", "created %s".format(st.attrib(lowerName))); var repMsg = formatJson(createdMap); hmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); diff --git a/src/Histogram.chpl b/src/Histogram.chpl index d12881b7c9..7389c0cd4c 100644 --- a/src/Histogram.chpl +++ b/src/Histogram.chpl @@ -56,7 +56,7 @@ module Histogram // copy from atomic histogram to normal histogram [(e,ae) in zip(hist, atomicHist)] e = ae.read(); try! hgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "hist = %?".doFormat(hist)); + "hist = %?".format(hist)); return hist; } @@ -82,7 +82,7 @@ module Histogram // copy from atomic histogram to normal histogram [(e,ae) in zip(hist, atomicHist)] e = ae.read(); try! hgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "hist = %?".doFormat(hist)); + "hist = %?".format(hist)); return hist; } diff --git a/src/HistogramMsg.chpl b/src/HistogramMsg.chpl index 51721ebf31..f0e724604a 100644 --- a/src/HistogramMsg.chpl +++ b/src/HistogramMsg.chpl @@ -31,7 +31,7 @@ module HistogramMsg // get next symbol name var rname = st.nextName(); hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s name: %s bins: %i rname: %s".doFormat(cmd, name, bins, rname)); + "cmd: %s name: %s bins: %i rname: %s".format(cmd, name, bins, rname)); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); @@ -42,23 +42,23 @@ module HistogramMsg var aMax = max reduce e.a; var binWidth:real = (aMax - aMin):real / bins:real; hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "binWidth %r".doFormat(binWidth)); + "binWidth %r".format(binWidth)); if (bins <= sBound) { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(bins,sBound)); + "%? <= %?".format(bins,sBound)); var hist = histogramReduceIntent(e.a, aMin, aMax, bins, binWidth); st.addEntry(rname, createSymEntry(hist)); } else if (bins <= mBound) { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(bins,mBound)); + "%? <= %?".format(bins,mBound)); var hist = histogramLocalAtomic(e.a, aMin, aMax, bins, binWidth); st.addEntry(rname, createSymEntry(hist)); } else { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? > %?".doFormat(bins,mBound)); + "%? > %?".format(bins,mBound)); var hist = histogramGlobalAtomic(e.a, aMin, aMax, bins, binWidth); st.addEntry(rname, createSymEntry(hist)); } @@ -93,7 +93,7 @@ module HistogramMsg // get next symbol name var rname = st.nextName(); hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s xName: %s yName: %s xBins: %i yBins: %i rname: %s".doFormat(cmd, xName, yName, xBins, yBins, rname)); + "cmd: %s xName: %s yName: %s xBins: %i yBins: %i rname: %s".format(cmd, xName, yName, xBins, yBins, rname)); var xGenEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(xName, st); var yGenEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(yName, st); @@ -109,24 +109,24 @@ module HistogramMsg var xBinWidth:real = (xMax - xMin):real / xBins:real; var yBinWidth:real = (yMax - yMin):real / yBins:real; hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "xBinWidth %r yBinWidth %r".doFormat(xBinWidth, yBinWidth)); + "xBinWidth %r yBinWidth %r".format(xBinWidth, yBinWidth)); var totBins = xBins * yBins; if (totBins <= sBound) { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(totBins,sBound)); + "%? <= %?".format(totBins,sBound)); var hist = histogramReduceIntent(x.a, y.a, xMin, xMax, yMin, yMax, xBins, yBins, xBinWidth, yBinWidth); st.addEntry(rname, createSymEntry(hist)); } else if (totBins <= mBound) { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(totBins,mBound)); + "%? <= %?".format(totBins,mBound)); var hist = histogramLocalAtomic(x.a, y.a, xMin, xMax, yMin, yMax, xBins, yBins, xBinWidth, yBinWidth); st.addEntry(rname, createSymEntry(hist)); } else { hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? > %?".doFormat(totBins,mBound)); + "%? > %?".format(totBins,mBound)); var hist = histogramGlobalAtomic(x.a, y.a, xMin, xMax, yMin, yMax, xBins, yBins, xBinWidth, yBinWidth); st.addEntry(rname, createSymEntry(hist)); } @@ -162,7 +162,7 @@ module HistogramMsg // get next symbol name var rname = st.nextName(); hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s name: %? bins: %? rname: %s".doFormat(cmd, names, bins, rname)); + "cmd: %s name: %? bins: %? rname: %s".format(cmd, names, bins, rname)); var gEnts = try! [name in names] getGenericTypedArrayEntry(name, st); var dimProdGenEnt = getGenericTypedArrayEntry(dimProdName, st); @@ -183,7 +183,7 @@ module HistogramMsg // small number of buckets (so histogram is relatively small): // each task gets it's own copy of the histogram and they're reduced hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(bins,sBound)); + "%? <= %?".format(bins,sBound)); forall (gEnt, stride, bin) in zip(gEnts, dimProd.a, bins) with (+ reduce indices) { var e = toSymEntry(gEnt,t); var aMin = min reduce e.a; @@ -210,7 +210,7 @@ module HistogramMsg // medium number of buckets: // each locale gets it's own atomic copy of the histogram and these are reduced together hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? <= %?".doFormat(bins,mBound)); + "%? <= %?".format(bins,mBound)); use PrivateDist; var atomicIdx: [PrivateSpace] [0..#numSamples] atomic int; @@ -254,7 +254,7 @@ module HistogramMsg // large number of buckets: // one global atomic histogram hgmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%? > %?".doFormat(bins,mBound)); + "%? > %?".format(bins,mBound)); use PrivateDist; var atomicIdx: [makeDistDom(numSamples)] atomic int; diff --git a/src/In1dMsg.chpl b/src/In1dMsg.chpl index d9e62eede8..6d0a1c9a0f 100644 --- a/src/In1dMsg.chpl +++ b/src/In1dMsg.chpl @@ -41,7 +41,7 @@ module In1dMsg var gAr2: borrowed GenSymEntry = getGenericTypedArrayEntry(sname, st); iLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s pdarray1: %s pdarray2: %s invert: %? new pdarray name: %?".doFormat( + "cmd: %s pdarray1: %s pdarray2: %s invert: %? new pdarray name: %?".format( cmd,st.attrib(name),st.attrib(sname),invert,rname)); select (gAr1.dtype, gAr2.dtype) { diff --git a/src/IndexingMsg.chpl b/src/IndexingMsg.chpl index d581b652af..c6dd415d9e 100644 --- a/src/IndexingMsg.chpl +++ b/src/IndexingMsg.chpl @@ -36,7 +36,7 @@ module IndexingMsg const indexDimName = msgArgs.getValueOf("index_dim"); const dimProdName = msgArgs.getValueOf("dim_prod"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %i %s %s".doFormat(cmd, pdaName, ndim, dimProdName, msgArgs.getValueOf("coords"))); + "%s %s %i %s %s".format(cmd, pdaName, ndim, dimProdName, msgArgs.getValueOf("coords"))); var dimProd: borrowed GenSymEntry = getGenericTypedArrayEntry(dimProdName, st); var dimProdEntry = toSymEntry(dimProd, int); @@ -86,7 +86,7 @@ module IndexingMsg var indiciesName = st.nextName(); var indicies = st.addEntry(indiciesName, * reduce dims, int); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "rname = %s".doFormat(indiciesName)); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "rname = %s".format(indiciesName)); // avoid dividing by 0 // if any dim is 0 we return an empty list @@ -98,10 +98,10 @@ module IndexingMsg recursiveIndexCalc(0,0,0); proc recursiveIndexCalc(depth: int, ind:int, sum:int) throws { for j in 0..#dims[depth] { - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "depth = %i".doFormat(depth)); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "j = %i".doFormat(j)); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "SUM: sum + scaledCoords[offsets[depth]+j] = %i".doFormat(sum + scaledCoords[offsets[depth]+j])); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "IND: ind + j*dim_prod[depth] = %i".doFormat(ind+(j*dim_prod[depth]))); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "depth = %i".format(depth)); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "j = %i".format(j)); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "SUM: sum + scaledCoords[offsets[depth]+j] = %i".format(sum + scaledCoords[offsets[depth]+j])); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "IND: ind + j*dim_prod[depth] = %i".format(ind+(j*dim_prod[depth]))); if depth == ndim-1 then indicies.a[ind+(j*dim_prod[depth])] = sum+scaledCoords[offsets[depth]+j]; else recursiveIndexCalc(depth+1, ind+(j*dim_prod[depth]), sum+scaledCoords[offsets[depth]+j]); @@ -122,7 +122,7 @@ module IndexingMsg const pdaName = msgArgs.getValueOf("base"); const dimProdName = msgArgs.getValueOf("dim_prod"); const coordsName = msgArgs.getValueOf("coords"); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "%s %s %s %s".doFormat(cmd, pdaName, dimProdName, coordsName)); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "%s %s %s %s".format(cmd, pdaName, dimProdName, coordsName)); var dimProd: borrowed GenSymEntry = getGenericTypedArrayEntry(dimProdName, st); var dimProdEntry = toSymEntry(dimProd, int); @@ -167,7 +167,7 @@ module IndexingMsg const coordsName = msgArgs.getValueOf("coords"); const dtypeStr = msgArgs.getValueOf("dtype"); var value = msgArgs.getValueOf("value"); - imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "%s %s %s %s".doFormat(cmd, pdaName, dimProdName, coordsName)); + imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "%s %s %s %s".format(cmd, pdaName, dimProdName, coordsName)); var dimProd: borrowed GenSymEntry = getGenericTypedArrayEntry(dimProdName, st); var dimProdEntry = toSymEntry(dimProd, int); @@ -212,34 +212,34 @@ module IndexingMsg var idx = msgArgs.get("idx").getTuple(nd); const name = msgArgs.getValueOf("array"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %?".doFormat(cmd, name, idx)); + "%s %s %?".format(cmd, name, idx)); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); select (gEnt.dtype) { when (DType.Int64) { var e = toSymEntry(gEnt, int, nd); - repMsg = "item %s %?".doFormat(dtype2str(e.dtype),e.a[(...idx)]); + repMsg = "item %s %?".format(dtype2str(e.dtype),e.a[(...idx)]); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } when (DType.UInt64) { var e = toSymEntry(gEnt, uint, nd); - repMsg = "item %s %?".doFormat(dtype2str(e.dtype),e.a[(...idx)]); + repMsg = "item %s %?".format(dtype2str(e.dtype),e.a[(...idx)]); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } when (DType.Float64) { var e = toSymEntry(gEnt,real, nd); - repMsg = "item %s %.17r".doFormat(dtype2str(e.dtype),e.a[(...idx)]); + repMsg = "item %s %.17r".format(dtype2str(e.dtype),e.a[(...idx)]); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } when (DType.Bool) { var e = toSymEntry(gEnt,bool, nd); - repMsg = "item %s %?".doFormat(dtype2str(e.dtype),e.a[(...idx)]); + repMsg = "item %s %?".format(dtype2str(e.dtype),e.a[(...idx)]); repMsg = repMsg.replace("true","True"); // chapel to python bool repMsg = repMsg.replace("false","False"); // chapel to python bool @@ -248,7 +248,7 @@ module IndexingMsg } when (DType.BigInt) { var e = toSymEntry(gEnt,bigint, nd); - repMsg = "item %s %?".doFormat(dtype2str(e.dtype),e.a[(...idx)]); + repMsg = "item %s %?".format(dtype2str(e.dtype),e.a[(...idx)]); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -294,7 +294,7 @@ module IndexingMsg var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(array, st); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s pdarray to slice: %s starts: %? stops: %? strides: %? new name: %s".doFormat( + "cmd: %s pdarray to slice: %s starts: %? stops: %? strides: %? new name: %s".format( cmd, st.attrib(array), starts, stops, strides, rname)); proc sliceHelper(type t): MsgTuple throws { @@ -341,7 +341,7 @@ module IndexingMsg var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s pdarray to slice: %s start: %i stop: %i stride: %i slice: %? new name: %s".doFormat( + "cmd: %s pdarray to slice: %s start: %i stop: %i stride: %i slice: %? new name: %s".format( cmd, st.attrib(name), start[0], stop[0], stride[0], slice, rname)); proc sliceHelper(type t) throws { @@ -423,13 +423,13 @@ module IndexingMsg } if gIdx[i].size != outSize { - const errorMsg = "All index arrays must have the same length".doFormat(pn); + const errorMsg = "All index arrays must have the same length".format(pn); imLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if gIdx[i].dtype != idxDT { - const errorMsg = "All index arrays must have the same dtype".doFormat(pn); + const errorMsg = "All index arrays must have the same dtype".format(pn); imLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -462,7 +462,7 @@ module IndexingMsg imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } else { - const errorMsg = "Invalid index dimensions: %? for %iD array".doFormat(idxDims, nd); + const errorMsg = "Invalid index dimensions: %? for %iD array".format(idxDims, nd); imLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -534,7 +534,7 @@ module IndexingMsg var gIV: borrowed GenSymEntry = getGenericTypedArrayEntry(iname, st); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s name: %s gX: %? gIV: %?".doFormat( + "cmd: %s name: %s gX: %? gIV: %?".format( cmd, name, st.attrib(name), st.attrib(iname))); // gather indexing by integer index vector @@ -550,12 +550,12 @@ module IndexingMsg var ivMin = min reduce iv.a; var ivMax = max reduce iv.a; if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= e.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,e.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,e.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -586,12 +586,12 @@ module IndexingMsg var ivMin = min reduce iv.a; var ivMax = max reduce iv.a; if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= e.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,e.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,e.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -624,7 +624,7 @@ module IndexingMsg var iv: [truth.a.domain] int = (+ scan truth.a); var pop = iv[iv.size-1]; imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "pop = %? last-scan = %?".doFormat(pop,iv[iv.size-1])); + "pop = %? last-scan = %?".format(pop,iv[iv.size-1])); var a = st.addEntry(rname, pop, XType); //[i in e.a.domain] if (truth.a[i] == true) {a.a[iv[i]-1] = e.a[i];}// iv[i]-1 for zero base index @@ -709,7 +709,7 @@ module IndexingMsg valueArg = msgArgs.get("value"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %? %s %s".doFormat(cmd, name, idx, dtype2str(dtype), valueArg.getValue())); + "%s %s %? %s %s".format(cmd, name, idx, dtype2str(dtype), valueArg.getValue())); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); @@ -718,7 +718,7 @@ module IndexingMsg const val = valueArg.getValueAsType(valType); e.a[(...idx)] = val:arrType; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -734,7 +734,7 @@ module IndexingMsg } e.a[(...idx)] = val; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -755,7 +755,7 @@ module IndexingMsg var e = toSymEntry(gEnt,real, nd); e.a[(...idx)] = if valueArg.getBoolValue() then 1.0 else 0.0; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -787,7 +787,7 @@ module IndexingMsg const dtype = if gX.dtype == DType.BigInt then DType.BigInt else str2dtype(msgArgs.getValueOf("dtype")); var value = msgArgs.getValueOf("value"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s gX: %s gIV: %s value: %s".doFormat(cmd,st.attrib(name), + "cmd: %s gX: %s gIV: %s value: %s".format(cmd,st.attrib(name), st.attrib(iname),value)); // scatter indexing by integer index vector @@ -797,12 +797,12 @@ module IndexingMsg var ivMin = min reduce iv.a; var ivMax = max reduce iv.a; if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= e.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,e.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,e.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -817,7 +817,7 @@ module IndexingMsg forall i in iva with (var agg = newDstAggregator(dtype), var locVal = val) { agg.copy(ea[i],locVal); } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -829,12 +829,12 @@ module IndexingMsg var ivMin = min reduce iv.a; var ivMax = max reduce iv.a; if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= e.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,e.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,e.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -849,7 +849,7 @@ module IndexingMsg forall i in iva with (var agg = newDstAggregator(dtype), var locVal = val) { agg.copy(ea[i:int],locVal); } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -859,7 +859,7 @@ module IndexingMsg var e = toSymEntry(gX,Xtype); var truth = toSymEntry(gIV,bool); if (e.size != truth.size) { - var errorMsg = "Error: %s: bool iv must be same size %i != %i".doFormat(pn,e.size, + var errorMsg = "Error: %s: bool iv must be same size %i != %i".format(pn,e.size, truth.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); @@ -878,7 +878,7 @@ module IndexingMsg } } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -952,7 +952,7 @@ module IndexingMsg if logLevel == LogLevel.DEBUG { imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s gX: %? gIV: %? gY: %?".doFormat( + "cmd: %s gX: %? gIV: %? gY: %?".format( cmd, st.attrib(name), st.attrib(iname), st.attrib(yname))); } @@ -963,7 +963,7 @@ module IndexingMsg proc ivInt64Helper(type t): MsgTuple throws { // add check to make sure IV and Y are same size if (gIV.size != gY.size) { - var errorMsg = "Error: %s: size mismatch %i %i".doFormat(pn,gIV.size,gY.size); + var errorMsg = "Error: %s: size mismatch %i %i".format(pn,gIV.size,gY.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -972,12 +972,12 @@ module IndexingMsg var ivMax = max reduce iv.a; var y = toSymEntry(gY,t); if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= gX.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,gX.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,gX.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -999,7 +999,7 @@ module IndexingMsg agg.copy(ea[i],v); } } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1008,7 +1008,7 @@ module IndexingMsg proc ivUInt64Helper(type t): MsgTuple throws { // add check to make sure IV and Y are same size if (gIV.size != gY.size) { - var errorMsg = "Error: %s: size mismatch %i %i".doFormat(pn,gIV.size,gY.size); + var errorMsg = "Error: %s: size mismatch %i %i".format(pn,gIV.size,gY.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -1017,12 +1017,12 @@ module IndexingMsg var ivMax = max reduce iv.a; var y = toSymEntry(gY,t); if ivMin < 0 { - var errorMsg = "Error: %s: OOBindex %i < 0".doFormat(pn,ivMin); + var errorMsg = "Error: %s: OOBindex %i < 0".format(pn,ivMin); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } if ivMax >= gX.size { - var errorMsg = "Error: %s: OOBindex %i > %i".doFormat(pn,ivMax,gX.size-1); + var errorMsg = "Error: %s: OOBindex %i > %i".format(pn,ivMax,gX.size-1); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -1044,7 +1044,7 @@ module IndexingMsg agg.copy(ea[i:int],v); } } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1053,7 +1053,7 @@ module IndexingMsg proc ivBoolHelper(type t): MsgTuple throws { // add check to make sure IV and Y are same size if (gIV.size != gX.size) { - var errorMsg = "Error: %s: size mismatch %i %i".doFormat(pn,gIV.size,gX.size); + var errorMsg = "Error: %s: size mismatch %i %i".format(pn,gIV.size,gX.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -1063,10 +1063,10 @@ module IndexingMsg var iv: [truth.a.domain] int = (+ scan truth.a); var pop = iv[iv.size-1]; imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "pop = %? last-scan = %?".doFormat(pop,iv[iv.size-1])); + "pop = %? last-scan = %?".format(pop,iv[iv.size-1])); var y = toSymEntry(gY,t); if (y.size != pop) { - var errorMsg = "Error: %s: pop size mismatch %i %i".doFormat(pn,pop,y.size); + var errorMsg = "Error: %s: pop size mismatch %i %i".format(pn,pop,y.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -1094,7 +1094,7 @@ module IndexingMsg } } } - var repMsg = "%s success".doFormat(pn); + var repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1186,7 +1186,7 @@ module IndexingMsg valueArg = msgArgs.get("value"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %? %? %? %s %s".doFormat(cmd, name, starts, stops, strides, + "%s %s %? %? %? %s %s".format(cmd, name, starts, stops, strides, dtype2str(dtype), valueArg.getValue())); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); @@ -1201,7 +1201,7 @@ module IndexingMsg const value = valueArg.getValueAsType(valType); e.a[sliceDom] = value:arrType; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1217,7 +1217,7 @@ module IndexingMsg } e.a[sliceDom] = value; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1238,7 +1238,7 @@ module IndexingMsg var e = toSymEntry(gEnt,real, nd); e.a[sliceDom] = if valueArg.getBoolValue() then 1.0 else 0.0; - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1271,7 +1271,7 @@ module IndexingMsg var value = msgArgs.get("value"); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %i %i %i %s %s".doFormat(cmd, name, start, stop, stride, + "%s %s %i %i %i %s %s".format(cmd, name, start, stop, stride, dtype2str(dtype), value.getValue())); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); @@ -1411,7 +1411,7 @@ module IndexingMsg } } - repMsg = "%s success".doFormat(pn); + repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1435,7 +1435,7 @@ module IndexingMsg imLogger.debug(getModuleName(),pn,getLineNumber(), "%s into: '%s' over domain: '%?' from: %s''" - .doFormat(cmd, name, sliceDom, yname)); + .format(cmd, name, sliceDom, yname)); var gX: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st), gY: borrowed GenSymEntry = getGenericTypedArrayEntry(yname, st); @@ -1449,14 +1449,14 @@ module IndexingMsg // ensure the slice assignment is valid for dim in 0.. ex.tupShape[dim] { - const errMsg = "slice indices out of bounds in dimension %i".doFormat(dim) + - " (%i..%i not in 0..<%i)".doFormat(sliceDom.dim[dim].low, + const errMsg = "slice indices out of bounds in dimension %i".format(dim) + + " (%i..%i not in 0..<%i)".format(sliceDom.dim[dim].low, sliceDom.dim[dim].high, ex.tupShape[dim]); imLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg, MsgType.ERROR); @@ -1481,7 +1481,7 @@ module IndexingMsg ex.a[sliceDom] = ey.a:xt; } - const repMsg = "%s success".doFormat(pn); + const repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),pn,getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1537,14 +1537,14 @@ module IndexingMsg else {slice = 1..0;} imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%s %s %i %i %i %s".doFormat(cmd, name, start, stop, stride, yname)); + "%s %s %i %i %i %s".format(cmd, name, start, stop, stride, yname)); var gX: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); var gY: borrowed GenSymEntry = getGenericTypedArrayEntry(yname, st); // add check to make sure IV and Y are same size if (slice.size != gY.size) { - var errorMsg = "%s: size mismatch %i %i".doFormat(pn,slice.size, gY.size); + var errorMsg = "%s: size mismatch %i %i".format(pn,slice.size, gY.size); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1694,7 +1694,7 @@ module IndexingMsg } } - repMsg = "%s success".doFormat(pn); + repMsg = "%s success".format(pn); imLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1718,7 +1718,7 @@ module IndexingMsg if x.tupShape[axis] != idx.size { const errMsg = "Error: %s: index array length (%i) does not match x's length (%i) along the provided axis (%i)" - .doFormat(pn, idx.size, x.tupShape[axis], axis); + .format(pn, idx.size, x.tupShape[axis], axis); imLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg, MsgType.ERROR); } @@ -1728,7 +1728,7 @@ module IndexingMsg if minIdx < 0 || maxIdx >= x.a.shape(axis) { const errMsg = "Error: %s: index array contains out-of-bounds indices (%i, %i) along the provided axis (%i)" - .doFormat(pn, minIdx, maxIdx, axis); + .format(pn, minIdx, maxIdx, axis); imLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errMsg); return new MsgTuple(errMsg, MsgType.ERROR); } diff --git a/src/JoinEqWithDTMsg.chpl b/src/JoinEqWithDTMsg.chpl index 88168d34d1..4e4a0048c6 100644 --- a/src/JoinEqWithDTMsg.chpl +++ b/src/JoinEqWithDTMsg.chpl @@ -94,7 +94,7 @@ module JoinEqWithDTMsg resLimitPerLocale: int) throws { try! jeLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "resLimitPerLocale = %?".doFormat(resLimitPerLocale)); + "resLimitPerLocale = %?".format(resLimitPerLocale)); // allocate result arrays per locale var locResI: [PrivateSpace] [0..#resLimitPerLocale] int; @@ -114,7 +114,7 @@ module JoinEqWithDTMsg // return found flag and a range for the segment of that value(unique key) var (found, j_seg) = findMatch(a1[i], seg, ukeys, perm); try! jeLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "a1: %? found: %? j_seq: %?".doFormat(a1[i], found, j_seg)); + "a1: %? found: %? j_seq: %?".format(a1[i], found, j_seg)); // if there is a matching value in ukeys if (found) { var t1_i = t1[i]; @@ -186,9 +186,9 @@ module JoinEqWithDTMsg var numResults: int = resEnds[resEnds.domain.high]; try! jeLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "result ends: %?".doFormat(resEnds)); + "result ends: %?".format(resEnds)); try! jeLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "numResults = %i".doFormat(numResults)); + "numResults = %i".format(numResults)); // allocate result arrays var resI = makeDistArray(numResults, int); @@ -201,7 +201,7 @@ module JoinEqWithDTMsg var gEnd: int = resEnds[here.id] - 1; var gStart: int = resEnds[here.id] - locNumResults[here.id]; try! jeLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "start: %? end: %?".doFormat(gStart,gEnd)); + "start: %? end: %?".format(gStart,gEnd)); // copy local results into global results resI[{gStart..gEnd}] = locResI[here.id][{0..#locNumResults[here.id]}]; resJ[{gStart..gEnd}] = locResJ[here.id][{0..#locNumResults[here.id]}]; @@ -243,7 +243,7 @@ module JoinEqWithDTMsg var resJ_name = st.nextName(); jeLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s array1: %s g2seg2: %s g2ukeys: %s g2perm: %s t1name: %s t2name: %s dt: %? pred: %? resLimit: %? resI: %s resJ: %s".doFormat( + "cmd: %s array1: %s g2seg2: %s g2ukeys: %s g2perm: %s t1name: %s t2name: %s dt: %? pred: %? resLimit: %? resI: %s resJ: %s".format( cmd, a1_name, g2Seg_name, g2Ukeys_name, g2Perm_name, t1_name, t2_name, dt, pred, resLimit, resI_name, resJ_name)); diff --git a/src/LinalgMsg.chpl b/src/LinalgMsg.chpl index 0391f13775..8232d09961 100644 --- a/src/LinalgMsg.chpl +++ b/src/LinalgMsg.chpl @@ -30,7 +30,7 @@ module LinalgMsg { rname = st.nextName(); linalgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s dtype: %s rname: %s aRows: %i: aCols: %i aDiag: %i".doFormat( + "cmd: %s dtype: %s rname: %s aRows: %i: aCols: %i aDiag: %i".format( cmd,dtype2str(dtype),rname,rows,cols,diag)); proc setDiag(ref a: [?d] ?t, k: int, param one: t) where d.rank == 2 { @@ -113,7 +113,7 @@ module LinalgMsg { const rname = st.nextName(); linalgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s rname: %s aName: %s aDiag: %i".doFormat( + "cmd: %s rname: %s aName: %s aDiag: %i".format( cmd,rname,name,diag)); var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); @@ -199,7 +199,7 @@ module LinalgMsg { const rname = st.nextName(); linalgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s dtype1: %s dtype2: %s rname: %s".doFormat( + "cmd: %s dtype1: %s dtype2: %s rname: %s".format( cmd,dtype2str(x1G.dtype),dtype2str(x2G.dtype),rname)); proc doMatMult(type x1Type, type x2Type, type resultType): MsgTuple throws { @@ -325,7 +325,7 @@ module LinalgMsg { var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st); linalgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s dtype: %s rname: %s".doFormat( + "cmd: %s dtype: %s rname: %s".format( cmd,dtype2str(gEnt.dtype),rname)); proc doTranspose(type t): MsgTuple throws { @@ -389,7 +389,7 @@ module LinalgMsg { x2G: borrowed GenSymEntry = getGenericTypedArrayEntry(x2Name, st); linalgLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s dtype1: %s dtype2: %s rname: %s".doFormat( + "cmd: %s dtype1: %s dtype2: %s rname: %s".format( cmd,dtype2str(x1G.dtype),dtype2str(x2G.dtype),rname)); // assumes both arrays have been broadcasted to ND dimensions diff --git a/src/Logging.chpl b/src/Logging.chpl index 82bb6b4e0f..b73be4213a 100644 --- a/src/Logging.chpl +++ b/src/Logging.chpl @@ -80,7 +80,7 @@ module Logging { if channel == LogChannel.CONSOLE { return new owned ConsoleOutputHandler(); } else { - return new owned FileOutputHandler("%s/.arkouda/arkouda.log".doFormat(here.cwd())); + return new owned FileOutputHandler("%s/.arkouda/arkouda.log".format(here.cwd())); } } @@ -170,19 +170,19 @@ module Logging { proc generateErrorMsg(moduleName: string, routineName, lineNumber, error) throws { - return "Error in logging message for %s %s %i: %?".doFormat( + return "Error in logging message for %s %s %i: %?".format( moduleName, routineName, lineNumber, error.message()); } proc generateLogMessage(moduleName: string, routineName, lineNumber, msg, level: string) throws { - var lineStr: string = if lineNumber != 0 then "Line %i ".doFormat(lineNumber) else ""; + var lineStr: string = if lineNumber != 0 then "Line %i ".format(lineNumber) else ""; if printDate { - return "%s [%s] %s %s%s [Chapel] %s".doFormat( + return "%s [%s] %s %s%s [Chapel] %s".format( generateDateTimeString(), moduleName,routineName,lineStr, level,msg); } else { - return "[%s] %s %s%s [Chapel] %s".doFormat(moduleName, + return "[%s] %s %s%s [Chapel] %s".format(moduleName, routineName,lineStr,level,msg); } } @@ -192,7 +192,7 @@ module Logging { var vals = dts.split("T"); var cd = vals(0); var rawCms = vals(1).split("."); - return "%s:%s".doFormat(cd,rawCms(0)); + return "%s:%s".format(cd,rawCms(0)); } } } diff --git a/src/ManipulationMsg.chpl b/src/ManipulationMsg.chpl index a5bbda1014..681bbe71b2 100644 --- a/src/ManipulationMsg.chpl +++ b/src/ManipulationMsg.chpl @@ -187,7 +187,7 @@ module ManipulationMsg { if !valid { const errMsg = "Arrays must have compatible shapes to concatenate: " + - "attempt to concatenate arrays of shapes %? along axis %?".doFormat(shapes, axis); + "attempt to concatenate arrays of shapes %? along axis %?".format(shapes, axis); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -301,8 +301,8 @@ module ManipulationMsg { param pn = Reflection.getRoutineName(); if nd == MaxArrayDims { - const errMsg = "Cannot expand arrays with rank %i, as this would result an an array with rank %i".doFormat(nd, nd+1) + - ", exceeding the server's configured maximum of %i. ".doFormat(MaxArrayDims) + + const errMsg = "Cannot expand arrays with rank %i, as this would result an an array with rank %i".format(nd, nd+1) + + ", exceeding the server's configured maximum of %i. ".format(MaxArrayDims) + "Please update the configuration and recompile to support higher-dimensional arrays."; mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); @@ -385,7 +385,7 @@ module ManipulationMsg { var eOut = st.addEntry(rname, (...eIn.tupShape), t); if !valid { - const errMsg = "Unable to flip array with shape %? along axes %?".doFormat(eIn.tupShape, axesRaw); + const errMsg = "Unable to flip array with shape %? along axes %?".format(eIn.tupShape, axesRaw); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -519,7 +519,7 @@ module ManipulationMsg { (valid, perm) = validateAxes(axes); if !valid { - const errMsg = "Unable to permute array with shape %? using axes %?".doFormat(eIn.tupShape, axes); + const errMsg = "Unable to permute array with shape %? using axes %?".format(eIn.tupShape, axes); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -591,7 +591,7 @@ module ManipulationMsg { (valid, outShape) = validateShape(rawShape, eIn.a.size); if !valid { - const errMsg = "Cannot reshape array of shape %? into shape %?. The total number of elements must match".doFormat(eIn.tupShape, rawShape); + const errMsg = "Cannot reshape array of shape %? into shape %?. The total number of elements must match".format(eIn.tupShape, rawShape); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -701,7 +701,7 @@ module ManipulationMsg { (valid, axes) = validateAxes(axesRaw, nd); if !valid { - const errMsg = "Unable to roll array with shape %? along axes %?".doFormat(eIn.tupShape, axesRaw); + const errMsg = "Unable to roll array with shape %? along axes %?".format(eIn.tupShape, axesRaw); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -818,7 +818,7 @@ module ManipulationMsg { (valid, shape, mapping) = validateSqueeze(eIn.tupShape, axes, ndOut); if !valid { - const errMsg = "Unable to squeeze array with shape %? along axes %? into a %iD array".doFormat(eIn.tupShape, axes, ndOut); + const errMsg = "Unable to squeeze array with shape %? along axes %? into a %iD array".format(eIn.tupShape, axes, ndOut); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -895,8 +895,8 @@ module ManipulationMsg { param pn = Reflection.getRoutineName(); if nd == MaxArrayDims { - const errMsg = "Cannot stack arrays with rank %i, as this would result an an array with rank %i".doFormat(nd, nd+1) + - ", exceeding the server's configured maximum of %i. ".doFormat(MaxArrayDims) + + const errMsg = "Cannot stack arrays with rank %i, as this would result an an array with rank %i".format(nd, nd+1) + + ", exceeding the server's configured maximum of %i. ".format(MaxArrayDims) + "Please update the configuration and recompile to support higher-dimensional arrays."; mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); @@ -1073,7 +1073,7 @@ module ManipulationMsg { shapeOut = unstackedShape(eIn.tupShape, axis); if eIn.tupShape[axis] != numReturnArrays { - const errMsg = "Cannot unstack array with shape %? along axis %? into %? arrays".doFormat(eIn.tupShape, axis, numReturnArrays); + const errMsg = "Cannot unstack array with shape %? along axis %? into %? arrays".format(eIn.tupShape, axis, numReturnArrays); mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } @@ -1229,7 +1229,7 @@ module ManipulationMsg { } } } else { - const errMsg = "Unable to repeat array with shape %? using repeats %?. ".doFormat(eIn.tupShape, eRepeats.tupShape) + + const errMsg = "Unable to repeat array with shape %? using repeats %?. ".format(eIn.tupShape, eRepeats.tupShape) + "Repeats must be a scalar or have the same number of elements as the input array"; mLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); diff --git a/src/MemoryMgmt.chpl b/src/MemoryMgmt.chpl index 877f174aff..1279709c36 100644 --- a/src/MemoryMgmt.chpl +++ b/src/MemoryMgmt.chpl @@ -173,7 +173,7 @@ module MemoryMgmt { var availMemory = getAvailMemory(); mmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "locale: %s reqMemory: %i arkMemAlloc: %i arkMemUsed: %i availMemory: %i".doFormat(here.id, + "locale: %s reqMemory: %i arkMemAlloc: %i arkMemUsed: %i availMemory: %i".format(here.id, reqMemory, arkMemAlloc, arkMemUsed, @@ -186,7 +186,7 @@ module MemoryMgmt { if newArkoudaMemory:int <= availMemory { return true; } else { - var msg = "Arkouda memory request %i on locale %s exceeds available memory %i".doFormat(newArkoudaMemory, + var msg = "Arkouda memory request %i on locale %s exceeds available memory %i".format(newArkoudaMemory, here.id, availMemory); mmLogger.error(getModuleName(),getRoutineName(),getLineNumber(),msg); diff --git a/src/Merge.chpl b/src/Merge.chpl index fecc09a24e..3e36466f08 100644 --- a/src/Merge.chpl +++ b/src/Merge.chpl @@ -90,7 +90,7 @@ module Merge { var smallS = small[smallPos]; if (numLocales == 1) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Task %? init: bigPos = %?, smallPos = %?, outPos = %?, end = %?, outOffset = %?, bigS = %s, smallS = %s".doFormat( + "Task %? init: bigPos = %?, smallPos = %?, outPos = %?, end = %?, outOffset = %?, bigS = %s, smallS = %s".format( task, bigPos, smallPos, outPos, end, outOffset, bigS, smallS)); } // leapfrog the two arrays until all the output has been filled @@ -100,15 +100,15 @@ module Merge { if (outPos > perm.domain.high) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: outPos = %? not in %?".doFormat(outPos, perm.domain)); + "OOB: outPos = %? not in %?".format(outPos, perm.domain)); } if (bigPos > big.offsets.a.domain.high) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: bigPos = %? not in %?".doFormat(bigPos, big.offsets.a.domain)); + "OOB: bigPos = %? not in %?".format(bigPos, big.offsets.a.domain)); } if (outOffset + bigS.numBytes >= vals.size) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: (outOffset = %? + bigS.numBytes = %?) not in %?".doFormat( + "OOB: (outOffset = %? + bigS.numBytes = %?) not in %?".format( outOffset, bigS.numBytes, vals.domain)); } if bigIsLeft { @@ -130,15 +130,15 @@ module Merge { while (smallPos <= smallEnd) && ((bigPos > bigEnd) || (smallS < bigS)) { if (outPos > perm.domain.high) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: outPos = %? not in %?".doFormat(outPos, perm.domain)); + "OOB: outPos = %? not in %?".format(outPos, perm.domain)); } if (smallPos > small.offsets.a.domain.high) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: smallPos = %? not in %?".doFormat(smallPos, small.offsets.a.domain)); + "OOB: smallPos = %? not in %?".format(smallPos, small.offsets.a.domain)); } if (outOffset + bigS.numBytes >= vals.size) { mLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "OOB: (outOffset = %? + smallS.numBytes = %?) not in %?".doFormat( + "OOB: (outOffset = %? + smallS.numBytes = %?) not in %?".format( outOffset, smallS.numBytes, vals.domain)); } } diff --git a/src/Message.chpl b/src/Message.chpl index d6b28af960..4ade551c6f 100644 --- a/src/Message.chpl +++ b/src/Message.chpl @@ -178,7 +178,7 @@ module Message { else return this.val:t; } catch { throw new ErrorWithContext( - "Parameter cannot be cast as %s. Attempting to cast %s as type %s failed".doFormat(t:string, this.val, t:string), + "Parameter cannot be cast as %s. Attempting to cast %s as type %s failed".format(t:string, this.val, t:string), getLineNumber(), getRoutineName(), getModuleName(), @@ -196,7 +196,7 @@ module Message { return this.val:int; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as int. Attempting to cast %s as type int failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as int. Attempting to cast %s as type int failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -216,7 +216,7 @@ module Message { if x >= 0 && x < max then return x; if x < 0 && x >= -max then return x + max; else throw new ErrorWithContext( - "Parameter cannot be cast as a positive int in the range: [%?, %?)".doFormat(-max, max), + "Parameter cannot be cast as a positive int in the range: [%?, %?)".format(-max, max), getLineNumber(), getRoutineName(), getModuleName(), @@ -233,7 +233,7 @@ module Message { return this.val:uint; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as uint. Attempting to cast %s as type uint failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as uint. Attempting to cast %s as type uint failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -246,7 +246,7 @@ module Message { return this.val:uint(8); } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as uint(8). Attempting to cast %s as type uint(8) failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as uint(8). Attempting to cast %s as type uint(8) failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -263,7 +263,7 @@ module Message { return this.val:real; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as real. Attempting to cast %s as type real failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as real. Attempting to cast %s as type real failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -280,7 +280,7 @@ module Message { return this.val.toLower():bool; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as bool. Attempting to cast %s as type bool failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as bool. Attempting to cast %s as type bool failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -293,7 +293,7 @@ module Message { return this.val:bigint; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as bigint. Attempting to cast %s as type bigint failed".doFormat(this.val), + throw new owned ErrorWithContext("Parameter cannot be cast as bigint. Attempting to cast %s as type bigint failed".format(this.val), getLineNumber(), getRoutineName(), getModuleName(), @@ -318,7 +318,7 @@ module Message { else return this.val:t; } catch { - throw new owned ErrorWithContext("Parameter cannot be cast as %?. Attempting to cast %s as type %? failed".doFormat(t:string, this.val, t:string), + throw new owned ErrorWithContext("Parameter cannot be cast as %?. Attempting to cast %s as type %? failed".format(t:string, this.val, t:string), getLineNumber(), getRoutineName(), getModuleName(), @@ -333,7 +333,7 @@ module Message { */ proc getList(size: int) throws { if this.objType != ObjectType.LIST { - throw new owned ErrorWithContext("Parameter with key, %s, is not a list.".doFormat(this.key), + throw new owned ErrorWithContext("Parameter with key, %s, is not a list.".format(this.key), getLineNumber(), getRoutineName(), getModuleName(), @@ -344,7 +344,7 @@ module Message { proc getListAs(type t, size: int) throws { if this.objType != ObjectType.LIST { - throw new owned ErrorWithContext("Parameter with key, %s, is not a list.".doFormat(this.key), + throw new owned ErrorWithContext("Parameter with key, %s, is not a list.".format(this.key), getLineNumber(), getRoutineName(), getModuleName(), @@ -356,7 +356,7 @@ module Message { forall (idx, v) in zip(0.. 2*n then jsondsets[0..#n]+'...'+jsondsets[jsondsets.size-n..#n] else jsondsets; - var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".doFormat( + var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".format( ndsets, dsets); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); @@ -847,7 +847,7 @@ module ParquetMsg { var n: int = 1000; var jsonfiles = msgArgs.getValueOf("filenames"); var files: string = if jsonfiles.size > 2*n then jsonfiles[0..#n]+'...'+jsonfiles[jsonfiles.size-n..#n] else jsonfiles; - var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".doFormat(nfiles, files); + var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".format(nfiles, files); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -866,9 +866,9 @@ module ParquetMsg { } var tmp = glob(filelist[0]); pqLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob expanded %s to %i files".doFormat(filelist[0], tmp.size)); + "glob expanded %s to %i files".format(filelist[0], tmp.size)); if tmp.size == 0 { - var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".doFormat(filelist[0]); + var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".format(filelist[0]); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -897,7 +897,7 @@ module ParquetMsg { sizes[i] = getArrSize(fname); } catch e : Error { // This is only type of error thrown by Parquet - fileErrorMsg = "Other error in accessing file %s: %s".doFormat(fname,e.message()); + fileErrorMsg = "Other error in accessing file %s: %s".format(fname,e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; if !allowErrors { return new MsgTuple(fileErrorMsg, MsgType.ERROR); } @@ -1001,7 +1001,7 @@ module ParquetMsg { readStrFilesByName(entryVal.a, whereNull, filenames, byteSizes, dsetname, ty); var stringsEntry = assembleSegStringFromParts(entrySeg, entryVal, st); - rnames.pushBack((dsetname, ObjType.STRINGS, "%s+%?".doFormat(stringsEntry.name, stringsEntry.nBytes))); + rnames.pushBack((dsetname, ObjType.STRINGS, "%s+%?".format(stringsEntry.name, stringsEntry.nBytes))); } else if ty == ArrowTypes.double || ty == ArrowTypes.float { var entryVal = createSymEntry(len, real); readFilesByName(entryVal.a, whereNull, filenames, sizes, dsetname, ty, hasNonFloatNulls=hasNonFloatNulls); @@ -1011,7 +1011,7 @@ module ParquetMsg { } else if ty == ArrowTypes.list { var list_ty = getListData(filenames[0], dsetname); if list_ty == ArrowTypes.notimplemented { // check for and skip further nested datasets - pqLogger.info(getModuleName(),getRoutineName(),getLineNumber(),"Invalid list datatype found in %s. Skipping.".doFormat(dsetname)); + pqLogger.info(getModuleName(),getRoutineName(),getLineNumber(),"Invalid list datatype found in %s. Skipping.".format(dsetname)); } else { var create_str: string = parseListDataset(filenames, dsetname, list_ty, len, sizes, st); @@ -1025,7 +1025,7 @@ module ParquetMsg { st.addEntry(valName, entryVal); rnames.pushBack((dsetname, ObjType.PDARRAY, valName)); } else { - var errorMsg = "DType %s not supported for Parquet reading".doFormat(ty); + var errorMsg = "DType %s not supported for Parquet reading".format(ty); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1096,7 +1096,7 @@ module ParquetMsg { var compression = msgArgs.getValueOf("compression").toUpper(): CompressionType; if (!entry.isAssignableTo(SymbolEntryType.TypedArraySymEntry)) { - var errorMsg = "ObjType (PDARRAY) does not match SymEntry Type: %s".doFormat(entry.entryType); + var errorMsg = "ObjType (PDARRAY) does not match SymEntry Type: %s".format(entry.entryType); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1122,7 +1122,7 @@ module ParquetMsg { var e = toSymEntry(toGenSymEntry(entry), real); warnFlag = write1DDistArrayParquet(filename, dsetname, dtypestr, compression:int, mode, e.a); } otherwise { - var errorMsg = "Writing Parquet files not supported for %s type".doFormat(msgArgs.getValueOf("dtype")); + var errorMsg = "Writing Parquet files not supported for %s type".format(msgArgs.getValueOf("dtype")); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( msg=errorMsg, @@ -1144,7 +1144,7 @@ module ParquetMsg { var compression = msgArgs.getValueOf("compression").toUpper(): CompressionType; if (!entry.isAssignableTo(SymbolEntryType.SegStringSymEntry)) { - var errorMsg = "ObjType (STRINGS) does not match SymEntry Type: %s".doFormat(entry.entryType); + var errorMsg = "ObjType (STRINGS) does not match SymEntry Type: %s".format(entry.entryType); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -1384,7 +1384,7 @@ module ParquetMsg { var values = toSegStringSymEntry(genVal); warnFlag = writeStrSegArrayParquet(filename, dsetname, segments, values, compression:int); } otherwise { - var errorMsg = "Writing Parquet files not supported for %s type".doFormat(genVal.dtype); + var errorMsg = "Writing Parquet files not supported for %s type".format(genVal.dtype); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw getErrorWithContext( msg=errorMsg, @@ -1416,25 +1416,25 @@ module ParquetMsg { warnFlag = segarray_toParquetMsg(msgArgs, st); } otherwise { - var errorMsg = "Unable to write object type %s to Parquet file.".doFormat(objType); + var errorMsg = "Unable to write object type %s to Parquet file.".format(objType); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } } catch e: FileNotFoundError { - var errorMsg = "Unable to open %s for writing: %s".doFormat(msgArgs.getValueOf("filename"),e.message()); + var errorMsg = "Unable to open %s for writing: %s".format(msgArgs.getValueOf("filename"),e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: MismatchedAppendError { - var errorMsg = "Mismatched append %s".doFormat(e.message()); + var errorMsg = "Mismatched append %s".format(e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: WriteModeError { - var errorMsg = "Write mode error %s".doFormat(e.message()); + var errorMsg = "Write mode error %s".format(e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: Error { - var errorMsg = "problem writing to file %s".doFormat(e.message()); + var errorMsg = "problem writing to file %s".format(e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1553,7 +1553,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType for writing to Parquet, ".doFormat(values.dtype: string), + msg="Unsupported SegArray DType for writing to Parquet, ".format(values.dtype: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1717,7 +1717,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType for writing to Parquet, ".doFormat(valEntry.dtype: string), + msg="Unsupported SegArray DType for writing to Parquet, ".format(valEntry.dtype: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1747,7 +1747,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Unsupported SegArray DType for writing to Parquet, ".doFormat(valEntry.dtype: string), + msg="Unsupported SegArray DType for writing to Parquet, ".format(valEntry.dtype: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1806,7 +1806,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Unsupported PDArray DType for writing to Parquet, ".doFormat(entry.dtype: string), + msg="Unsupported PDArray DType for writing to Parquet, ".format(entry.dtype: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1817,7 +1817,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Writing Parquet files (multi-column) does not support %s columns.".doFormat(ot), + msg="Writing Parquet files (multi-column) does not support %s columns.".format(ot), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1886,7 +1886,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Writing Parquet files (multi-column) does not support columns of type %s".doFormat(entryDtype: string), + msg="Writing Parquet files (multi-column) does not support columns of type %s".format(entryDtype: string), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1897,7 +1897,7 @@ module ParquetMsg { } otherwise { throw getErrorWithContext( - msg="Writing Parquet files (multi-column) does not support %s columns.".doFormat(objType), + msg="Writing Parquet files (multi-column) does not support %s columns.".format(objType), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), @@ -1931,15 +1931,15 @@ module ParquetMsg { try { warnFlag = writeMultiColParquet(filename, col_names, ncols, sym_names, col_objType_strs, targetLocales, compression:int, st); } catch e: FileNotFoundError { - var errorMsg = "Unable to open %s for writing: %s".doFormat(filename,e.message()); + var errorMsg = "Unable to open %s for writing: %s".format(filename,e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: WriteModeError { - var errorMsg = "Write mode error %s".doFormat(e.message()); + var errorMsg = "Write mode error %s".format(e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: Error { - var errorMsg = "problem writing to file %s".doFormat(e.message()); + var errorMsg = "problem writing to file %s".format(e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1975,7 +1975,7 @@ module ParquetMsg { var tmp = glob(filename); if tmp.size <= 0 { - var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".doFormat(filename); + var errorMsg = "Cannot retrieve filename from glob expression %s, check file name or format".format(filename); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1985,7 +1985,7 @@ module ParquetMsg { // Check to see if the file exists. If not, return an error message if !exists(filename) { - var errorMsg = "File %s does not exist in a location accessible to Arkouda".doFormat(filename); + var errorMsg = "File %s does not exist in a location accessible to Arkouda".format(filename); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -2007,7 +2007,7 @@ module ParquetMsg { repMsg = formatJson(items); } catch e : Error { - var errorMsg = "Failed to process Parquet file %?".doFormat(e.message()); + var errorMsg = "Failed to process Parquet file %?".format(e.message()); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -2025,7 +2025,7 @@ module ParquetMsg { try { dsetlist = msgArgs.get("dsets").getList(ndsets); } catch { - var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".doFormat( + var errorMsg = "Could not decode json dataset names via tempfile (%i files: %s)".format( 1, msgArgs.getValueOf("dsets")); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); @@ -2038,7 +2038,7 @@ module ParquetMsg { var n: int = 1000; var jsonfiles = msgArgs.getValueOf("filenames"); var files: string = if jsonfiles.size > 2*n then jsonfiles[0..#n]+'...'+jsonfiles[jsonfiles.size-n..#n] else jsonfiles; - var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".doFormat(nfiles, files); + var errorMsg = "Could not decode json filenames via tempfile (%i files: %s)".format(nfiles, files); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -2057,9 +2057,9 @@ module ParquetMsg { } var tmp = glob(filelist[0]); pqLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "glob expanded %s to %i files".doFormat(filelist[0], tmp.size)); + "glob expanded %s to %i files".format(filelist[0], tmp.size)); if tmp.size == 0 { - var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".doFormat(filelist[0]); + var errorMsg = "The wildcarded filename %s either corresponds to files inaccessible to Arkouda or files of an invalid format".format(filelist[0]); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -2088,7 +2088,7 @@ module ParquetMsg { sizes[i] = getArrSize(fname); } catch e : Error { // This is only type of error thrown by Parquet - fileErrorMsg = "Other error in accessing file %s: %s".doFormat(fname,e.message()); + fileErrorMsg = "Other error in accessing file %s: %s".format(fname,e.message()); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),fileErrorMsg); hadError = true; return new MsgTuple(fileErrorMsg, MsgType.ERROR); @@ -2113,7 +2113,7 @@ module ParquetMsg { st.addEntry(valName, entryVal); rnames.pushBack((dsetname, ObjType.PDARRAY, valName)); } else { - var errorMsg = "Null indices only supported on Parquet string columns, not %? columns".doFormat(ty); + var errorMsg = "Null indices only supported on Parquet string columns, not %? columns".format(ty); pqLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } diff --git a/src/RadixSortLSD.chpl b/src/RadixSortLSD.chpl index 802f66591c..3a79808043 100644 --- a/src/RadixSortLSD.chpl +++ b/src/RadixSortLSD.chpl @@ -65,7 +65,7 @@ module RadixSortLSD */ private proc radixSortLSDCore(ref a:[?aD] ?t, nBits, negs, comparator) throws { try! rsLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "type = %s nBits = %?".doFormat(t:string,nBits)); + "type = %s nBits = %?".format(t:string,nBits)); var temp = makeDistArray((...aD.shape), a.eltType); temp = a; @@ -76,7 +76,7 @@ module RadixSortLSD for rshift in {0..#nBits by bitsPerDigit} { const last = (rshift + bitsPerDigit) >= nBits; try! rsLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "rshift = %?".doFormat(rshift)); + "rshift = %?".format(rshift)); // count digits coforall loc in Locales with (ref globalCounts) { on loc { diff --git a/src/RandMsg.chpl b/src/RandMsg.chpl index 98e9b4ff95..e9965cbcae 100644 --- a/src/RandMsg.chpl +++ b/src/RandMsg.chpl @@ -48,7 +48,7 @@ module RandMsg // if verbose print action randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s len: %i dtype: %s rname: %s aMin: %s: aMax: %s".doFormat( + "cmd: %s len: %i dtype: %s rname: %s aMin: %s: aMax: %s".format( cmd,len,dtype2str(dtype),rname,low.getValue(),high.getValue())); proc doFillRand(type t, param sub: t): MsgTuple throws { @@ -58,11 +58,11 @@ module RandMsg t1 = Time.timeSinceEpoch().totalSeconds(); var e = st.addEntry(rname, (...shape), t); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "alloc time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "alloc time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t1)); const t2 = Time.timeSinceEpoch().totalSeconds(); fillRand(e.a, aMin, aMax, seed); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "compute time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t2)); + "compute time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t2)); const repMsg = "created " + st.attrib(rname); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); @@ -142,11 +142,11 @@ module RandMsg const t1 = Time.timeSinceEpoch().totalSeconds(); var e = st.addEntry(rname, (...shape), bool); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "alloc time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "alloc time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t1)); const t2 = Time.timeSinceEpoch().totalSeconds(); fillBool(e.a, seed); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "compute time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t2)); + "compute time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t2)); const repMsg = "created " + st.attrib(rname); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); @@ -192,11 +192,11 @@ module RandMsg if hasSeed { randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "dtype: %? seed: %i state: %i".doFormat(dtypeStr,seed,state)); + "dtype: %? seed: %i state: %i".format(dtypeStr,seed,state)); } else { randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "dtype: %? state: %i".doFormat(dtypeStr,state)); + "dtype: %? state: %i".format(dtypeStr,state)); } proc creationHelper(type t, seed, state, st: borrowed SymTab): string throws { @@ -225,7 +225,7 @@ module RandMsg rname = creationHelper(bool, seed, state, st); } otherwise { - var errorMsg = "Unhandled data type %s".doFormat(dtypeStr); + var errorMsg = "Unhandled data type %s".format(dtypeStr); randLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -246,7 +246,7 @@ module RandMsg const state = msgArgs.get("state").getIntValue(); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i dtype: %? state %i".doFormat(name, size, dtypeStr, state)); + "name: %? size %i dtype: %? state %i".format(name, size, dtypeStr, state)); st.checkTable(name); @@ -289,7 +289,7 @@ module RandMsg uniformHelper(bool, 0, 1, state, st); } otherwise { - var errorMsg = "Unhandled data type %s".doFormat(dtypeStr); + var errorMsg = "Unhandled data type %s".format(dtypeStr); randLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -307,7 +307,7 @@ module RandMsg rname = st.nextName(); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i state %i".doFormat(name, size, state)); + "name: %? size %i state %i".format(name, size, state)); st.checkTable(name); @@ -403,7 +403,7 @@ module RandMsg rname = st.nextName(); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i method %s state %i".doFormat(name, size, method, state)); + "name: %? size %i method %s state %i".format(name, size, method, state)); st.checkTable(name); @@ -429,7 +429,7 @@ module RandMsg st.addEntry(rname, createSymEntry(exponentialArr)); } otherwise { - var errorMsg = "Only ZIG and INV are supported for method. Recieved: %s".doFormat(method); + var errorMsg = "Only ZIG and INV are supported for method. Recieved: %s".format(method); randLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -457,7 +457,7 @@ module RandMsg randLogger.debug(getModuleName(),pn,getLineNumber(), "genName: %? permName %? segsName: %? weightsName: %? numSamplesName %? replace %i hasWeights %i state %i rname %?" - .doFormat(genName, permName, segsName, weightsName, numSamplesName, replace, hasWeights, state, rname)); + .format(genName, permName, segsName, weightsName, numSamplesName, replace, hasWeights, state, rname)); st.checkTable(permName); st.checkTable(segsName); @@ -515,7 +515,7 @@ module RandMsg randLogger.debug(getModuleName(),pn,getLineNumber(), "gname: %? aname %? wname: %? numSamples %i replace %i hasWeights %i isDom %i dtype %? popSize %? state %i rname %?" - .doFormat(gName, aName, wName, numSamples, replace, hasWeights, isDom, dtypeStr, popSize, state, rname)); + .format(gName, aName, wName, numSamples, replace, hasWeights, isDom, dtypeStr, popSize, state, rname)); proc weightedIdxHelper() throws { var generatorEntry = toGeneratorSymEntry(st.lookup(gName), real); @@ -577,7 +577,7 @@ module RandMsg return choiceHelper(bool); } otherwise { - const errorMsg = "Unhandled data type %s".doFormat(dtypeStr); + const errorMsg = "Unhandled data type %s".format(dtypeStr); randLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -596,7 +596,7 @@ module RandMsg const isDomPerm = msgArgs.get("isDomPerm").getBoolValue(); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i dtype: %? state %i isDomPerm %?".doFormat(name, size, dtypeStr, state, isDomPerm)); + "name: %? size %i dtype: %? state %i isDomPerm %?".format(name, size, dtypeStr, state, isDomPerm)); st.checkTable(name); @@ -645,7 +645,7 @@ module RandMsg permuteHelper(bool); } otherwise { - var errorMsg = "Unhandled data type %s".doFormat(dtypeStr); + var errorMsg = "Unhandled data type %s".format(dtypeStr); randLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -682,7 +682,7 @@ module RandMsg randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i hasSeed %? isSingleLam %? lamStr %? state %i".doFormat(name, size, hasSeed, isSingleLam, lamStr, state)); + "name: %? size %i hasSeed %? isSingleLam %? lamStr %? state %i".format(name, size, hasSeed, isSingleLam, lamStr, state)); st.checkTable(name); @@ -713,7 +713,7 @@ module RandMsg const state = msgArgs.get("state").getIntValue(); randLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "name: %? size %i dtype: %? state %i".doFormat(name, size, dtypeStr, state)); + "name: %? size %i dtype: %? state %i".format(name, size, dtypeStr, state)); st.checkTable(name); @@ -744,7 +744,7 @@ module RandMsg shuffleHelper(bool); } otherwise { - var errorMsg = "Unhandled data type %s".doFormat(dtypeStr); + var errorMsg = "Unhandled data type %s".format(dtypeStr); randLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } diff --git a/src/ReductionMsg.chpl b/src/ReductionMsg.chpl index e99a78d901..f6aee082a4 100644 --- a/src/ReductionMsg.chpl +++ b/src/ReductionMsg.chpl @@ -77,13 +77,13 @@ module ReductionMsg const scalarValue = if (t == bool && (op == "min" || op == "max")) then "bool " + bool2str(if s == 1 then true else false) - else (type2str(opType) + " " + type2fmt(opType)).doFormat(s); + else (type2str(opType) + " " + type2fmt(opType)).format(s); rmLogger.debug(getModuleName(),pn,getLineNumber(),scalarValue); return new MsgTuple(scalarValue, MsgType.NORMAL); } else { const (valid, axes) = validateNegativeAxes(axesRaw, nd); if !valid { - var errorMsg = "Invalid axis value(s) '%?' in slicing reduction".doFormat(axesRaw); + var errorMsg = "Invalid axis value(s) '%?' in slicing reduction".format(axesRaw); rmLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } else { @@ -194,7 +194,7 @@ module ReductionMsg } else { const (valid, axes) = validateNegativeAxes(axesRaw, nd); if !valid { - var errorMsg = "Invalid axis value(s) '%?' in slicing reduction".doFormat(axesRaw); + var errorMsg = "Invalid axis value(s) '%?' in slicing reduction".format(axesRaw); rmLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } else { @@ -285,7 +285,7 @@ module ReductionMsg otherwise halt("unreachable"); } - const scalarValue = "int %i".doFormat(s); + const scalarValue = "int %i".format(s); rmLogger.debug(getModuleName(),pn,getLineNumber(),scalarValue); return new MsgTuple(scalarValue, MsgType.NORMAL); } else { @@ -519,7 +519,7 @@ module ReductionMsg const size = msgArgs.get("size").getIntValue(); var rname = st.nextName(); rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s segments_name: %s size: %s".doFormat(cmd,segments_name, size)); + "cmd: %s segments_name: %s size: %s".format(cmd,segments_name, size)); var gSeg: borrowed GenSymEntry = getGenericTypedArrayEntry(segments_name, st); var segments = toSymEntry(gSeg, int); @@ -591,7 +591,7 @@ module ReductionMsg var rname = st.nextName(); rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s values_name: %s segments_name: %s operator: %s skipNan: %s".doFormat( + "cmd: %s values_name: %s segments_name: %s operator: %s skipNan: %s".format( cmd,values_name,segments_name,op,skipNan)); var gVal: borrowed GenSymEntry = getGenericTypedArrayEntry(values_name, st); var gSeg: borrowed GenSymEntry = getGenericTypedArrayEntry(segments_name, st); @@ -1612,7 +1612,7 @@ module ReductionMsg valsAgg.copy(kvi1, values[idx]); } rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "sort time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "sort time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Finding unique (key, value) pairs..."); var truth = makeDistArray(kD, bool); @@ -1639,7 +1639,7 @@ module ReductionMsg } } rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Finding unique keys and num unique vals per key."); // find steps in keys @@ -1677,7 +1677,7 @@ module ReductionMsg } } rmLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); return res; } diff --git a/src/RegistrationMsg.chpl b/src/RegistrationMsg.chpl index 1d03dd2af9..217df79101 100644 --- a/src/RegistrationMsg.chpl +++ b/src/RegistrationMsg.chpl @@ -35,7 +35,7 @@ module RegistrationMsg { var are = new shared ArrayRegEntry(array_name, objType); st.registry.register_array(reg_name, are); - return new MsgTuple("Registered %s".doFormat(objType: string), MsgType.NORMAL); + return new MsgTuple("Registered %s".format(objType: string), MsgType.NORMAL); } private proc register_segarray(msgArgs: borrowed MessageArgs, st: borrowed SymTab): MsgTuple throws { @@ -92,7 +92,7 @@ module RegistrationMsg { col_list.pushBack(bre); } otherwise { - var errorMsg = "DataFrames only support columns of type pdarray, Strings, Datetime, Timedelta, IPv4, Categorical, BitVector and SegArray. Found %s".doFormat(objType: string); + var errorMsg = "DataFrames only support columns of type pdarray, Strings, Datetime, Timedelta, IPv4, Categorical, BitVector and SegArray. Found %s".format(objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -132,7 +132,7 @@ module RegistrationMsg { key_list.pushBack(cre); } else { - var errorMsg = "GroupBys only support pdarray, Strings, and Categorical keys. Found %s".doFormat(objType: string); + var errorMsg = "GroupBys only support pdarray, Strings, and Categorical keys. Found %s".format(objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -186,7 +186,7 @@ module RegistrationMsg { idx.pushBack(cre); } else { - var errorMsg = "Index only support pdarray, Strings, and Categorical ObjTypes. Found %s".doFormat(objType: string); + var errorMsg = "Index only support pdarray, Strings, and Categorical ObjTypes. Found %s".format(objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -222,7 +222,7 @@ module RegistrationMsg { idx.pushBack(cre); } else { - var errorMsg = "Index only support pdarray, Strings, and Categorical ObjTypes. Found %s".doFormat(objType: string); + var errorMsg = "Index only support pdarray, Strings, and Categorical ObjTypes. Found %s".format(objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -249,7 +249,7 @@ module RegistrationMsg { sre = new shared SeriesRegEntry(ire, cre: shared GenRegEntry); } else { - var errorMsg = "Series only support pdarray, Strings, and Categorical ObjTypes. Found %s".doFormat(val_type: string); + var errorMsg = "Series only support pdarray, Strings, and Categorical ObjTypes. Found %s".format(val_type: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -304,7 +304,7 @@ module RegistrationMsg { return register_bitvector(msgArgs, st); } otherwise { - var errorMsg = "ObjType Not Supported by Registry: %s".doFormat(objtype: string); + var errorMsg = "ObjType Not Supported by Registry: %s".format(objtype: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -357,7 +357,7 @@ module RegistrationMsg { st.registry.unregister_bitvector(bre); } otherwise { - var errorMsg = "ObjType Not Supported by Registry: %s".doFormat(gre.objType: string); + var errorMsg = "ObjType Not Supported by Registry: %s".format(gre.objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -366,7 +366,7 @@ module RegistrationMsg { errorClass="TypeError"); } } - return new MsgTuple("Unregistered %s %s".doFormat(gre.objType: string, name), MsgType.NORMAL); + return new MsgTuple("Unregistered %s %s".format(gre.objType: string, name), MsgType.NORMAL); } proc attachMsg(cmd: string, msgArgs: borrowed MessageArgs, @@ -428,7 +428,7 @@ module RegistrationMsg { rtnMap = bre.asMap(st); } otherwise { - var errorMsg = "Unexpected ObjType, %s, found in registry.".doFormat(gre.objType: string); + var errorMsg = "Unexpected ObjType, %s, found in registry.".format(gre.objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), diff --git a/src/Registry.chpl b/src/Registry.chpl index 447f763e45..b0d44d3ac3 100644 --- a/src/Registry.chpl +++ b/src/Registry.chpl @@ -63,7 +63,7 @@ module Registry { registered_entries.pushBack(bre.array); } otherwise { - var errorMsg = "Dataframes only support pdarray, Strings, SegArray, and Categorical columns. Found %s".doFormat(gre.objType: string); + var errorMsg = "Dataframes only support pdarray, Strings, SegArray, and Categorical columns. Found %s".format(gre.objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -198,7 +198,7 @@ module Registry { registered_entries.remove(bre.array); } otherwise { - var errorMsg = "Dataframes only support pdarray, Strings, Datetime, Timedelta, IPv4, BitVector, SegArray, and Categorical columns. Found %s".doFormat(gre.objType: string); + var errorMsg = "Dataframes only support pdarray, Strings, Datetime, Timedelta, IPv4, BitVector, SegArray, and Categorical columns. Found %s".format(gre.objType: string); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -292,8 +292,8 @@ module Registry { proc checkAvailability(name: string) throws { if tab.contains(name) { regLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "Name, %s, not available for registration. Already in use.".doFormat(name)); - var errorMsg = "Name, %s, not available for registration. Already in use.".doFormat(name); + "Name, %s, not available for registration. Already in use.".format(name)); + var errorMsg = "Name, %s, not available for registration. Already in use.".format(name); throw getErrorWithContext( msg=errorMsg, lineNumber=getLineNumber(), @@ -309,7 +309,7 @@ module Registry { proc checkTable(name: string, calling_func="check") throws { if (!tab.contains(name)) { regLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "undefined registry entry: %s".doFormat(name)); + "undefined registry entry: %s".format(name)); throw getErrorWithContext( msg=unknownSymbolError(pname=calling_func, sname=name), lineNumber=getLineNumber(), @@ -318,7 +318,7 @@ module Registry { errorClass="UnknownSymbolError"); } else { regLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "found registered object: %s".doFormat(name)); + "found registered object: %s".format(name)); } } diff --git a/src/SegStringSort.chpl b/src/SegStringSort.chpl index 26c4c7a64e..1c214a6596 100644 --- a/src/SegStringSort.chpl +++ b/src/SegStringSort.chpl @@ -37,14 +37,14 @@ module SegStringSort { var t = timeSinceEpoch().totalSeconds(); const lengths = ss.getLengths(); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Found lengths in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - t)); + "Found lengths in %? seconds".format(timeSinceEpoch().totalSeconds() - t)); t = timeSinceEpoch().totalSeconds(); // Compute length survival function and choose a pivot length const (pivot, nShort) = getPivot(lengths); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Computed pivot in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - t)); + "Computed pivot in %? seconds".format(timeSinceEpoch().totalSeconds() - t)); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Pivot = %?, nShort = %?".doFormat(pivot, nShort)); + "Pivot = %?, nShort = %?".format(pivot, nShort)); t = timeSinceEpoch().totalSeconds(); const longStart = ss.offsets.a.domain.low + nShort; const isLong = (lengths >= pivot); @@ -63,7 +63,7 @@ module SegStringSort { } } ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Partitioned short/long strings in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - t)); + "Partitioned short/long strings in %? seconds".format(timeSinceEpoch().totalSeconds() - t)); on Locales[Locales.domain.high] { var tl = timeSinceEpoch().totalSeconds(); const ref highDom = {longStart..ss.offsets.a.domain.high}; @@ -72,14 +72,14 @@ module SegStringSort { var stringsWithInds = gatherLongStrings(ss, lengths, highInds); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Gathered long strings in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - tl)); + "Gathered long strings in %? seconds".format(timeSinceEpoch().totalSeconds() - tl)); tl = timeSinceEpoch().totalSeconds(); // Sort the strings, but bring the inds along for the ride const myComparator = new StringIntComparator(); sort(stringsWithInds, comparator=myComparator); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Sorted long strings in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - tl)); + "Sorted long strings in %? seconds".format(timeSinceEpoch().totalSeconds() - tl)); tl = timeSinceEpoch().totalSeconds(); forall (h, s) in zip(highDom, stringsWithInds.domain) with (var agg = newDstAggregator(int)) { @@ -87,12 +87,12 @@ module SegStringSort { agg.copy(gatherInds[h], val); } ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Permuted long inds in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - tl)); + "Permuted long inds in %? seconds".format(timeSinceEpoch().totalSeconds() - tl)); } t = timeSinceEpoch().totalSeconds(); const ranks = radixSortLSD_raw(ss.offsets.a, lengths, ss.values.a, gatherInds, pivot); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Sorted ranks in %? seconds".doFormat(timeSinceEpoch().totalSeconds() - t)); + "Sorted ranks in %? seconds".format(timeSinceEpoch().totalSeconds() - t)); return ranks; } @@ -228,7 +228,7 @@ module SegStringSort { // loop over digits for rshift in {2..#pivot by 2} { - ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"rshift = %?".doFormat(rshift)); + ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"rshift = %?".format(rshift)); // count digits coforall loc in Locales with (ref globalCounts) { on loc { diff --git a/src/SegmentedComputation.chpl b/src/SegmentedComputation.chpl index 77850bf922..8ca4725975 100644 --- a/src/SegmentedComputation.chpl +++ b/src/SegmentedComputation.chpl @@ -139,7 +139,7 @@ module SegmentedComputation { } } } catch { - throw new owned ErrorWithContext("Error computing %s on string or segment".doFormat(function:string), + throw new owned ErrorWithContext("Error computing %s on string or segment".format(function:string), getLineNumber(), getRoutineName(), getModuleName(), diff --git a/src/SegmentedMsg.chpl b/src/SegmentedMsg.chpl index 6f0a71c975..9bb66fccd8 100644 --- a/src/SegmentedMsg.chpl +++ b/src/SegmentedMsg.chpl @@ -34,7 +34,7 @@ module SegmentedMsg { const offsetsName = msgArgs.getValueOf("offsets"); const valuesName = msgArgs.getValueOf("values"); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s offsetsName: %s valuesName: %s".doFormat(cmd, offsetsName, valuesName)); + "cmd: %s offsetsName: %s valuesName: %s".format(cmd, offsetsName, valuesName)); st.checkTable(offsetsName); st.checkTable(valuesName); var offsets = getGenericTypedArrayEntry(offsetsName, st); @@ -47,7 +47,7 @@ module SegmentedMsg { // st.deleteEntry(valuesName); // Now return msg binding our newly created SegString object - var repMsg = "created " + st.attrib(segString.name) + "+created bytes.size %?".doFormat(segString.nBytes); + var repMsg = "created " + st.attrib(segString.name) + "+created bytes.size %?".format(segString.nBytes); smLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -60,7 +60,7 @@ module SegmentedMsg { } else if (comp == "values") { return MsgTuple.payload(tondarrayMsg(entry.values)); } else { - const msg = "Unrecognized component: %s".doFormat(comp); + const msg = "Unrecognized component: %s".format(comp); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(), msg); return MsgTuple.error(msg); } @@ -92,7 +92,7 @@ module SegmentedMsg { } else if entry.dtype == DType.BigInt { arrayBytes = distArrToBytes(toSymEntry(entry, bigint).a); } else { - var errorMsg = "Error: Unhandled dtype %s".doFormat(entry.dtype); + var errorMsg = "Error: Unhandled dtype %s".format(entry.dtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return errorMsg.encode(); // return as bytes } @@ -115,7 +115,7 @@ module SegmentedMsg { overMemLimit(8*len + 16*len + (maxLen + minLen)*len); var (segs, vals) = newRandStringsUniformLength(len, minLen, maxLen, charset, seedStr); var strings = getSegString(segs, vals, st); - repMsg = 'created ' + st.attrib(strings.name) + '+created bytes.size %?'.doFormat(strings.nBytes); + repMsg = 'created ' + st.attrib(strings.name) + '+created bytes.size %?'.format(strings.nBytes); } when "lognormal" { var logMean = msgArgs.get("arg1").getRealValue(); @@ -124,7 +124,7 @@ module SegmentedMsg { overMemLimit(8*len + 16*len + exp(logMean + (logStd**2)/2):int*len); var (segs, vals) = newRandStringsLogNormalLength(len, logMean, logStd, charset, seedStr); var strings = getSegString(segs, vals, st); - repMsg = 'created ' + st.attrib(strings.name) + '+created bytes.size %?'.doFormat(strings.nBytes); + repMsg = 'created ' + st.attrib(strings.name) + '+created bytes.size %?'.format(strings.nBytes); } otherwise { var errorMsg = notImplementedError(pn, dist); @@ -148,7 +148,7 @@ module SegmentedMsg { var rname = st.nextName(); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s objtype: %? name: %?".doFormat( + "cmd: %s objtype: %? name: %?".format( cmd,objtype,name)); select objtype { @@ -159,7 +159,7 @@ module SegmentedMsg { lengths.a = strings.getLengths() - 1; } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(objtype)); + var errorMsg = notImplementedError(pn, "%s".format(objtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -178,7 +178,7 @@ module SegmentedMsg { var genSym = toGenSymEntry(st.lookup(name)); if genSym.dtype != DType.Strings{ - var errorMsg = notImplementedError(pn, "%s".doFormat(dtype2str(genSym.dtype))); + var errorMsg = notImplementedError(pn, "%s".format(dtype2str(genSym.dtype))); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -216,7 +216,7 @@ module SegmentedMsg { st.checkTable(name); var rname = st.nextName(); - smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"cmd: %s objtype: %? name: %?".doFormat(cmd,objtype,name)); + smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"cmd: %s objtype: %? name: %?".format(cmd,objtype,name)); select objtype { when ObjType.STRINGS { @@ -225,32 +225,32 @@ module SegmentedMsg { when "toLower" { var (off, val) = strings.lower(); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); } when "toUpper" { var (off, val) = strings.upper(); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); } when "toTitle" { var (off, val) = strings.title(); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); } when "capitalize" { var (off, val) = strings.capitalize(); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(subcmd)); + var errorMsg = notImplementedError(pn, "%s".format(subcmd)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(objtype)); + var errorMsg = notImplementedError(pn, "%s".format(objtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -270,7 +270,7 @@ module SegmentedMsg { st.checkTable(name); var rname = st.nextName(); - smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"cmd: %s objtype: %? name: %?".doFormat(cmd,objtype,name)); + smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"cmd: %s objtype: %? name: %?".format(cmd,objtype,name)); select objtype { when ObjType.STRINGS { @@ -314,14 +314,14 @@ module SegmentedMsg { repMsg = "created "+st.attrib(rname); } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(subcmd)); + var errorMsg = notImplementedError(pn, "%s".format(subcmd)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(objtype)); + var errorMsg = notImplementedError(pn, "%s".format(objtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -343,7 +343,7 @@ module SegmentedMsg { var rname = st.nextName(); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s objtype: %? valtype: %?".doFormat( + "cmd: %s objtype: %? valtype: %?".format( cmd,objtype,valtype)); select (objtype, valtype) { @@ -354,7 +354,7 @@ module SegmentedMsg { repMsg = "created "+st.attrib(rname); } otherwise { - var errorMsg = "(%s, %s)".doFormat(objtype, valtype); + var errorMsg = "(%s, %s)".format(objtype, valtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -389,7 +389,7 @@ module SegmentedMsg { checkMatchStrings(name, st); smLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "cmd: %s objtype: %?".doFormat(cmd, objtype)); + "cmd: %s objtype: %?".format(cmd, objtype)); if objtype == "Matcher" || objtype == "Match" { const rNumMatchesName = st.nextName(); @@ -417,20 +417,20 @@ module SegmentedMsg { st.addEntry(rfullMatchScanName, createSymEntry(fullMatchScan)); var createdMap = new map(keyType=string,valType=string); - createdMap.add("NumMatches", "created %s".doFormat(st.attrib(rNumMatchesName))); - createdMap.add("Starts", "created %s".doFormat(st.attrib(rStartsName))); - createdMap.add("Lens", "created %s".doFormat(st.attrib(rLensName))); - createdMap.add("Indices", "created %s".doFormat(st.attrib(rIndicesName))); - createdMap.add("SearchBool", "created %s".doFormat(st.attrib(rSearchBoolName))); - createdMap.add("SearchInd", "created %s".doFormat(st.attrib(rSearchScanName))); - createdMap.add("MatchBool", "created %s".doFormat(st.attrib(rMatchBoolName))); - createdMap.add("MatchInd", "created %s".doFormat(st.attrib(rMatchScanName))); - createdMap.add("FullMatchBool", "created %s".doFormat(st.attrib(rfullMatchBoolName))); - createdMap.add("FullMatchInd", "created %s".doFormat(st.attrib(rfullMatchScanName))); + createdMap.add("NumMatches", "created %s".format(st.attrib(rNumMatchesName))); + createdMap.add("Starts", "created %s".format(st.attrib(rStartsName))); + createdMap.add("Lens", "created %s".format(st.attrib(rLensName))); + createdMap.add("Indices", "created %s".format(st.attrib(rIndicesName))); + createdMap.add("SearchBool", "created %s".format(st.attrib(rSearchBoolName))); + createdMap.add("SearchInd", "created %s".format(st.attrib(rSearchScanName))); + createdMap.add("MatchBool", "created %s".format(st.attrib(rMatchBoolName))); + createdMap.add("MatchInd", "created %s".format(st.attrib(rMatchScanName))); + createdMap.add("FullMatchBool", "created %s".format(st.attrib(rfullMatchBoolName))); + createdMap.add("FullMatchInd", "created %s".format(st.attrib(rfullMatchScanName))); repMsg = formatJson(createdMap); } else { - var errorMsg = "%s".doFormat(objtype); + var errorMsg = "%s".format(objtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -457,7 +457,7 @@ module SegmentedMsg { st.checkTable(indicesName); smLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "cmd: %s objtype: %?".doFormat(cmd, objtype)); + "cmd: %s objtype: %?".format(cmd, objtype)); select objtype { when "Matcher" { @@ -470,11 +470,11 @@ module SegmentedMsg { var (off, val, matchOrigins) = strings.findAllMatches(numMatches, starts, lens, indices, returnMatchOrig); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); if returnMatchOrig { const optName: string = if returnMatchOrig then st.nextName() else ""; st.addEntry(optName, createSymEntry(matchOrigins)); - repMsg += "+created %s".doFormat(st.attrib(optName)); + repMsg += "+created %s".format(st.attrib(optName)); } } when "Match" { @@ -488,15 +488,15 @@ module SegmentedMsg { var (off, val, matchOrigins) = strings.findAllMatches(numMatches, starts, lens, indices, returnMatchOrig); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); if returnMatchOrig { st.addEntry(optName, createSymEntry(matchOrigins)); - repMsg += "+created %s".doFormat(st.attrib(optName)); + repMsg += "+created %s".format(st.attrib(optName)); } } // when "Match" do numMatch SymEntry(bool) AND ?t in FindAll declaration in Strings idk if "for k in matchInd..#numMatches[stringInd]" will still work otherwise { - var errorMsg = "%s".doFormat(objtype); + var errorMsg = "%s".format(objtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -519,7 +519,7 @@ module SegmentedMsg { st.checkTable(name); smLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "cmd: %s objtype: %?".doFormat(cmd, objtype)); + "cmd: %s objtype: %?".format(cmd, objtype)); select objtype { when "Matcher" { @@ -527,14 +527,14 @@ module SegmentedMsg { const strings = getSegString(name, st); var (off, val, numSubs) = strings.sub(pattern, repl, count, returnNumSubs); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); if returnNumSubs { st.addEntry(optName, createSymEntry(numSubs)); - repMsg += "+created %s".doFormat(st.attrib(optName)); + repMsg += "+created %s".format(st.attrib(optName)); } } otherwise { - var errorMsg = "%s".doFormat(objtype); + var errorMsg = "%s".format(objtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, errorMsg), MsgType.ERROR); } @@ -558,11 +558,11 @@ module SegmentedMsg { var strings = getSegString(name, st); var (off, val) = strings.strip(msgArgs.getValueOf("chars")); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); return new MsgTuple(repMsg, MsgType.NORMAL); } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(objtype)); + var errorMsg = notImplementedError(pn, "%s".format(objtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -594,7 +594,7 @@ module SegmentedMsg { st.checkTable(name); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s subcmd: %s objtype: %? valtype: %?".doFormat( + "cmd: %s subcmd: %s objtype: %? valtype: %?".format( cmd,subcmd,objtype,valtype)); select (objtype, valtype) { @@ -646,7 +646,7 @@ module SegmentedMsg { } var leftEntry = getSegString(leftName, st); var rightEntry = getSegString(rightName, st); - repMsg = "created %s+created bytes.size %?+created %s+created bytes.size %?".doFormat( + repMsg = "created %s+created bytes.size %?+created %s+created bytes.size %?".format( st.attrib(leftEntry.name), leftEntry.nBytes, st.attrib(rightEntry.name), @@ -654,14 +654,14 @@ module SegmentedMsg { } otherwise { var errorMsg = notImplementedError(pn, - "subcmd: %s, (%s, %s)".doFormat(subcmd, objtype, valtype)); + "subcmd: %s, (%s, %s)".format(subcmd, objtype, valtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } } } otherwise { - var errorMsg = notImplementedError(pn, "(%s, %s)".doFormat(objtype, valtype)); + var errorMsg = notImplementedError(pn, "(%s, %s)".format(objtype, valtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -703,7 +703,7 @@ module SegmentedMsg { st.addEntry(upperName, createSymEntry(upper)); var lowerName = st.nextName(); st.addEntry(lowerName, createSymEntry(lower)); - repMsg = "created %s+created %s".doFormat(st.attrib(upperName), st.attrib(lowerName)); + repMsg = "created %s+created %s".format(st.attrib(upperName), st.attrib(lowerName)); } otherwise { var errorMsg = notImplementedError(pn, objtype: string); @@ -736,7 +736,7 @@ module SegmentedMsg { const name = msgArgs.getValueOf("obj"); const dtype = str2dtype(msgArgs.getValueOf("dtype")); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "subcmd: %s objtype: %s".doFormat(subcmd,objtype)); + "subcmd: %s objtype: %s".format(subcmd,objtype)); try { select subcmd { when "intIndex" { @@ -750,7 +750,7 @@ module SegmentedMsg { return segPdarrayIndex(objtype, name, msgArgs.getValueOf("key"), dtype, st); } otherwise { - var errorMsg = "Error in %s, unknown subcommand %s".doFormat(pn, subcmd); + var errorMsg = "Error in %s, unknown subcommand %s".format(pn, subcmd); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -760,7 +760,7 @@ module SegmentedMsg { smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } catch e: Error { - var errorMsg = "unknown cause %?".doFormat(e); + var errorMsg = "unknown cause %?".format(e); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -774,7 +774,7 @@ module SegmentedMsg { var pn = Reflection.getRoutineName(); // check to make sure symbols defined - smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "strName: %s".doFormat(objName)); + smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "strName: %s".format(objName)); st.checkTable(objName); select objtype { @@ -832,7 +832,7 @@ module SegmentedMsg { var (newSegs, newVals) = if stride == 1 then strings[convertPythonSliceToChapel(start, stop)] else strings[convertSliceToStridableRange(start, stop, stride)]; // Store the resulting offsets and bytes arrays var newStringsObj = getSegString(newSegs, newVals, st); - repMsg = "created " + st.attrib(newStringsObj.name) + "+created bytes.size %?".doFormat(newStringsObj.nBytes); + repMsg = "created " + st.attrib(newStringsObj.name) + "+created bytes.size %?".format(newStringsObj.nBytes); } otherwise { var errorMsg = notImplementedError(pn, objtype: string); @@ -873,7 +873,7 @@ module SegmentedMsg { st.checkTable(objName); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "objtype:%s".doFormat(objtype)); + "objtype:%s".format(objtype)); var gIV: borrowed GenSymEntry = getGenericTypedArrayEntry(iname, st); @@ -890,7 +890,7 @@ module SegmentedMsg { var newStringsObj = getSegString(newSegs, newVals, st); newStringsName = newStringsObj.name; nBytes = newStringsObj.nBytes; - repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".doFormat(nBytes); + repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".format(nBytes); } when DType.UInt64 { var iv = toSymEntry(gIV, uint); @@ -898,7 +898,7 @@ module SegmentedMsg { var newStringsObj = getSegString(newSegs, newVals, st); newStringsName = newStringsObj.name; nBytes = newStringsObj.nBytes; - repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".doFormat(nBytes); + repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".format(nBytes); } when DType.Bool { var iv = toSymEntry(gIV, bool); @@ -906,7 +906,7 @@ module SegmentedMsg { var newStringsObj = getSegString(newSegs, newVals, st); newStringsName = newStringsObj.name; nBytes = newStringsObj.nBytes; - repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".doFormat(nBytes); + repMsg = "created " + st.attrib(newStringsName) + "+created bytes.size %?".format(nBytes); } otherwise { var errorMsg = "("+objtype: string+","+dtype2str(gIV.dtype)+")"; @@ -922,7 +922,7 @@ module SegmentedMsg { } } otherwise { - var errorMsg = "unsupported objtype: %?".doFormat(objtype); + var errorMsg = "unsupported objtype: %?".format(objtype); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(notImplementedError(pn, objtype: string), MsgType.ERROR); } @@ -975,7 +975,7 @@ module SegmentedMsg { var (newOffsets, newVals) = lstrings.stick(rstrings, delim, true); strings = getSegString(newOffsets, newVals, st); } - repMsg = "created %s+created bytes.size %?".doFormat(st.attrib(strings.name), strings.nBytes); + repMsg = "created %s+created bytes.size %?".format(st.attrib(strings.name), strings.nBytes); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); } otherwise { @@ -1035,7 +1035,7 @@ module SegmentedMsg { } } - repMsg = "created %s".doFormat(st.attrib(rname)); + repMsg = "created %s".format(st.attrib(rname)); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -1132,7 +1132,7 @@ module SegmentedMsg { msgArgs.getValueOf("kind"): Fixes, msgArgs.get("proper").getBoolValue()); var retString = getSegString(off, byt, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); if returnOrigins { var leName = st.nextName(); st.addEntry(leName, createSymEntry(longEnough)); @@ -1141,7 +1141,7 @@ module SegmentedMsg { return new MsgTuple(repMsg, MsgType.NORMAL); } otherwise { - var errorMsg = notImplementedError(pn, "%s".doFormat(objtype)); + var errorMsg = notImplementedError(pn, "%s".format(objtype)); smLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -1169,7 +1169,7 @@ module SegmentedMsg { var (off, val) = if isStrLiteral then strings.segStrWhere(other, condition, newLens) else strings.segStrWhere(getSegString(other, st), condition, newLens); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); @@ -1182,7 +1182,7 @@ module SegmentedMsg { var (off, val) = segStrFull(segStrSize, segStrFillValue); var retString = getSegString(off, val, st); - repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".doFormat(retString.nBytes); + repMsg = "created " + st.attrib(retString.name) + "+created bytes.size %?".format(retString.nBytes); return new MsgTuple(repMsg, MsgType.NORMAL); } diff --git a/src/SegmentedString.chpl b/src/SegmentedString.chpl index 0981d54092..23862d73b8 100644 --- a/src/SegmentedString.chpl +++ b/src/SegmentedString.chpl @@ -41,7 +41,7 @@ module SegmentedString { proc getSegString(name: string, st: borrowed SymTab): owned SegString throws { var abstractEntry = st.lookup(name); if !abstractEntry.isAssignableTo(SymbolEntryType.SegStringSymEntry) { - var errorMsg = "Error: Unhandled SymbolEntryType %s".doFormat(abstractEntry.entryType); + var errorMsg = "Error: Unhandled SymbolEntryType %s".format(abstractEntry.entryType); ssLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new Error(errorMsg); } @@ -259,7 +259,7 @@ module SegmentedString { gatheredOffsets -= gatheredLengths; ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "aggregation in %i seconds".doFormat(timeSinceEpoch().totalSeconds() - t1)); + "aggregation in %i seconds".format(timeSinceEpoch().totalSeconds() - t1)); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), "Copying values"); if logLevel == LogLevel.DEBUG { t1 = timeSinceEpoch().totalSeconds(); @@ -305,7 +305,7 @@ module SegmentedString { } } ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Gathered offsets and vals in %i seconds".doFormat( + "Gathered offsets and vals in %i seconds".format( timeSinceEpoch().totalSeconds() -t1)); return (gatheredOffsets, gatheredVals); } @@ -361,7 +361,7 @@ module SegmentedString { if logLevel == LogLevel.DEBUG { ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "hashing took %? seconds\nSorting hashes".doFormat(timeSinceEpoch().totalSeconds() - t1)); + "hashing took %? seconds\nSorting hashes".format(timeSinceEpoch().totalSeconds() - t1)); t1 = timeSinceEpoch().totalSeconds(); } @@ -369,7 +369,7 @@ module SegmentedString { var iv = radixSortLSD_ranks(hashes); if logLevel == LogLevel.DEBUG { ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "sorting took %? seconds".doFormat(timeSinceEpoch().totalSeconds() - t1)); + "sorting took %? seconds".format(timeSinceEpoch().totalSeconds() - t1)); } if logLevel == LogLevel.DEBUG { var sortedHashes = [i in iv] hashes[i]; @@ -378,7 +378,7 @@ module SegmentedString { printAry("diffs = ", diffs); var nonDecreasing = [(d0,d1) in diffs] ((d0 > 0) || ((d0 == 0) && (d1 >= 0))); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Are hashes sorted? %i".doFormat(&& reduce nonDecreasing)); + "Are hashes sorted? %i".format(&& reduce nonDecreasing)); } return iv; } else { @@ -597,7 +597,7 @@ module SegmentedString { const concat2Name = st.nextName(); st.addEntry(concat1Name, createSymEntry(numeric1)); st.addEntry(concat2Name, createSymEntry(numeric2)); - return "%s+%s".doFormat(concat1Name, concat2Name); + return "%s+%s".format(concat1Name, concat2Name); } } @@ -1472,7 +1472,7 @@ module SegmentedString { return new regex(pattern); } catch { - var errorMsg = "re2 could not compile pattern: %s".doFormat(pattern); + var errorMsg = "re2 could not compile pattern: %s".format(pattern); ssLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned IllegalArgumentError(errorMsg); } @@ -1636,7 +1636,7 @@ module SegmentedString { const (uoTest, uvTest, cTest, revTest) = uniqueGroup(testStr); const (segs, vals) = concat(uoMain, uvMain, uoTest, uvTest); ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Unique strings in first array: %?\nUnique strings in second array: %?\nConcat length: %?".doFormat( + "Unique strings in first array: %?\nUnique strings in second array: %?\nConcat length: %?".format( uoMain.size, uoTest.size, segs.size)); var st = new owned SymTab(); const ar = new owned SegString(segs, vals, st); @@ -1675,7 +1675,7 @@ module SegmentedString { } ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Flag pop: %?".doFormat(+ reduce flag)); + "Flag pop: %?".format(+ reduce flag)); // Now flag contains true for both elements of duplicate pairs if invert {flag = !flag;} @@ -1686,7 +1686,7 @@ module SegmentedString { } if logLevel == LogLevel.DEBUG { ssLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "Ret pop: %?".doFormat(+ reduce ret)); + "Ret pop: %?".format(+ reduce ret)); } // Broadcast back to original (pre-unique) order var truth = makeDistArray(mainStr.offsets.a.domain, bool); diff --git a/src/SequenceMsg.chpl b/src/SequenceMsg.chpl index 1d7076338b..4036580b82 100644 --- a/src/SequenceMsg.chpl +++ b/src/SequenceMsg.chpl @@ -27,13 +27,13 @@ module SequenceMsg { proc arangeMsg(cmd: string, msgArgs: borrowed MessageArgs, st: borrowed SymTab): MsgTuple throws { proc arangeHelper(start: ?t, stop: t, stride: t, len, rname) throws { smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s start: %? stop: %? stride: %? : len: %? rname: %s".doFormat( + "cmd: %s start: %? stop: %? stride: %? : len: %? rname: %s".format( cmd, start, stop, stride, len, rname)); var t1 = Time.timeSinceEpoch().totalSeconds(); var ea = makeDistArray(len, t); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "alloc time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "alloc time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t1)); t1 = Time.timeSinceEpoch().totalSeconds(); const ref ead = ea.domain; @@ -42,7 +42,7 @@ module SequenceMsg { } var e = st.addEntry(rname, createSymEntry(ea)); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "compute time = %i sec".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "compute time = %i sec".format(Time.timeSinceEpoch().totalSeconds() - t1)); } var repMsg: string; // response message @@ -105,13 +105,13 @@ module SequenceMsg { // get next symbol name var rname = st.nextName(); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "cmd: %s start: %r stop: %r len: %i stride: %r rname: %s".doFormat( + "cmd: %s start: %r stop: %r len: %i stride: %r rname: %s".format( cmd, start, stop, len, stride, rname)); var t1 = Time.timeSinceEpoch().totalSeconds(); var e = st.addEntry(rname, len, real); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "alloc time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "alloc time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); t1 = Time.timeSinceEpoch().totalSeconds(); ref ea = e.a; @@ -122,7 +122,7 @@ module SequenceMsg { ea[0] = start; ea[len-1] = stop; smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "compute time = %i".doFormat(Time.timeSinceEpoch().totalSeconds() - t1)); + "compute time = %i".format(Time.timeSinceEpoch().totalSeconds() - t1)); repMsg = "created " + st.attrib(rname); smLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); diff --git a/src/ServerConfig.chpl b/src/ServerConfig.chpl index a9c2aee42d..604b519b77 100644 --- a/src/ServerConfig.chpl +++ b/src/ServerConfig.chpl @@ -267,8 +267,8 @@ module ServerConfig const cfg = new owned Config( arkoudaVersion = (ServerConfig.arkoudaVersion:string), chplVersion = chplVersionArkouda, - ZMQVersion = try! "%i.%i.%i".doFormat(Zmajor, Zminor, Zmicro), - HDF5Version = try! "%i.%i.%i".doFormat(H5major, H5minor, H5micro), + ZMQVersion = try! "%i.%i.%i".format(Zmajor, Zminor, Zmicro), + HDF5Version = try! "%i.%i.%i".format(H5major, H5minor, H5micro), serverHostname = serverHostname, ServerPort = ServerPort, numLocales = numLocales, @@ -357,7 +357,7 @@ module ServerConfig proc checkStaticMemoryLimit(total: real) { if total > getMemLimit() { var pct = Math.round((total:real / getMemLimit():real * 100):uint); - var msg = "cmd requiring %i bytes of memory exceeds %i limit with projected pct memory used of %i%%".doFormat( + var msg = "cmd requiring %i bytes of memory exceeds %i limit with projected pct memory used of %i%%".format( total * numLocales, getMemLimit() * numLocales, pct); scLogger.error(getModuleName(),getRoutineName(),getLineNumber(), msg); throw getErrorWithContext( @@ -376,7 +376,7 @@ module ServerConfig if (total > memHighWater) { memHighWater = total; scLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "memory high watermark = %i memory limit = %i projected pct memory used of %i%%".doFormat( + "memory high watermark = %i memory limit = %i projected pct memory used of %i%%".format( memHighWater:uint * numLocales:uint, getMemLimit():uint * numLocales:uint, Math.round((memHighWater:real * numLocales / @@ -398,7 +398,7 @@ module ServerConfig if memMgmtType == MemMgmtType.STATIC { if total > getMemLimit() { var pct = Math.round((total:real / getMemLimit():real * 100):uint); - var msg = "cmd requiring %i bytes of memory exceeds %i limit with projected pct memory used of %i%%".doFormat( + var msg = "cmd requiring %i bytes of memory exceeds %i limit with projected pct memory used of %i%%".format( total * numLocales, getMemLimit() * numLocales, pct); scLogger.error(getModuleName(),getRoutineName(),getLineNumber(), msg); throw getErrorWithContext( @@ -410,7 +410,7 @@ module ServerConfig } } else { if !isMemAvailable(additionalAmount) { - var msg = "cmd requiring %i more bytes of memory exceeds available memory on one or more locales".doFormat( + var msg = "cmd requiring %i more bytes of memory exceeds available memory on one or more locales".format( additionalAmount); scLogger.error(getModuleName(),getRoutineName(),getLineNumber(), msg); throw getErrorWithContext( diff --git a/src/ServerDaemon.chpl b/src/ServerDaemon.chpl index 8c3cea83d0..c388aff53e 100644 --- a/src/ServerDaemon.chpl +++ b/src/ServerDaemon.chpl @@ -157,26 +157,26 @@ module ServerDaemon { proc init() { this.socket = this.context.socket(ZMQ.REP); - try! this.socket.bind("tcp://*:%?".doFormat(ServerPort)); + try! this.socket.bind("tcp://*:%?".format(ServerPort)); } proc getConnectUrl(token: string) throws { if token.isEmpty() { - return "tcp://%s:%?".doFormat(serverHostname, + return "tcp://%s:%?".format(serverHostname, ServerPort); } else { - return "tcp://%s:%i?token=%s".doFormat(serverHostname, + return "tcp://%s:%i?token=%s".format(serverHostname, ServerPort, token); } } proc printServerSplashMessage(token: string, arkDirectory: string) throws { - var verMessage = "arkouda server version = %s".doFormat(arkoudaVersion); - var chplVerMessage = "built with chapel version%s".doFormat(chplVersionArkouda); - var dirMessage = ".arkouda directory %s".doFormat(arkDirectory); - var memLimMessage = "memory limit = %i".doFormat(getMemLimit()); - var memUsedMessage = "bytes of memory used = %i".doFormat(getMemUsed()); + var verMessage = "arkouda server version = %s".format(arkoudaVersion); + var chplVerMessage = "built with chapel version%s".format(chplVersionArkouda); + var dirMessage = ".arkouda directory %s".format(arkDirectory); + var memLimMessage = "memory limit = %i".format(getMemLimit()); + var memUsedMessage = "bytes of memory used = %i".format(getMemUsed()); var serverMessage: string; const buff = ' '; @@ -201,25 +201,25 @@ module ServerDaemon { return buffer; } - serverMessage = "server listening on %s".doFormat(this.connectUrl); + serverMessage = "server listening on %s".format(this.connectUrl); serverMessage = adjustMsg(serverMessage); - serverMessage = "%s %s %s".doFormat(buff,serverMessage,buff); + serverMessage = "%s %s %s".format(buff,serverMessage,buff); var vBuff = generateBuffer(serverMessage,verMessage); verMessage = adjustMsg(verMessage); - verMessage = "*%s %s %s*".doFormat(vBuff,verMessage,vBuff); + verMessage = "*%s %s %s*".format(vBuff,verMessage,vBuff); var cvBuff = generateBuffer(serverMessage,chplVerMessage); chplVerMessage = adjustMsg(chplVerMessage); - chplVerMessage = "*%s %s %s*".doFormat(cvBuff,chplVerMessage,cvBuff); + chplVerMessage = "*%s %s %s*".format(cvBuff,chplVerMessage,cvBuff); var mlBuff = generateBuffer(serverMessage,memLimMessage); memLimMessage = adjustMsg(memLimMessage); - memLimMessage = "*%s %s %s*".doFormat(mlBuff,memLimMessage,mlBuff); + memLimMessage = "*%s %s %s*".format(mlBuff,memLimMessage,mlBuff); var muBuff = generateBuffer(serverMessage,memUsedMessage); memUsedMessage = adjustMsg(memUsedMessage); - memUsedMessage = "*%s %s %s*".doFormat(muBuff,memUsedMessage,muBuff); + memUsedMessage = "*%s %s %s*".format(muBuff,memUsedMessage,muBuff); var blankBuffer: string; var counter = 0; @@ -229,7 +229,7 @@ module ServerDaemon { counter+=1; } - var blankLine = '*%s*'.doFormat(blankBuffer); + var blankLine = '*%s*'.format(blankBuffer); var tag = '*'; counter = 0; @@ -244,7 +244,7 @@ module ServerDaemon { writeln(tag); writeln(tag); writeln(blankLine); - writeln('*%s*'.doFormat(serverMessage)); + writeln('*%s*'.format(serverMessage)); writeln(verMessage); writeln(chplVerMessage); @@ -268,7 +268,7 @@ module ServerDaemon { use IO; if !serverConnectionInfo.isEmpty() { sdLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - 'writing serverConnectionInfo to %?'.doFormat(serverConnectionInfo)); + 'writing serverConnectionInfo to %?'.format(serverConnectionInfo)); try! { var w = open(serverConnectionInfo, ioMode.cw).writer(locking=false); w.writef("%s %i %s\n",serverHostname,ServerPort,this.connectUrl); @@ -287,10 +287,10 @@ module ServerDaemon { } } catch fnfe : FileNotFoundError { sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "The serverConnectionInfo file was not found %s".doFormat(fnfe.message())); + "The serverConnectionInfo file was not found %s".format(fnfe.message())); } catch e : Error { sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "Error in deleting serverConnectionInfo file %s".doFormat(e.message())); + "Error in deleting serverConnectionInfo file %s".format(e.message())); } } @@ -324,7 +324,7 @@ module ServerDaemon { throw new owned ErrorWithMsg("Error: access to arkouda requires a token"); } else if serverToken != token { - throw new owned ErrorWithMsg("Error: token %s does not match server token, check with server owner".doFormat(token)); + throw new owned ErrorWithMsg("Error: token %s does not match server token, check with server owner".format(token)); } } @@ -337,7 +337,7 @@ module ServerDaemon { writeUsedModules(usedModulesFmt); super.requestShutdown(user); this.repCount += 1; - this.socket.send(serialize(msg="shutdown server (%i req)".doFormat(repCount), + this.socket.send(serialize(msg="shutdown server (%i req)".format(repCount), msgType=MsgType.NORMAL,msgFormat=MsgFormat.STRING, user=user)); } @@ -376,7 +376,7 @@ module ServerDaemon { } proc initArkoudaDirectory() throws { - var arkDirectory = '%s%s%s'.doFormat(here.cwd(), pathSep,'.arkouda'); + var arkDirectory = '%s%s%s'.format(here.cwd(), pathSep,'.arkouda'); initDirectory(arkDirectory); return arkDirectory; } @@ -422,7 +422,7 @@ module ServerDaemon { sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "Set Response Time for %s: %?".doFormat(cmd,elapsedTime)); + "Set Response Time for %s: %?".format(cmd,elapsedTime)); // Add response time to the avg response time for the cmd avgResponseTimeMetrics.add(cmd,elapsedTime:real); @@ -436,17 +436,17 @@ module ServerDaemon { sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "Added Avg Response Time for cmd %s: %?".doFormat(cmd,elapsedTime)); + "Added Avg Response Time for cmd %s: %?".format(cmd,elapsedTime)); sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "Total Response Time for cmd %s: %?".doFormat(cmd,totalResponseTimeMetrics.get(cmd))); + "Total Response Time for cmd %s: %?".format(cmd,totalResponseTimeMetrics.get(cmd))); sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "Total Memory Used for cmd %s: %? GB".doFormat(cmd,totalMemoryUsedMetrics.get(cmd))); + "Total Memory Used for cmd %s: %? GB".format(cmd,totalMemoryUsedMetrics.get(cmd))); var apo = getArrayParameterObj(args); @@ -481,7 +481,7 @@ module ServerDaemon { sdLogger.error(getModuleName(), getRoutineName(), getLineNumber(), - 'user: %s cmd: %s error: %s'.doFormat(user, + 'user: %s cmd: %s error: %s'.format(user, cmd, err.msg)); @@ -501,11 +501,11 @@ module ServerDaemon { this.arkDirectory = this.initArkoudaDirectory(); if authenticate { - this.serverToken = getArkoudaToken('%s%s%s'.doFormat(this.arkDirectory, pathSep, 'tokens.txt')); + this.serverToken = getArkoudaToken('%s%s%s'.format(this.arkDirectory, pathSep, 'tokens.txt')); } sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "initialized the .arkouda directory %s".doFormat(this.arkDirectory)); + "initialized the .arkouda directory %s".format(this.arkDirectory)); this.connectUrl = this.getConnectUrl(this.serverToken); this.createServerConnectionInfo(); @@ -548,7 +548,7 @@ module ServerDaemon { request = rawRequest.decode(); } catch e: DecodeError { sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "illegal byte sequence in command: %?".doFormat( + "illegal byte sequence in command: %?".format( rawRequest.decode(decodePolicy.replace))); sendRepMsg(MsgTuple.error(e.message()), "Unknown"); } @@ -566,7 +566,7 @@ module ServerDaemon { } catch e { sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "Argument List size is not an integer. %s cannot be cast".doFormat(msg.size)); + "Argument List size is not an integer. %s cannot be cast".format(msg.size)); sendRepMsg(MsgTuple.error(e.message()), "Unknown"); } @@ -584,7 +584,7 @@ module ServerDaemon { sdLogger.info(getModuleName(), getRoutineName(), getLineNumber(), - "MessageArgs: %?".doFormat(msgArgs)); + "MessageArgs: %?".format(msgArgs)); /* * If authentication is enabled with the --authenticate flag, authenticate @@ -599,10 +599,10 @@ module ServerDaemon { try { if (cmd != "array") { sdLogger.info(getModuleName(), getRoutineName(), getLineNumber(), - ">>> %? %?".doFormat(cmd, args)); + ">>> %? %?".format(cmd, args)); } else { sdLogger.info(getModuleName(), getRoutineName(), getLineNumber(), - ">>> %s [binary data]".doFormat(cmd)); + ">>> %s [binary data]".format(cmd)); } } catch { // No action on error @@ -613,7 +613,7 @@ module ServerDaemon { requestShutdown(user=user); if (trace) { sdLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "<<< shutdown initiated by %s took %.17r sec".doFormat(user, + "<<< shutdown initiated by %s took %.17r sec".format(user, timeSinceEpoch().totalSeconds() - s0)); } } @@ -624,12 +624,12 @@ module ServerDaemon { break; } - /* - * If logCommands is true, log incoming request to the .arkouda/commands.log file - */ - if logCommands { - appendFile(filePath="%s/commands.log".doFormat(this.arkDirectory), formatJson(msg)); - } + /* + * If logCommands is true, log incoming request to the .arkouda/commands.log file + */ + if logCommands { + appendFile(filePath="%s/commands.log".format(this.arkDirectory), formatJson(msg)); + } /* * For messages that return a string repTuple is filled. For binary @@ -645,10 +645,10 @@ module ServerDaemon { select cmd { when "connect" { if authenticate { - repMsg = new MsgTuple("connected to arkouda server tcp://*:%i as user %s with token %s".doFormat( + repMsg = new MsgTuple("connected to arkouda server tcp://*:%i as user %s with token %s".format( ServerPort,user,token), MsgType.NORMAL); } else { - repMsg = new MsgTuple("connected to arkouda server tcp://*:%i".doFormat(ServerPort), MsgType.NORMAL); + repMsg = new MsgTuple("connected to arkouda server tcp://*:%i".format(ServerPort), MsgType.NORMAL); } } when "disconnect" { @@ -657,7 +657,7 @@ module ServerDaemon { break; } - repMsg = new MsgTuple("disconnected from arkouda server tcp://*:%i".doFormat(ServerPort), MsgType.NORMAL); + repMsg = new MsgTuple("disconnected from arkouda server tcp://*:%i".format(ServerPort), MsgType.NORMAL); } when "noop" { repMsg = new MsgTuple("noop", MsgType.NORMAL); @@ -675,17 +675,17 @@ module ServerDaemon { command1D = rawCmd + "1D"; if multiDimCommand && nd > ServerConfig.MaxArrayDims && commandMap.contains(command1D) { const errMsg = "Error: Command '%s' is not supported with the current server configuration " - .doFormat(cmd) + + .format(cmd) + "as the maximum array dimensionality is %i. Please recompile with support for at least %iD arrays" - .doFormat(ServerConfig.MaxArrayDims, nd); + .format(ServerConfig.MaxArrayDims, nd); repMsg = new MsgTuple(errMsg, MsgType.ERROR); sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errMsg); } else if multiDimCommand && commandMap.contains(rawCmd) { - const errMsg = "Error: Command '%s' is not supported for multidimensional arrays".doFormat(rawCmd); + const errMsg = "Error: Command '%s' is not supported for multidimensional arrays".format(rawCmd); repMsg = new MsgTuple(errMsg, MsgType.ERROR); sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errMsg); } else { - repMsg = new MsgTuple("Unrecognized command: %s".doFormat(cmd), MsgType.ERROR); + repMsg = new MsgTuple("Unrecognized command: %s".format(cmd), MsgType.ERROR); sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(),repMsg.msg); } @@ -704,14 +704,14 @@ module ServerDaemon { */ if trace { sdLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "<<< %s took %.17r sec".doFormat(cmd, elapsedTime)); + "<<< %s took %.17r sec".format(cmd, elapsedTime)); } if (trace && memTrack) { var memUsed = getMemUsed():uint * numLocales:uint; var memLimit = (getMemLimit():real * numLocales:uint):int; var pctMemUsed = ((memUsed:real/memLimit)*100):int; sdLogger.info(getModuleName(),getRoutineName(),getLineNumber(), - "bytes of memory %? used after %s command is %?%% pct of max memory %?".doFormat(memUsed, + "bytes of memory %? used after %s command is %?%% pct of max memory %?".format(memUsed, cmd, pctMemUsed, memLimit)); @@ -728,7 +728,7 @@ module ServerDaemon { if trace { sdLogger.error(getModuleName(),getRoutineName(),getLineNumber(), - "<<< %s resulted in error %s in %.17r sec".doFormat(cmd, + "<<< %s resulted in error %s in %.17r sec".format(cmd, ewm.msg, timeSinceEpoch().totalSeconds() - s0)); } @@ -743,7 +743,7 @@ module ServerDaemon { sendRepMsg(MsgTuple.error(errorMsg), user); if trace { sdLogger.error(getModuleName(), getRoutineName(), getLineNumber(), - "<<< %s resulted in %s: %s in %.17r sec".doFormat(cmd, + "<<< %s resulted in %s: %s in %.17r sec".format(cmd, errorName, errorMsg, timeSinceEpoch().totalSeconds() - s0)); @@ -756,7 +756,7 @@ module ServerDaemon { deleteServerConnectionInfo(); sdLogger.info(getModuleName(), getRoutineName(), getLineNumber(), - "requests = %i responseCount = %i elapsed sec = %i".doFormat(reqCount, + "requests = %i responseCount = %i elapsed sec = %i".format(reqCount, repCount, elapsed)); this.shutdown(); @@ -794,18 +794,18 @@ module ServerDaemon { this.socket = this.context.socket(ZMQ.REP); this.port = try! getEnv('METRICS_SERVER_PORT','5556'):int; - try! this.socket.bind("tcp://*:%?".doFormat(this.port)); + try! this.socket.bind("tcp://*:%?".format(this.port)); try! sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "initialized and listening in port %i".doFormat( + "initialized and listening in port %i".format( this.port)); } override proc run() throws { while !this.shutdownDaemon { sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "awaiting message on port %i".doFormat(this.port)); + "awaiting message on port %i".format(this.port)); var req = this.socket.recv(bytes).decode(); var msg: RequestMsg = extractRequest(req); @@ -831,9 +831,9 @@ module ServerDaemon { when "connect" { if authenticate { repTuple = new MsgTuple("connected to arkouda metrics server tcp://*:%i as user " + - "%s with token %s".doFormat(this.port,user,token), MsgType.NORMAL); + "%s with token %s".format(this.port,user,token), MsgType.NORMAL); } else { - repTuple = new MsgTuple("connected to arkouda metrics server tcp://*:%i".doFormat(this.port), + repTuple = new MsgTuple("connected to arkouda metrics server tcp://*:%i".format(this.port), MsgType.NORMAL); } } @@ -898,18 +898,18 @@ module ServerDaemon { this.socket = this.context.socket(ZMQ.REP); this.port = try! getEnv('SERVER_STATUS_PORT','5557'):int; - try! this.socket.bind("tcp://*:%?".doFormat(this.port)); + try! this.socket.bind("tcp://*:%?".format(this.port)); try! sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "initialized and listening in port %i".doFormat( + "initialized and listening in port %i".format( this.port)); } override proc run() throws { while !this.shutdownDaemon { sdLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "awaiting status requests on port %i".doFormat(this.port)); + "awaiting status requests on port %i".format(this.port)); var req = this.socket.recv(bytes).decode(); var msg: RequestMsg = extractRequest(req); @@ -941,9 +941,9 @@ module ServerDaemon { when "connect" { if authenticate { repTuple = new MsgTuple("connected to arkouda status server tcp://*:%i as user " + - "%s with token %s".doFormat(this.port,user,token), MsgType.NORMAL); + "%s with token %s".format(this.port,user,token), MsgType.NORMAL); } else { - repTuple = new MsgTuple("connected to arkouda status server tcp://*:%i".doFormat(this.port), + repTuple = new MsgTuple("connected to arkouda status server tcp://*:%i".format(this.port), MsgType.NORMAL); } } @@ -974,7 +974,7 @@ module ServerDaemon { } otherwise { throw getErrorWithContext( - msg="Unsupported ServerDaemonType: %?".doFormat(daemonType), + msg="Unsupported ServerDaemonType: %?".format(daemonType), lineNumber=getLineNumber(), routineName=getRoutineName(), moduleName=getModuleName(), diff --git a/src/ServerErrorStrings.chpl b/src/ServerErrorStrings.chpl index 2cd36d9862..8c7c7ecb0d 100644 --- a/src/ServerErrorStrings.chpl +++ b/src/ServerErrorStrings.chpl @@ -11,38 +11,38 @@ module ServerErrorStrings /* binary operator is not implemented for DTypes */ proc notImplementedError(pname: string, ldtype: DType, op: string, rdtype: DType):string { - return try! "Error: %s: %s %s %s not implemented".doFormat(pname, + return try! "Error: %s: %s %s %s not implemented".format(pname, dtype2str(ldtype), op, dtype2str(rdtype)); } proc notImplementedError(pname: string, ldtype: string, op: string, rdtype: string):string { - return try! "Error: %s: %s %s %s not implemented".doFormat(pname, + return try! "Error: %s: %s %s %s not implemented".format(pname, ldtype, op, rdtype); } /* efunc is not implemented for DType */ proc notImplementedError(pname: string, efunc: string, ldtype: DType):string { - return try! "Error: %s: %s %s not implemented".doFormat(pname, + return try! "Error: %s: %s %s not implemented".format(pname, efunc, dtype2str(ldtype)); } proc notImplementedError(pname: string, efunc: string, ldtype: DType, param nd: int):string { - return try! "Error: %s: %s %s not implemented for nd = %i".doFormat(pname, + return try! "Error: %s: %s %s not implemented for nd = %i".format(pname, efunc, dtype2str(ldtype), nd); } /* efunc is not implemented for DTypes */ proc notImplementedError(pname: string, efunc: string, dt1: DType, dt2: DType): string { - return try! "Error: %s: %s %s %s not implemented".doFormat(pname, + return try! "Error: %s: %s %s %s not implemented".format(pname, efunc, dtype2str(dt1), dtype2str(dt2)); } proc notImplementedError(pname: string, efunc: string, dt1: DType, dt2: DType, dt3: DType): string { - return try! "Error: %s: %s %s %s %s not implemented".doFormat(pname, + return try! "Error: %s: %s %s %s %s not implemented".format(pname, efunc, dtype2str(dt1), dtype2str(dt2), @@ -50,40 +50,40 @@ module ServerErrorStrings } /* algorthm is not implemented for DType */ proc notImplementedError(pname: string, dtype: DType):string { - return try! "Error: %s: %s not implemented".doFormat(pname, + return try! "Error: %s: %s not implemented".format(pname, dtype2str(dtype)); } /* proc is not implemented for this kind of argument */ proc notImplementedError(pname: string, arg: string):string { - return try! "Error: %s: %s not implemented".doFormat(pname,arg); + return try! "Error: %s: %s not implemented".format(pname,arg); } /* unrecognized DType */ proc unrecognizedTypeError(pname: string, stype: string):string { - return try! "Error: %s: unrecognized type: %s".doFormat(pname, stype); + return try! "Error: %s: unrecognized type: %s".format(pname, stype); } /* name not found in the symbol table */ proc unknownSymbolError(pname: string, sname: string):string { if pname != "" then - return try! "Error: %s: unknown symbol: %s".doFormat(pname, sname); + return try! "Error: %s: unknown symbol: %s".format(pname, sname); else - return try! "Error: unknown symbol: %s".doFormat(sname); + return try! "Error: unknown symbol: %s".format(sname); } proc unknownError(pname: string): string { - return try! "Error: %s: unexpected error".doFormat(pname); + return try! "Error: %s: unexpected error".format(pname); } /* incompatible arguments */ proc incompatibleArgumentsError(pname: string, reason: string) { - return try! "Error: %s: Incompatible arguments: %s".doFormat(pname, reason); + return try! "Error: %s: Incompatible arguments: %s".format(pname, reason); } proc unsupportedTypeError(dtype: DType, pname: string): string { return try! "Error: server not configured to support '%s' (in %s). Please update the configuration and recompile." - .doFormat(dtype2str(dtype), pname); + .format(dtype2str(dtype), pname); } proc unsupportedTypeError(type t, pname: string): string { diff --git a/src/ServerErrors.chpl b/src/ServerErrors.chpl index 756e289edc..68acc0d796 100644 --- a/src/ServerErrors.chpl +++ b/src/ServerErrors.chpl @@ -24,7 +24,7 @@ module ServerErrors { */ proc init(msg : string, lineNumber: int, routineName: string, moduleName: string, errorClass: string='ErrorWithContext') { - try! super.init("%s Line %? In %s.%s: %s".doFormat(errorClass,lineNumber, + try! super.init("%s Line %? In %s.%s: %s".format(errorClass,lineNumber, moduleName, routineName, msg)); @@ -45,7 +45,7 @@ module ServerErrors { * understandable to front-end developers as well as users. */ proc publish() : string { - return try! "Error: %s".doFormat(publishMsg); + return try! "Error: %s".format(publishMsg); } } @@ -234,7 +234,7 @@ module ServerErrors { */ proc generateErrorContext(msg: string, lineNumber: int, moduleName: string, routineName: string, errorClass: string="ErrorWithContext") : string { - return try! "%s %? %s:%s %s".doFormat(errorClass,lineNumber,moduleName,routineName,msg); + return try! "%s %? %s:%s %s".format(errorClass,lineNumber,moduleName,routineName,msg); } /* diff --git a/src/SipHash.chpl b/src/SipHash.chpl index dbaa4d6aa5..c3b33a42f9 100644 --- a/src/SipHash.chpl +++ b/src/SipHash.chpl @@ -163,13 +163,13 @@ module SipHash { if DEBUG { try! { shLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%i v0 %016xu".doFormat(numBytes, v0)); + "%i v0 %016xu".format(numBytes, v0)); shLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%i v1 %016xu".doFormat(numBytes, v1)); + "%i v1 %016xu".format(numBytes, v1)); shLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%i v2 %016xu".doFormat(numBytes, v2)); + "%i v2 %016xu".format(numBytes, v2)); shLogger.debug(getModuleName(),getRoutineName(),getLineNumber(), - "%i v3 %016xu".doFormat(numBytes, v3)); + "%i v3 %016xu".format(numBytes, v3)); } } } @@ -195,7 +195,7 @@ module SipHash { if DEBUG { try! shLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "m = %016xu".doFormat(m)); + "m = %016xu".format(m)); } v3 ^= m; @@ -253,7 +253,7 @@ module SipHash { const res0 = byte_reverse(b); if DEBUG { try! shLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "b = %016xu".doFormat(b)); + "b = %016xu".format(b)); } if (outlen == 8) { @@ -270,7 +270,7 @@ module SipHash { b = v0 ^ v1 ^ v2 ^ v3; if DEBUG { try! shLogger.debug(getModuleName(), getRoutineName(), getLineNumber(), - "b = %016xu".doFormat(b)); + "b = %016xu".format(b)); } return (res0, byte_reverse(b)); } diff --git a/src/SortMsg.chpl b/src/SortMsg.chpl index c8d09a3c9a..cf8befe250 100644 --- a/src/SortMsg.chpl +++ b/src/SortMsg.chpl @@ -44,7 +44,7 @@ module SortMsg algorithm = algoName: SortingAlgorithm; } catch { throw getErrorWithContext( - msg="Unrecognized sorting algorithm: %s".doFormat(algoName), + msg="Unrecognized sorting algorithm: %s".format(algoName), lineNumber=getLineNumber(), pn, moduleName=getModuleName(), @@ -57,7 +57,7 @@ module SortMsg sortLogger.debug( getModuleName(),pn,getLineNumber(), - "cmd: %s, name: %s, sortedName: %s, dtype: %?, nd: %i, axis: %i".doFormat( + "cmd: %s, name: %s, sortedName: %s, dtype: %?, nd: %i, axis: %i".format( cmd, name, rname, gEnt.dtype, nd, axis ) ); @@ -152,7 +152,7 @@ module SortMsg if side != "left" && side != "right" { throw getErrorWithContext( - msg="Unrecognized side: %s".doFormat(side), + msg="Unrecognized side: %s".format(side), lineNumber=getLineNumber(), pn, moduleName=getModuleName(), @@ -173,7 +173,7 @@ module SortMsg sortLogger.debug( getModuleName(),pn,getLineNumber(), - "cmd: %s, x1: %s, x2: %s, side: %s, rname: %s, dtype: %?, nd: %i".doFormat( + "cmd: %s, x1: %s, x2: %s, side: %s, rname: %s, dtype: %?, nd: %i".format( cmd, x1, x2, side, rname, gEntX1.dtype, nd ) ); diff --git a/src/StatsMsg.chpl b/src/StatsMsg.chpl index f9ffb1a1b2..27455e0da2 100644 --- a/src/StatsMsg.chpl +++ b/src/StatsMsg.chpl @@ -38,7 +38,7 @@ module StatsMsg { rname = st.nextName(); if !computations.contains(comp) { - var errorMsg = "Unrecognized stats computation: %s".doFormat(comp); + var errorMsg = "Unrecognized stats computation: %s".format(comp); sLogger.error(getModuleName(),pn,getLineNumber(),errorMsg); return new MsgTuple(errorMsg,MsgType.ERROR); } @@ -57,13 +57,13 @@ module StatsMsg { otherwise halt("unreachable"); } - const scalarValue = "float64 %.17r".doFormat(s); + const scalarValue = "float64 %.17r".format(s); sLogger.debug(getModuleName(),pn,getLineNumber(),scalarValue); return new MsgTuple(scalarValue, MsgType.NORMAL); } else { const (valid, axes) = validateNegativeAxes(axesRaw, nd); if !valid { - const errMsg = "Unable to compute 'std' on array with shape %? using axes %?".doFormat(eIn.tupShape, axesRaw); + const errMsg = "Unable to compute 'std' on array with shape %? using axes %?".format(eIn.tupShape, axesRaw); sLogger.error(getModuleName(),pn,getLineNumber(),errMsg); return new MsgTuple(errMsg,MsgType.ERROR); } else { @@ -120,85 +120,85 @@ module StatsMsg { when (DType.Int64, DType.Int64) { var eX = toSymEntry(x,int); var eY = toSymEntry(y,int); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Int64, DType.Float64) { var eX = toSymEntry(x,int); var eY = toSymEntry(y,real); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Int64, DType.Bool) { var eX = toSymEntry(x,int); var eY = toSymEntry(y,bool); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Int64, DType.UInt64) { var eX = toSymEntry(x,int); var eY = toSymEntry(y,uint); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Float64, DType.Float64) { var eX = toSymEntry(x,real); var eY = toSymEntry(y,real); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Float64, DType.Int64) { var eX = toSymEntry(x,real); var eY = toSymEntry(y,int); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Float64, DType.Bool) { var eX = toSymEntry(x,real); var eY = toSymEntry(y,bool); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Float64, DType.UInt64) { var eX = toSymEntry(x,real); var eY = toSymEntry(y,uint); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Bool, DType.Bool) { var eX = toSymEntry(x,bool); var eY = toSymEntry(y,bool); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Bool, DType.Float64) { var eX = toSymEntry(x,bool); var eY = toSymEntry(y,real); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Bool, DType.Int64) { var eX = toSymEntry(x,bool); var eY = toSymEntry(y,int); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.Bool, DType.UInt64) { var eX = toSymEntry(x,bool); var eY = toSymEntry(y,uint); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.UInt64, DType.UInt64) { var eX = toSymEntry(x,uint); var eY = toSymEntry(y,uint); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.UInt64, DType.Int64) { var eX = toSymEntry(x,uint); var eY = toSymEntry(y,int); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.UInt64, DType.Float64) { var eX = toSymEntry(x,uint); var eY = toSymEntry(y,real); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } when (DType.UInt64, DType.Bool) { var eX = toSymEntry(x,uint); var eY = toSymEntry(y,bool); - repMsg = "float64 %.17r".doFormat(cov(eX.a, eY.a)); + repMsg = "float64 %.17r".format(cov(eX.a, eY.a)); } otherwise { - var errorMsg = unrecognizedTypeError(pn, "(%s,%s)".doFormat(dtype2str(x.dtype),dtype2str(y.dtype))); + var errorMsg = unrecognizedTypeError(pn, "(%s,%s)".format(dtype2str(x.dtype),dtype2str(y.dtype))); sLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); return new MsgTuple(errorMsg, MsgType.ERROR); } @@ -213,7 +213,7 @@ module StatsMsg { var x: borrowed GenSymEntry = getGenericTypedArrayEntry(msgArgs.getValueOf("x"), st); var y: borrowed GenSymEntry = getGenericTypedArrayEntry(msgArgs.getValueOf("y"), st); - var repMsg: string = "float64 %.17r".doFormat(corrHelper(x, y)); + var repMsg: string = "float64 %.17r".format(corrHelper(x, y)); sLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg); return new MsgTuple(repMsg, MsgType.NORMAL); } @@ -270,7 +270,7 @@ module StatsMsg { return corr(toSymEntry(x,uint).a, toSymEntry(y,bool).a); } otherwise { - var errorMsg = unrecognizedTypeError(pn, "(%s,%s)".doFormat(dtype2str(x.dtype),dtype2str(y.dtype))); + var errorMsg = unrecognizedTypeError(pn, "(%s,%s)".format(dtype2str(x.dtype),dtype2str(y.dtype))); sLogger.error(getModuleName(),getRoutineName(),getLineNumber(),errorMsg); throw new owned IllegalArgumentError(errorMsg); } @@ -294,7 +294,7 @@ module StatsMsg { } var retname = st.nextName(); st.addEntry(retname, createSymEntry(corrPdarray)); - corrDict.add(col, "created %s".doFormat(st.attrib(retname))); + corrDict.add(col, "created %s".format(st.attrib(retname))); } var repMsg: string = formatJson(corrDict); diff --git a/src/TimeClassMsg.chpl b/src/TimeClassMsg.chpl index 20da81106f..b411ed7cd1 100644 --- a/src/TimeClassMsg.chpl +++ b/src/TimeClassMsg.chpl @@ -66,28 +66,28 @@ module TimeClassMsg { var retname = st.nextName(); st.addEntry(retname, createSymEntry(day)); - attributesDict.addOrReplace("day", "created %s".doFormat(st.attrib(retname))); + attributesDict.addOrReplace("day", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(month)); - attributesDict.add("month", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("month", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(year)); - attributesDict.add("year", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("year", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(is_leap_year)); - attributesDict.add("isLeapYear", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("isLeapYear", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(dayOfYear)); - attributesDict.add("dayOfYear", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("dayOfYear", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(isoYear)); - attributesDict.add("isoYear", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("isoYear", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(weekOfYear)); - attributesDict.add("weekOfYear", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("weekOfYear", "created %s".format(st.attrib(retname))); retname = st.nextName(); st.addEntry(retname, createSymEntry(dayOfWeek)); - attributesDict.add("dayOfWeek", "created %s".doFormat(st.attrib(retname))); + attributesDict.add("dayOfWeek", "created %s".format(st.attrib(retname))); var repMsg: string = formatJson(attributesDict); @@ -118,7 +118,7 @@ module TimeClassMsg { // "day" is not modded, because it's the last unit [(ei,vi) in zip(e.a,values)] ei = floorDivisionHelper(vi, denominator):int; } - attributesDict.add(u, "created %s".doFormat(st.attrib(retname))); + attributesDict.add(u, "created %s".format(st.attrib(retname))); denominator *= f; //denominator is product of previous factors } return attributesDict; diff --git a/src/Unique.chpl b/src/Unique.chpl index 55fbeed074..fb7901e3a5 100644 --- a/src/Unique.chpl +++ b/src/Unique.chpl @@ -128,7 +128,7 @@ module Unique var iv: [truth.domain] int = (+ scan truth); // compute how many segments var pop = iv[iv.size-1]; - try! uLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"pop = %?".doFormat(pop)); + try! uLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"pop = %?".format(pop)); var segs = makeDistArray(pop, int); var ukeys = makeDistArray(pop, eltType); @@ -261,7 +261,7 @@ module Unique var iv: [aD] int = (+ scan truth); // compute how many segments var pop = iv[iv.size-1]; - uLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"pop = %?".doFormat(pop)); + uLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),"pop = %?".format(pop)); var segs = makeDistArray(pop, int); var counts = makeDistArray(pop, int); diff --git a/src/UniqueMsg.chpl b/src/UniqueMsg.chpl index 09036693bc..6983c1c293 100644 --- a/src/UniqueMsg.chpl +++ b/src/UniqueMsg.chpl @@ -122,7 +122,7 @@ module UniqueMsg var g = getSegString(myNames, st); var (uSegs, uVals) = g[gatherInds]; var newStringsObj = getSegString(uSegs, uVals, st); - repMsg += "created " + st.attrib(newStringsObj.name) + "+created bytes.size %?".doFormat(newStringsObj.nBytes); + repMsg += "created " + st.attrib(newStringsObj.name) + "+created bytes.size %?".format(newStringsObj.nBytes); } } } diff --git a/src/compat/e-132/ArkoudaIOCompat.chpl b/src/compat/e-132/ArkoudaIOCompat.chpl index 1786cc87ac..e59767883e 100644 --- a/src/compat/e-132/ArkoudaIOCompat.chpl +++ b/src/compat/e-132/ArkoudaIOCompat.chpl @@ -17,10 +17,6 @@ module ArkoudaIOCompat { return f.reader().readAll(string); } - proc string.doFormat(vals...?): string throws { - return this.format((...vals)); - } - proc jsonToTupleCompat(json: string, type t) throws { var f = openMemFile(); var w = f.writer(); diff --git a/src/compat/eq-133/ArkoudaIOCompat.chpl b/src/compat/eq-133/ArkoudaIOCompat.chpl index 021c102776..d961791d56 100644 --- a/src/compat/eq-133/ArkoudaIOCompat.chpl +++ b/src/compat/eq-133/ArkoudaIOCompat.chpl @@ -17,10 +17,6 @@ module ArkoudaIOCompat { return f.reader().readAll(string); } - proc string.doFormat(vals...?): string throws { - return this.format((...vals)); - } - proc jsonToTupleCompat(json: string, type t) throws { var f = openMemFile(); var w = f.writer(); diff --git a/src/compat/eq-134/ArkoudaIOCompat.chpl b/src/compat/eq-134/ArkoudaIOCompat.chpl index cea7c0799e..a34232a13f 100644 --- a/src/compat/eq-134/ArkoudaIOCompat.chpl +++ b/src/compat/eq-134/ArkoudaIOCompat.chpl @@ -17,10 +17,6 @@ module ArkoudaIOCompat { return f.reader(locking=false).readAll(string); } - proc string.doFormat(vals...?): string throws { - return this.format((...vals)); - } - proc jsonToTupleCompat(json: string, type t) throws { var f = openMemFile(); var w = f.writer(locking=false); diff --git a/src/compat/ge-20/ArkoudaIOCompat.chpl b/src/compat/ge-20/ArkoudaIOCompat.chpl index cea7c0799e..a34232a13f 100644 --- a/src/compat/ge-20/ArkoudaIOCompat.chpl +++ b/src/compat/ge-20/ArkoudaIOCompat.chpl @@ -17,10 +17,6 @@ module ArkoudaIOCompat { return f.reader(locking=false).readAll(string); } - proc string.doFormat(vals...?): string throws { - return this.format((...vals)); - } - proc jsonToTupleCompat(json: string, type t) throws { var f = openMemFile(); var w = f.writer(locking=false);