July Improvements 1/2 (#173)

spcl · Jul 12, 2022 · 981916f · 981916f
1 parent 1fdeabb
commit 981916f
Show file tree

Hide file tree

Showing 57 changed files with 294 additions and 129 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020-2021, Scalable Parallel Computing Lab, ETH Zurich, and all contributors listed in AUTHORS
+Copyright (c) 2020-2022, Scalable Parallel Computing Lab, ETH Zurich, and all contributors listed in AUTHORS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -26,4 +26,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/backend/dace_vscode/arith_ops.py b/backend/dace_vscode/arith_ops.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+# Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 # All rights reserved.
 
 import ast

diff --git a/backend/dace_vscode/editing.py b/backend/dace_vscode/editing.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+# Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 # All rights reserved.
 
 from dace import (

diff --git a/backend/dace_vscode/transformations.py b/backend/dace_vscode/transformations.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+# Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 # All rights reserved.
 
 from dace import nodes, serialize

diff --git a/backend/dace_vscode/utils.py b/backend/dace_vscode/utils.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+# Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 # All rights reserved.
 
 from dace import SDFG, SDFGState, nodes, serialize

diff --git a/backend/run_dace.py b/backend/run_dace.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+# Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 # All rights reserved.
 
 #####################################################################
@@ -281,6 +281,35 @@ def compile_sdfg(path, suppress_instrumentation=False):
     }
 
 
+def specialize_sdfg(path, symbol_map, remove_undef=True):
+    old_meta = disable_save_metadata()
+
+    loaded = load_sdfg_from_file(path)
+    if loaded['error'] is not None:
+        return loaded['error']
+    sdfg: dace.sdfg.SDFG = loaded['sdfg']
+
+    sdfg.specialize(symbol_map)
+
+    # Remove any constants that are not defined anymore in the symbol map, if
+    # the remove_undef flag is set.
+    if remove_undef:
+        delkeys = set()
+        for key in sdfg.constants_prop:
+            if (key not in symbol_map or symbol_map[key] is None or
+                symbol_map[key] == 0):
+                delkeys.add(key)
+        for key in delkeys:
+            del sdfg.constants_prop[key]
+
+    ret_sdfg = sdfg.to_json()
+
+    restore_save_metadata(old_meta)
+    return {
+        'sdfg': ret_sdfg,
+    }
+
+
 def run_daemon(port):
     from logging.config import dictConfig
     from flask import Flask, request
@@ -356,6 +385,11 @@ def _compile_sdfg_from_file():
         return compile_sdfg(request_json['path'],
                             request_json['suppress_instrumentation'])
 
+    @daemon.route('/specialize_sdfg', methods=['POST'])
+    def _specialize_sdfg():
+        request_json = request.get_json()
+        return specialize_sdfg(request_json['path'], request_json['symbol_map'])
+
     @daemon.route('/insert_sdfg_element', methods=['POST'])
     def _insert_sdfg_element():
         request_json = request.get_json()

diff --git a/media/components/analysis/index.html b/media/components/analysis/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>
@@ -184,11 +184,14 @@
                 </div>
                 <hr class="horizontal-divider">
                 <div id="symbol-list">
-                    <span>
+                    <span id="symbol-list-title">
                         Symbol list:
                     </span>
                     <table id="symbol-table">
                     </table>
+                    <div id="specialize-btn" class="btn btn-primary">
+                        Specialize SDFG
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/media/components/breakpoints/index.html b/media/components/breakpoints/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>

diff --git a/media/components/history/index.html b/media/components/history/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>

diff --git a/media/components/outline/index.html b/media/components/outline/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>

diff --git a/media/components/sdfv/index.html b/media/components/sdfv/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>
@@ -13,6 +13,7 @@
         // Reference to the VSCode API.
         let vscode = undefined;
         const SPLIT_DIRECTION = 'vertical';
+        const MINIMAP_ENABLED = true;
     </script>
 
     <script src="{{ SCRIPT_SRC }}/pdfkit.standalone.js"></script>

diff --git a/media/components/transformations/index.html b/media/components/transformations/index.html
@@ -1,4 +1,4 @@
-<!-- Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors. -->
+<!-- Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors. -->
 <!-- All rights reserved. -->
 
 <!DOCTYPE html>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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.1.3",
+    "version": "1.3.0",
     "engines": {
         "vscode": "^1.68.0"
     },
@@ -38,6 +38,15 @@
     "extensionDependencies": [
         "benjamin-simmonds.pythoncpp-debug"
     ],
+    "capabilities": {
+        "untrustedWorkspaces": {
+            "supported": "limited",
+            "restrictedConfigurations": [
+                "dace.backend.interpreterPath"
+            ],
+            "description": "Certain functionality, like executing or transforming SDFGs, might be unavailable in untrusted workspaces to keep you safe."
+        }
+    },
     "contributes": {
         "debuggers": [
             {
@@ -168,6 +177,11 @@
                             "Split the SDFG Optimizer layout vertically"
                         ]
                     },
+                    "dace.sdfv.minimap": {
+                        "type": "boolean",
+                        "default": true,
+                        "description": "Show a minimap in the top right corner of the SDFG editor"
+                    },
                     "dace.backend.interpreterPath": {
                         "type": "string",
                         "default": "",
@@ -492,7 +506,7 @@
                 {
                     "command": "sdfg.compile",
                     "group": "navigation@0",
-                    "when": "resourceLangId == sdfg"
+                    "when": "resourceLangId == sdfg && isWorkspaceTrusted"
                 }
             ],
             "editor/context": [
@@ -520,12 +534,12 @@
             "view/title": [
                 {
                     "command": "transformationList.addCustom",
-                    "when": "view == transformationList",
+                    "when": "view == transformationList && isWorkspaceTrusted",
                     "group": "navigation"
                 },
                 {
                     "command": "transformationList.addCustomFromDir",
-                    "when": "view == transformationList",
+                    "when": "view == transformationList && isWorkspaceTrusted",
                     "group": "navigation"
                 },
                 {

diff --git a/src/components/analysis.ts b/src/components/analysis.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';

diff --git a/src/components/base_component.ts b/src/components/base_component.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as vscode from 'vscode';

diff --git a/src/components/messaging/component_message_handler.ts b/src/components/messaging/component_message_handler.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as vscode from 'vscode';

diff --git a/src/components/messaging/message_receiver_interface.ts b/src/components/messaging/message_receiver_interface.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as vscode from 'vscode';

diff --git a/src/components/optimization_panel.ts b/src/components/optimization_panel.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import { AnalysisProvider } from './analysis';

diff --git a/src/components/outline.ts b/src/components/outline.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';

diff --git a/src/components/sdfg_breakpoints.ts b/src/components/sdfg_breakpoints.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';

diff --git a/src/components/sdfg_viewer.ts b/src/components/sdfg_viewer.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';
@@ -505,11 +505,10 @@ export class SdfgViewerProvider
         );
 
         // If the settings indicate it, split the webview vertically and put
-        // the info container to the right instead of at the bottom.
-        if (vscode.workspace.getConfiguration(
-            'dace.sdfv'
-        ).layout === 'vertical'
-        ) {
+        // the info container to the right instead of at the bottom. Also hide
+        // the minimap if the settings say so.
+        const sdfvConfig = vscode.workspace.getConfiguration('dace.sdfv');
+        if (sdfvConfig?.get<string>('layout') === 'vertical') {
             baseHtml = baseHtml.replace(
                 '<div id="split-container" class="split-container-vertical">',
                 '<div id="split-container" style="display: flex;" class="split-container-horizontal">'
@@ -519,6 +518,11 @@ export class SdfgViewerProvider
                 'SPLIT_DIRECTION = \'horizontal\';'
             );
         }
+        if (sdfvConfig?.get<boolean>('minimap') === false)
+            baseHtml = baseHtml.replace(
+                'MINIMAP_ENABLED = true;',
+                'MINIMAP_ENABLED = false;'
+            );
 
         return baseHtml;
     }

diff --git a/src/components/transformation_history.ts b/src/components/transformation_history.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';

diff --git a/src/components/transformation_list.ts b/src/components/transformation_list.ts
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 ETH Zurich and the DaCe-VSCode authors.
+// Copyright 2020-2022 ETH Zurich and the DaCe-VSCode authors.
 // All rights reserved.
 
 import * as path from 'path';