Skip to content

Commit c9f8369

Browse files
committed
formatting caused issue. fixed here
1 parent 3745027 commit c9f8369

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

source/utils/profiler/scripts/draw.sh

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,41 @@ detectContent()
6161

6262
}
6363

64+
justOne()
65+
{
66+
local filePrefix type1
67+
filePrefix=$1
68+
type1=$2
69+
70+
echo "python3 ${scriptsHome}/plotRanks.py ${type1} --set dataDir=${extractedFilesLoc} plotPrefix=${currPlotDest}/${filePrefix} jsonAttr=ES"
71+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=ES
72+
73+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=ES_AWD
74+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=ES_AWD logScale=x
75+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=ES_aggregate_info levelAxis=True logScale=x
76+
77+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=FixedMetaInfoGather logScale=xy
78+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=FixedMetaInfoGather logScale=y
79+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=FixedMetaInfoGather
80+
81+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=MetaInfoBcast
82+
83+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=PDW
84+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=PP logScale=x
85+
86+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=transport_0.wbytes whichKind=MB
87+
88+
if [[ $type1 == async* ]] ; then
89+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=BS_WaitOnAsync
90+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=DC_WaitOnAsync1 logScale=x
91+
python3 "${scriptsHome}"/plotRanks.py "${type1}" --set dataDir="${extractedFilesLoc}" plotPrefix="${currPlotDest}"/"${filePrefix}" jsonAttr=DC_WaitOnAsync2 logScale=x
92+
fi
93+
94+
echo "==> plot all the times spent on rank 0: python3 ${scriptsHome}/plotStack.py ${type1} ${type2} --set dataDir=${extractedFilesLoc} whichRank=0 plotPrefix=${currPlotDest}/${filePrefix}"
95+
python3 "${scriptsHome}"/plotStack.py "${type1}" --set dataDir="${extractedFilesLoc}" whichRank=0 plotPrefix="${currPlotDest}"/"${filePrefix}"
96+
#fi
97+
}
98+
6499
compareTwo()
65100
{
66101
local filePrefix type1 type2
@@ -170,7 +205,7 @@ checkPossibilities()
170205
elif ${has_key2}; then
171206
validType=$typeB
172207
fi
173-
compareTwo "${validType}" "${validType}" ## first input is file prefix
208+
justOne "${validType}" "${validType}" ## first input is file prefix
174209
fi
175210
}
176211

source/utils/profiler/scripts/parseMe.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,5 @@ def parse_vars(items):
117117
if showFig_val not in ("true", "false"):
118118
parser.error(f"showFig must be 'True' or 'False', got '{command_options[TAGS['level']]}'")
119119
command_options[TAGS["showfig"]] = showFig_val == "true"
120+
121+
#print (command_options)

source/utils/profiler/tests/1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mv outs/*_* outs/"${time_deco}"
4848

4949
base_name=$(basename "${file_name}" | cut -d. -f1)
5050

51-
echo "source one.sh ${job_id} ${script_home} outs ${time_deco} ${aggType} ${base_name}"
51+
echo "Data extracted, now plotting.."
5252
# shellcheck source=/dev/null
5353
source "${script_home}"/draw.sh "${job_id}" "${script_home}" outs "${time_deco}" "${aggType}" "${base_name}" || {
5454
echo "Error: Failed to source ${script_home}/draw.sh"

0 commit comments

Comments
 (0)