Skip to content
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

Jump to bottom

May Improvements #147

Merged
merged 4 commits into from
May 27, 2024
Merged

May Improvements #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0aa7d6f
Fmt
phschaad May 27, 2024
61ed86d
Better SDFV Settings
phschaad May 27, 2024
7f8d439
Change viewport clamping to minimap bounds instead of graph bounding box
phschaad May 27, 2024
6b743e2
Fixes to edge summarization
phschaad May 27, 2024
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
3,072 changes: 2,182 additions & 890 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spcl/sdfv",
"version": "1.2.4",
"version": "1.2.6",
"description": "A standalone viewer for SDFGs",
"homepage": "https://github.com/spcl/dace-webclient",
"main": "out/index.js",
Expand Down Expand Up @@ -70,7 +70,7 @@
"dependencies": {
"@babel/runtime": "^7.20.7",
"assert": "^2.0.0",
"bootstrap": "^5.2.3",
"bootstrap": "^5.3.0",
"browserify-zlib": "^0.2.0",
"buffer": "^6.0.3",
"chart.js": "^4.1.2",
Expand Down
23 changes: 0 additions & 23 deletions scss/sdfv.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,29 +167,6 @@ body.sdfv {
background-color: silver;
}

.button {
padding: 0.3rem 0.4rem;
border-radius: 5px;
cursor: pointer;
background-color: #eee;
color: black;
}

.button:hover {
background-color: #ccc;
}

.button > span {
margin: 0;
}

button {
border: 0;
margin: 2px;
background: none;
box-shadow: none;
}

pre.code {
margin-top: 0;
margin-bottom: 0;
Expand Down
10 changes: 7 additions & 3 deletions src/overlay_manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import { MathNode, parse, SymbolNode } from 'mathjs';
import { Point2D, SymbolMap } from './index';
import { GenericSdfgOverlay } from './overlays/generic_sdfg_overlay';
import { SDFGRenderer } from './renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from './renderer/renderer';
import { SDFGElement } from './renderer/renderer_elements';
import { createElement } from './utils/utils';

Expand Down Expand Up @@ -346,8 +350,8 @@ export class OverlayManager {
type: string,
ev: MouseEvent,
mousepos: Point2D,
elements: SDFGElement[],
foreground_elem: SDFGElement | undefined,
elements: Record<SDFGElementGroup, GraphElementInfo[]>,
foreground_elem: SDFGElement | null,
ends_drag: boolean
): boolean {
let dirty = false;
Expand Down
27 changes: 16 additions & 11 deletions src/overlays/avg_parallelism_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
SymbolMap,
getGraphElementUUID,
} from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
ControlFlowBlock,
ControlFlowRegion,
Expand Down Expand Up @@ -245,18 +249,20 @@ export class AvgParallelismOverlay extends GenericSdfgOverlay {
visibleRect.y, visibleRect.w, visibleRect.h))
return;

if (node instanceof NestedSDFG && !node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(node.width * node.height) / ppp;
if (node instanceof NestedSDFG &&
!node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(
node.width * node.height
) / ppp;
if ((ctx as any).lod && nodeppp < SDFV.STATE_LOD) {
this.shadeNode(node, ctx);
}
else if (node.attributes().sdfg && node.attributes().sdfg.type !== 'SDFGShell') {
} else if (node.attributes().sdfg &&
node.attributes().sdfg.type !== 'SDFGShell') {
this.recursivelyShadeCFG(
node.data.graph, ctx, ppp, visibleRect
);
}
}
else {
} else {
this.shadeNode(node, ctx);
}
});
Expand All @@ -282,13 +288,12 @@ export class AvgParallelismOverlay extends GenericSdfgOverlay {
type: string,
_ev: Event,
_mousepos: Point2D,
_elements: SDFGElement[],
foreground_elem: SDFGElement,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is a record?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A common supertype for dictionaries, (hash-)maps, etc. - in this case it's used to make a 'typed' dictionary where keys cannot be arbitrary strings, but of a specific set of strings (indicated by the type 'SDFGElementGroup')

foreground_elem: SDFGElement | null,
ends_drag: boolean
): boolean {
if (type === 'click' && !ends_drag) {
if (foreground_elem !== undefined && foreground_elem !== null &&
!(foreground_elem instanceof Edge)) {
if (foreground_elem && !(foreground_elem instanceof Edge)) {
if (foreground_elem.data.avg_parallelism === undefined) {
const avg_parallelism_string = this.avg_parallelism_map[
getGraphElementUUID(foreground_elem)
Expand Down
27 changes: 16 additions & 11 deletions src/overlays/depth_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
SymbolMap,
getGraphElementUUID,
} from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
Edge,
NestedSDFG,
Expand Down Expand Up @@ -230,18 +234,20 @@ export class DepthOverlay extends GenericSdfgOverlay {
visible_rect.y, visible_rect.w, visible_rect.h))
return;

if (node instanceof NestedSDFG && !node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(node.width * node.height) / ppp;
if (node instanceof NestedSDFG &&
!node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(
node.width * node.height
) / ppp;
if ((ctx as any).lod && nodeppp < SDFV.STATE_LOD) {
this.shade_node(node, ctx);
}
else if (node.attributes().sdfg && node.attributes().sdfg.type !== 'SDFGShell') {
} else if (node.attributes().sdfg &&
node.attributes().sdfg.type !== 'SDFGShell') {
this.recursively_shade_sdfg(
node.data.graph, ctx, ppp, visible_rect
);
}
}
else {
} else {
this.shade_node(node, ctx);
}
});
Expand All @@ -263,13 +269,12 @@ export class DepthOverlay extends GenericSdfgOverlay {
type: string,
_ev: Event,
_mousepos: Point2D,
_elements: SDFGElement[],
foreground_elem: SDFGElement,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
foreground_elem: SDFGElement | null,
ends_drag: boolean
): boolean {
if (type === 'click' && !ends_drag) {
if (foreground_elem !== undefined && foreground_elem !== null &&
!(foreground_elem instanceof Edge)) {
if (foreground_elem && !(foreground_elem instanceof Edge)) {
if (foreground_elem.data.depth === undefined) {
const depth_string = this.depth_map[
getGraphElementUUID(foreground_elem)
Expand Down
10 changes: 7 additions & 3 deletions src/overlays/generic_sdfg_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import { log, mean, median } from 'mathjs';
import { Point2D } from '../index';
import { OverlayManager, SymbolResolver } from '../overlay_manager';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import { SDFGElement } from '../renderer/renderer_elements';

declare const vscode: any;
Expand Down Expand Up @@ -43,8 +47,8 @@ export class GenericSdfgOverlay {
_type: string,
_ev: MouseEvent,
_mousepos: Point2D,
_elements: SDFGElement[],
_foreground_elem: SDFGElement | undefined,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
_foreground_elem: SDFGElement | null,
_ends_drag: boolean
): boolean {
return false;
Expand Down
16 changes: 9 additions & 7 deletions src/overlays/logical_group_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright 2019-2024 ETH Zurich and the DaCe authors. All rights reserved.

import { DagreGraph, JsonSDFG, Point2D, SimpleRect } from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
NestedSDFG,
SDFGNode,
Expand Down Expand Up @@ -88,13 +92,11 @@ export class LogicalGroupOverlay extends GenericSdfgOverlay {
// In that case, we overlay the correct grouping color(s).
// If it's expanded or zoomed in close enough, we traverse inside.
const sdfgGroups = sdfg.attributes.logical_groups;
if (sdfgGroups === undefined || sdfgGroups.length === 0) {
if (sdfgGroups === undefined || sdfgGroups.length === 0)
return;
}

if (!graph) {
if (!graph)
return;
}

graph?.nodes().forEach(v => {
const block = graph.node(v);
Expand Down Expand Up @@ -169,8 +171,8 @@ export class LogicalGroupOverlay extends GenericSdfgOverlay {
_type: string,
_ev: MouseEvent,
_mousepos: Point2D,
_elements: SDFGElement[],
_foreground_elem: SDFGElement | undefined,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
_foreground_elem: SDFGElement | null,
_ends_drag: boolean
): boolean {
return false;
Expand Down
13 changes: 8 additions & 5 deletions src/overlays/memory_location_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright 2019-2024 ETH Zurich and the DaCe authors. All rights reserved.

import { DagreGraph, Point2D, SimpleRect } from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
AccessNode,
ControlFlowBlock,
Expand Down Expand Up @@ -267,9 +271,8 @@ export class MemoryLocationOverlay extends GenericSdfgOverlay {
node.data.graph, ctx, ppp, visibleRect
);
} else if (node instanceof AccessNode) {
if (!(ctx as any).lod || ppp < SDFV.NODE_LOD) {
if (!(ctx as any).lod || ppp < SDFV.NODE_LOD)
this.shadeNode(node, ctx);
}
}
});
}
Expand All @@ -294,8 +297,8 @@ export class MemoryLocationOverlay extends GenericSdfgOverlay {
_type: string,
_ev: MouseEvent,
_mousepos: Point2D,
_elements: SDFGElement[],
_foreground_elem: SDFGElement | undefined,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
_foreground_elem: SDFGElement | null,
_ends_drag: boolean
): boolean {
return false;
Expand Down
22 changes: 12 additions & 10 deletions src/overlays/memory_volume_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// Copyright 2019-2024 ETH Zurich and the DaCe authors. All rights reserved.

import { DagreGraph, Point2D, SimpleRect, SymbolMap } from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
ControlFlowBlock,
ControlFlowRegion,
Expand Down Expand Up @@ -218,11 +222,10 @@ export class MemoryVolumeOverlay extends GenericSdfgOverlay {
const edge: Edge = state_graph.edge(e);

// Skip if edge is invisible, or zoomed out far
if ((ctx as any).lod
&& (!edge.intersect(visibleRect.x, visibleRect.y, visibleRect.w, visibleRect.h)
|| ppp > SDFV.EDGE_LOD
)
)
if ((ctx as any).lod && (!edge.intersect(
visibleRect.x, visibleRect.y,
visibleRect.w, visibleRect.h
) || ppp > SDFV.EDGE_LOD))
return;

this.shadeEdge(edge, ctx);
Expand All @@ -249,13 +252,12 @@ export class MemoryVolumeOverlay extends GenericSdfgOverlay {
type: string,
_ev: MouseEvent,
_mousepos: Point2D,
_elements: SDFGElement[],
foreground_elem: SDFGElement | undefined,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
foreground_elem: SDFGElement | null,
ends_drag: boolean
): boolean {
if (type === 'click' && !ends_drag) {
if (foreground_elem !== undefined &&
foreground_elem instanceof Edge) {
if (foreground_elem && foreground_elem instanceof Edge) {
if (foreground_elem.data.volume === undefined) {
if (foreground_elem.data.attributes.volume) {
this.symbolResolver.parse_symbol_expression(
Expand Down
27 changes: 16 additions & 11 deletions src/overlays/operational_intensity_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
SymbolMap,
getGraphElementUUID,
} from '../index';
import { SDFGRenderer } from '../renderer/renderer';
import {
GraphElementInfo,
SDFGElementGroup,
SDFGRenderer,
} from '../renderer/renderer';
import {
Edge,
NestedSDFG,
Expand Down Expand Up @@ -273,18 +277,20 @@ export class OperationalIntensityOverlay extends GenericSdfgOverlay {
visible_rect.y, visible_rect.w, visible_rect.h))
return;

if (node instanceof NestedSDFG && !node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(node.width * node.height) / ppp;
if (node instanceof NestedSDFG &&
!node.data.node.attributes.is_collapsed) {
const nodeppp = Math.sqrt(
node.width * node.height
) / ppp;
if ((ctx as any).lod && nodeppp < SDFV.STATE_LOD) {
this.shade_node(node, ctx);
}
else if (node.attributes().sdfg && node.attributes().sdfg.type !== 'SDFGShell') {
} else if (node.attributes().sdfg &&
node.attributes().sdfg.type !== 'SDFGShell') {
this.recursively_shade_sdfg(
node.data.graph, ctx, ppp, visible_rect
);
}
}
else {
} else {
this.shade_node(node, ctx);
}
});
Expand All @@ -306,13 +312,12 @@ export class OperationalIntensityOverlay extends GenericSdfgOverlay {
type: string,
_ev: Event,
_mousepos: Point2D,
_elements: SDFGElement[],
foreground_elem: SDFGElement,
_elements: Record<SDFGElementGroup, GraphElementInfo[]>,
foreground_elem: SDFGElement | null,
ends_drag: boolean
): boolean {
if (type === 'click' && !ends_drag) {
if (foreground_elem !== undefined && foreground_elem !== null &&
!(foreground_elem instanceof Edge)) {
if (foreground_elem && !(foreground_elem instanceof Edge)) {
if (foreground_elem.data.flops === undefined) {
const flops_string = this.flops_map[
getGraphElementUUID(foreground_elem)
Expand Down
Loading
Loading