Skip to content

Task/cal 29 cct and supergraph base class #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarusified merged 27 commits into from
Jun 11, 2020
Merged

Task/cal 29 cct and supergraph base class #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
46561f8
rename State to Dataset; remove single and ensemble ccts
jarusified Jun 5, 2020
6bb2a5e
Dataset class works till union operation
jarusified Jun 5, 2020
ed43483
Clean structure for callflow classes and graphframe
jarusified Jun 6, 2020
676e7e6
Add operations folder
jarusified Jun 6, 2020
58fd283
Restructure the dataset class; Union does not work as needed be
jarusified Jun 6, 2020
1f7cf5f
Structure for callflow_single; and delete stuff from utils
jarusified Jun 6, 2020
1e6f163
Remove pipeline from imports; Clean up callflow_*.py files; Rename un…
jarusified Jun 7, 2020
a932521
Remove pipeline folder; They are moved to unused; And unused is ignor…
jarusified Jun 7, 2020
200bf8d
Add read_config to operations folder
jarusified Jun 7, 2020
a6326b7
Blacken the code; Make changes to utils function names
jarusified Jun 7, 2020
622ec8b
Correct the union operation; Fix filter.py; corrrect single callflow …
jarusified Jun 7, 2020
3604a43
Processing works; But needs further validation to know if it dumps al…
jarusified Jun 7, 2020
63b8802
Clean up overhaul; Makes sure processing pipeline works; removes unne…
jarusified Jun 8, 2020
65ea3b1
add read_parameter to config files; rename methods like harsh suggested
jarusified Jun 8, 2020
32a78c2
Add the supergraph classes; WIP
jarusified Jun 8, 2020
bb9feca
mend
jarusified Jun 8, 2020
170b210
Restructure callflow.py -> main.py; removes dataset.py -> supergraph.py
jarusified Jun 8, 2020
7b05108
rename dataset to supergraphs and more consistent data processing; St…
jarusified Jun 9, 2020
08a2a63
Move server to its own folder; rename main.py back to callflow.py
jarusified Jun 9, 2020
feb5c0b
Single CCT works
jarusified Jun 9, 2020
2ac597f
Create all data.json for the single dataset as well
jarusified Jun 9, 2020
9584a36
Modifying how auxiliary processing happens for single and ensemble
jarusified Jun 9, 2020
b2050e2
Minor changes to ensemble supergraph rendering
jarusified Jun 9, 2020
ee64215
Fixes the storage for auxiliary ensemble data
jarusified Jun 9, 2020
e3eea21
Ensemble both server and client works
jarusified Jun 10, 2020
d586a50
Final restructuring and commenting, documentation for modules.
jarusified Jun 11, 2020
56bde6f
Reformatting using black.
jarusified Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
old-code/*
config_files/*
data/*
callflow/unused/*

app/node_modules*
app/dist
Expand Down
34 changes: 17 additions & 17 deletions app/src/components/callflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default {
selectedOutlierBand: 4,
defaultCallSite: "<program root>",
modes: ["Ensemble", "Single"],
selectedMode: "Ensemble",
selectedMode: "Single",
// Presentation mode variables
exhibitModes: ["Presentation", "Default"],
selectedExhibitMode: "Default",
Expand Down Expand Up @@ -164,9 +164,11 @@ export default {

mounted() {
var socket = io.connect(this.server, { reconnect: false });
console.log(this.selectedMode)
this.$socket.emit("init", {
caseStudy: this.selectedCaseStudy
mode: this.selectedMode
});

EventHandler.$on("lasso_selection", () => {
this.$store.resetTargetDataset = true;

Expand Down Expand Up @@ -201,6 +203,7 @@ export default {
this.setTargetDataset();
this.setComponentMap();

console.log(this.selectedFormat.length, this.selectedMode)
if (this.selectedFormat == "SuperGraph") {
if (this.selectedMode == "Single") {
this.$socket.emit("single_callsite_data", {
Expand Down Expand Up @@ -265,13 +268,6 @@ export default {
},

methods: {
// Feature: Sortby the datasets and show the time.
formatRuntimeWithoutUnits(val) {
let format = d3.format(".2");
let ret = format(val);
return ret;
},

// Feature: Sortby the datasets and show the time.
sortDatasetsByAttr(datasets, attr) {
let ret = datasets.sort((a, b) => {
Expand Down Expand Up @@ -330,10 +326,10 @@ export default {
this.selectedMode = "Single";
}

this.$store.maxExcTime = data["max_excTime"];
this.$store.minExcTime = data["min_excTime"];
this.$store.maxIncTime = data["max_incTime"];
this.$store.minIncTime = data["min_incTime"];
this.$store.maxExcTime = data["maxExcTime"];
this.$store.minExcTime = data["minExcTime"];
this.$store.maxIncTime = data["maxIncTime"];
this.$store.minIncTime = data["minIncTime"];

this.$store.numOfRanks = data["numOfRanks"];
this.$store.moduleCallsiteMap = data["module_callsite_map"];
Expand All @@ -342,8 +338,6 @@ export default {
this.$store.selectedMPIBinCount = this.selectedMPIBinCount;
this.$store.selectedRunBinCount = this.selectedRunBinCount;

this.selectedIncTime = ((this.selectedFilterPerc * this.$store.maxIncTime[this.selectedTargetDataset] * 0.000001) / 100).toFixed(3);

this.setViewDimensions();

this.$store.auxiliarySortBy = this.auxiliarySortBy;
Expand Down Expand Up @@ -383,6 +377,7 @@ export default {
this.$store.resetTargetDataset = true;
}
this.$store.selectedMetric = this.selectedMetric;
console.log(this.$store.selectedDatasets)
this.datasets = this.sortDatasetsByAttr(this.$store.selectedDatasets, "Inclusive");

let max_dataset = "";
Expand Down Expand Up @@ -411,8 +406,9 @@ export default {
else {
this.$store.selectedTargetDataset = this.selectedTargetDataset;
}
this.selectedIncTime = ((this.selectedFilterPerc * this.$store.maxIncTime[this.selectedTargetDataset] * 0.000001) / 100).toFixed(3);

console.log("Minimum among all runtimes: ", this.selectedTargetDataset);
console.log("Maximum among all runtimes: ", this.selectedTargetDataset);
},

setComponentMap() {
Expand Down Expand Up @@ -497,6 +493,7 @@ export default {

// Feature: the Supernode hierarchy is automatically selected from the mean metric runtime.
sortModulesByMetric(attr) {
console.log(this.$store.modules)
let module_list = Object.keys(this.$store.modules["ensemble"]);

// Create a map for each dataset mapping the respective mean times.
Expand Down Expand Up @@ -595,7 +592,9 @@ export default {
this.setupColors();
this.setOtherData();
this.setTargetDataset();
this.setSelectedModule();
if(this.selectedFormat == 'SuperGraph' && this.selectedMode == 'Ensemble'){
this.setSelectedModule();
}

console.log("Mode : ", this.selectedMode);
console.log("Number of runs :", this.$store.numOfRuns);
Expand Down Expand Up @@ -623,6 +622,7 @@ export default {
this.loadComponents(this.currentEnsembleCallGraphComponents);
}
else if (this.selectedFormat == "CCT") {
console.log(this.currentEnsembleCCTComponents)
this.initComponents(this.currentEnsembleCCTComponents);
}
}
Expand Down
1 change: 0 additions & 1 deletion app/src/components/ensembleHistogram/ensembleHistogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export default {

EventHandler.$emit("ensemble_histogram", {
module: this.$store.selectedModule,
name: "main",
dataset: this.$store.runNames,
});
},
Expand Down
1 change: 0 additions & 1 deletion app/src/components/ensembleScatterplot/ensembleScatterplot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export default {
this.$refs.ToolTip.init(this.svgID);
EventHandler.$emit("ensemble_scatterplot", {
module: this.$store.selectedModule,
name: "main",
dataset: this.$store.selectedDatasets,
});
},
Expand Down
9 changes: 4 additions & 5 deletions callflow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@

from .datastructures.graphframe import GraphFrame

from .datastructures.supergraph import SuperGraph
from .datastructures.ensemblegraph import EnsembleGraph
from .datastructures.cct import CCT
from .datastructures.supergraph_ensemble import EnsembleSuperGraph
from .datastructures.supergraph_single import SingleSuperGraph
from .datastructures.cct_ensemble import EnsembleCCT
from .datastructures.cct_single import SingleCCT

from .callflow_base import BaseCallFlow
from .callflow_single import SingleCallFlow
from .callflow_ensemble import EnsembleCallFlow
from .callflow import CallFlow
Loading