work in progress updates

Author: Jessica Shi

documentation/docs/scheduling.md

@@ -46,6 +46,15 @@ for (int32_t i = 0; i < A1_dimension; i++) {
 } 
 ```
 
+# Fuse
+
+The `fuse(i, j, f)` transformation takes in two index variables `i` and `j`, where `j` is directly nested under `i`, and collapses them into a fused index variable `f` that iterates over the product of the coordinates `i` and `j`. 
+
+For the SpMV example, we could have: 
+```c++
+stmt = stmt.fuse(i, j, IndexVar("f"));
+```
+
 # Split 
 
 The `split(i, i0, i1, splitFactor)` transformation splits (strip-mines) an index variable `i` into two nested index variables `i0` and `i1`. The size of the inner index variable `i1` is then held constant at `splitFactor`, which must be a positive integer.
@@ -69,6 +78,10 @@ for (int32_t i0 = 0; i0 < ((A1_dimension + 15) / 16); i0++) {
 }
 ```
 
+# Divide
+
+# Precompute
+
 # Reorder
 
 The `reorder(vars)` transformation takes in a new ordering for a set of index variables in the expression that are directly nested in the iteration order. 
@@ -86,5 +99,13 @@ for (int32_t jA = A2_pos[iA]; jA < A2_pos[(iA + 1)]; jA++) {
  }
 ```
 
+# Bound
+
+# Unroll
+
+# Parallelize
+
+
+
 
 

javascripts/demo.js

@@ -615,8 +615,14 @@ function demo() {
     parallelize: {
       parameters: ["Parallel IndexVar", "Hardware", "Race Strategy"],
       0: ["index dropdown"],
-      1: ["predefined dropdown", "CPU Thread", "Not Parallel", "Default Unit", "CPU Thread", "CPU Vector"],
-      2: ["predefined dropdown", "No Races", "Ignore Races", "No Races", "Atomics", "Temporary", "Parallel Reduction"]
+      1: ["predefined multi-dropdown", "CPU Thread", 
+          {"Not Parallel": [], 
+           "Default Unit": [], 
+           "CPU": ["CPU Thread", "CPU Vector", "CPU Thread Group Reduction"],
+           "GPU": ["GPU Block", "GPU Thread", "GPU Block Reduction", "GPU Warp Reduction"]
+          }],
+      2: ["predefined dropdown", "No Races", 
+          "Ignore Races", "No Races", "Atomics", "Temporary", "Parallel Reduction"]
     }
   };
 
@@ -626,9 +632,9 @@ function demo() {
       function empty(parameterName, inputId, input, long = false) {
         var parameter = "<li>"
         parameter += "<div class=\"schedule-input mdl-textfield mdl-js-textfield ";
-        parameter += "mdl-textfield--floating-label getmdl-select has-placeholder "; 
-        parameter += long ? "schedule-input-long" : "";
-        parameter += "\"><input class=\"space-font mdl-textfield__input\""
+        parameter += "mdl-textfield--floating-label getmdl-select has-placeholder\" "; 
+        parameter += long ? "style=\"width:200px\"" : "";
+        parameter += "><input class=\"space-font mdl-textfield__input\""
         parameter += "type=\"text\" autocomplete=\"off\" placeholder=\"\" value = \"";
         parameter += input; 
         parameter += "\" id=\""; 
@@ -640,11 +646,12 @@ function demo() {
         return parameter
       }
 
-      function dropdown(paramterName, inputId, input, defaultValue = "", useMonospace = true) {
+      function dropdown(paramterName, inputId, input, defaultValue = "", useMonospace = true, length = "120px") {
         var parameter = "<li>";
         parameter += "<div class=\"schedule-input dropdown mdl-textfield mdl-js-textfield ";
-        parameter += "mdl-textfield--floating-label getmdl-select has-placeholder\">";
-        parameter += "<input class=\"mdl-textfield__input ";
+        parameter += "mdl-textfield--floating-label getmdl-select has-placeholder\" "; 
+        parameter += "style=\"width:" + length + "\"";
+        parameter += "><input class=\"mdl-textfield__input ";
         if (useMonospace) {
           parameter += "space-font";
         } 
@@ -696,16 +703,47 @@ function demo() {
 
       // a dropdown where user can choose from a set of predefined options
       function predefinedDropdown(parameterName, inputId, input, options) {
-        var parameter = dropdown(parameterName, inputId, input, options[0], false);
+        var parameter = dropdown(parameterName, inputId, input, options[0], false, "160px");
         for (var option of options.slice(1)) {
-          parameter += "<li><a>"; 
+          parameter += "<li style=\"width:160px\"><a>"; 
           parameter += option; 
           parameter += "</a></li>";
         }
         parameter += "</ul></div></li>";
         return parameter; 
       }
 
+      function predefinedMultiDropdown(parameterName, inputId, input, info) {
+        var parameter = dropdown(parameterName, inputId, input, info[0], false, "245px");
+
+        options = info[1];
+        for (var option in options) {
+          if (options[option].length > 0) {
+            parameter += "<li style=\"width:245px\" ";
+            parameter += "class=\"dropdown-submenu ";
+            parameter += option;
+            parameter += "\"><a>" + option;
+            parameter += "<i class=\"material-icons\" style=\"float:right\">";
+            parameter += "keyboard_arrow_right</i></a>";
+            parameter += "<ul class=\"options dropdown-menu\" for=\""; 
+            parameter += inputId;
+            parameter += "\">";
+            for (suboption of options[option]) {
+              parameter += "<li style=\"width:245px\">";
+              parameter += "<a>" + suboption + "</a></li>";
+            }
+            parameter += "</ul></li>";   
+          } else {
+            parameter += "<li style=\"width:245px\"><a>"; 
+            parameter += option; 
+            parameter += "</a></li>";
+          }
+        }
+        parameter += "</ul></div></li>";
+        return parameter; 
+      }
+
+
       var commandInfo = scheduleCommands[command];
       var parametersList = commandInfo["parameters"];
 
@@ -726,6 +764,9 @@ function demo() {
           case "predefined dropdown":
             parameters += predefinedDropdown(parameterName, inputId, input, parameterInfo.slice(1));
             break; 
+          case "predefined multi-dropdown":
+            parameters += predefinedMultiDropdown(parameterName, inputId, input, parameterInfo.slice(1));
+            break; 
           case "default":
             parameters += empty(parameterName, inputId, input); 
             break;
@@ -860,6 +901,18 @@ function demo() {
           model.addReorderedVar(row);
         }); 
       });
+
+      $('.dropdown-submenu a').on("mouseover", function(e){
+        $(this).next('ul').show();
+      });
+
+      // hardcoded currently?
+      $('.CPU').on("mouseleave", function(e){
+        $(this).find('ul').hide();
+      });
+      $('.GPU').on("mouseleave", function(e){
+        $(this).find('ul').hide();
+      });
     }
   };
 

stylesheets/dropdown.css

@@ -6,15 +6,15 @@
 }
 
 .formats li {
-  width: 155px;
+  width: 160px;
 }
 
 .level-formats {
   padding-top: 0px;
 }
 
 .level-formats li {
-  width: 155px; 
+  width: 160px; 
 }
 
 .dropdown li {

stylesheets/style.css

@@ -141,7 +141,7 @@ ul {
 
 .sortable li {
   float: left;
-  width: 155px; 
+  width: 160px; 
   padding: 0.5em;
   padding-top: 0px;
   padding-bottom: 0px;
@@ -221,10 +221,6 @@ ul {
   width: 120px;
 }
 
-.schedule-input-long {
-  width: 200px;
-}
-
 .schedule-list {
   margin: 0px; 
   padding: 0px;