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

Conditional Region Support #268

Merged
merged 5 commits into from
Nov 1, 2024
Merged

Conditional Region Support #268

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43819a8
Adapt to Diff / Conditionals
phschaad Oct 9, 2024
de94eb8
Update SDFV
phschaad Oct 31, 2024
f688058
Fix analysis panel
phschaad Oct 31, 2024
d2ec582
Package update
phschaad Oct 31, 2024
e16569e
Reduced dependant ECMA version
phschaad Nov 1, 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
7,387 changes: 3,412 additions & 3,975 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 30 additions & 29 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sdfv",
"displayName": "DaCe SDFG Editor",
"description": "Transform and optimize data-centric programs with a click of a button",
"version": "1.7.10",
"version": "1.7.11",
"engines": {
"vscode": "^1.75.0"
},
Expand Down Expand Up @@ -251,36 +251,36 @@
"dace.sdfv.taskletLOD": {
"type": "number",
"default": 0.35,
"minimum": 0.0,
"maximum": 5.0,
"minimum": 0,
"maximum": 5,
"description": "Zoom-level threshold for drawing tasklet contents"
},
"dace.sdfv.scopeLOD": {
"type": "number",
"default": 0.75,
"minimum": 0.0,
"maximum": 5.0,
"minimum": 0,
"maximum": 5,
"description": "Zoom threshold for drawing simple versions of scopes"
},
"dace.sdfv.edgeLOD": {
"type": "number",
"default": 5.0,
"minimum": 0.0,
"maximum": 10.0,
"default": 5,
"minimum": 0,
"maximum": 10,
"description": "Zoom threshold for drawing memlets and control flow edges"
},
"dace.sdfv.nodeLOD": {
"type": "number",
"default": 5.0,
"minimum": 0.0,
"maximum": 10.0,
"default": 5,
"minimum": 0,
"maximum": 10,
"description": "Zoom threshold for drawing node shapes and labels"
},
"dace.sdfv.textLOD": {
"type": "number",
"default": 1.5,
"minimum": 0.0,
"maximum": 10.0,
"minimum": 0,
"maximum": 10,
"description": "Zoom threshold for drawing node text"
},
"dace.sdfv.nestedLOD": {
Expand Down Expand Up @@ -753,45 +753,46 @@
"postinstall": "patch-package --patch-dir ./packages/sdfv/patches"
},
"devDependencies": {
"@types/dagre": "^0.7.48",
"@types/dagre": "^0.7.52",
"@types/glob": "^8.0.0",
"@types/jquery": "^3.5.16",
"@types/jquery-editable-select": "^2.2.1",
"@types/mocha": "^10.0.1",
"@types/node": "^12.20.55",
"@types/semver": "^7.5.8",
"@types/uuid": "^8.3.4",
"@types/vscode": "^1.75.0",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"@vscode/test-electron": "^2.2.2",
"autoprefixer": "^10.4.13",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"eslint": "^8.31.0",
"css-loader": "^7.1.2",
"eslint": "^9.9.1",
"file-loader": "^6.2.0",
"glob": "^8.0.3",
"mocha": "^10.2.0",
"postcss-loader": "^7.3.3",
"rimraf": "^5.0.5",
"sass": "^1.57.1",
"sass-loader": "^13.3.2",
"style-loader": "^3.3.3",
"postcss-loader": "^8.1.1",
"rimraf": "^6.0.1",
"sass": "^1.77.6",
"sass-loader": "^16.0.1",
"style-loader": "^4.0.0",
"ts-loader": "^9.5.1",
"typescript": "^5.3.3",
"webpack": "^5.89.0",
"typescript": "^5.5.4",
"webpack": "^5.94.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@popperjs/core": "^2.11.6",
"@vscode/debugadapter": "^1.58.0",
"@vscode/debugprotocol": "^1.58.0",
"bootstrap": "^5.3.0",
"bootstrap": "^5.3.3",
"browserify-zlib": "^0.2.0",
"dagre": "^0.8.5",
"jquery": "^3.6.3",
"jquery": "^3.7.1",
"jquery-editable-select": "^2.2.5",
"material-symbols": "^0.19.0",
"monaco-editor": "^0.45.0",
"material-symbols": "^0.22.2",
"monaco-editor": "^0.51.0",
"process": "^0.11.10",
"semver": "^7.6.2",
"stream-browserify": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdfv
Open in desktop
Submodule sdfv updated 62 files
+3 −3 .github/workflows/build.yml
+1 −1 .github/workflows/build_dist.yml
+2 −2 .github/workflows/gh-pages.yml
+3 −3 .github/workflows/test.yml
+27 −0 index.html
+206 −181 jest.config.ts
+8 −0 mocks/monaco-editor.ts
+2,456 −2,982 package-lock.json
+37 −33 package.json
+5 −0 scss/color_schemes/default.scss
+77 −3 scss/sdfv.scss
+2 −88 src/index.ts
+1,102 −0 src/layouter/layout.ts
+27 −4 src/layouter/state_machine/sm_layouter.ts
+3 −2 src/local_view/elements/map_node.ts
+3 −2 src/local_view/elements/memory_node.ts
+1 −1 src/local_view/graph/graph.ts
+2 −1 src/local_view/lview_parser.ts
+10 −12 src/local_view/lview_renderer.ts
+9 −4 src/overlay_manager.ts
+76 −126 src/overlays/avg_parallelism_overlay.ts
+75 −121 src/overlays/depth_overlay.ts
+87 −0 src/overlays/diff_overlay.ts
+163 −11 src/overlays/generic_sdfg_overlay.ts
+32 −96 src/overlays/logical_group_overlay.ts
+7 −74 src/overlays/memory_location_overlay.ts
+23 −102 src/overlays/memory_volume_overlay.ts
+73 −116 src/overlays/operational_intensity_overlay.ts
+21 −78 src/overlays/runtime_micro_seconds_overlay.ts
+72 −119 src/overlays/simulated_operational_intensity_overlay.ts
+79 −119 src/overlays/static_flops_overlay.ts
+6 −5 src/renderer/canvas_manager.ts
+627 −1,173 src/renderer/renderer.ts
+336 −144 src/renderer/renderer_elements.ts
+766 −0 src/sdfg_diff_viewer.ts
+437 −672 src/sdfv.ts
+286 −0 src/sdfv_ui.ts
+98 −0 src/types.ts
+21 −11 src/utils/bounding_box.ts
+1 −1 src/utils/sdfg/dotgraph.ts
+2 −1 src/utils/sdfg/json_serializer.ts
+13 −4 src/utils/sdfg/memlet_trees.ts
+0 −171 src/utils/sdfg/sdfg_parser.ts
+8 −8 src/utils/sdfg/sdfg_utils.ts
+2 −1 src/utils/sdfg/traversal.ts
+28 −34 src/utils/sdfv_settings.ts
+17 −12 src/utils/utils.ts
+1,687 −0 tests/test_graphs/gemm_expanded_pure.sdfg
+1,687 −0 tests/test_graphs/gemm_expanded_pure_pre_0_16.sdfg
+2,153 −0 tests/test_graphs/gemm_expanded_pure_tiled.sdfg
+503 −0 tests/test_graphs/while_do.sdfg
+2 −0 tests/unit/layouter/graphlib/algorithms/cycles.test.ts
+2 −0 tests/unit/layouter/graphlib/di_graph.test.ts
+2 −0 tests/unit/layouter/graphlib/graph.test.ts
+52 −5 tests/unit/layouter/state_machine/sm_layouter.test.ts
+92 −0 tests/unit/sdfg_diff_viewer.test.ts
+82 −0 tests/unit/utils/collections.test.ts
+42 −0 tests/unit/utils/sdfg/dotgraph.test.ts
+30 −0 tests/unit/utils/sdfg/memlet_trees.test.ts
+82 −0 tests/unit/utils/sdfg/sdfg_utils.test.ts
+13 −0 tests/unit/utils/utils.test.ts
+1 −0 webpack.config.js
2 changes: 1 addition & 1 deletion src/components/sdfg_editor/compressed_sdfg_editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class CompressedSDFGEditor extends SDFGEditorBase {

public async handleLocalEdit(sdfg: string): Promise<void> {
return new Promise((resolve, reject) => {
const compressed = gzipSync(sdfg);
const compressed = new Uint8Array(gzipSync(sdfg));
Promise.all([
this.onSDFGEdited(compressed),
this.invoke('updateContents', [compressed, false])
Expand Down
Loading