Merge pull request #530 from tensor-compiler/example_fixes

Use hard-coded fill values in generated code and don't emit condition…

Author: stephenchouca

include/taco/util/strings.h

@@ -7,6 +7,7 @@
 #include <map>
 #include <iomanip>
 #include <limits>
+#include <cmath>
 
 // To get the value of a compiler macro variable
 #define STRINGIFY(x) #x
@@ -30,6 +31,9 @@ toString(const T &val) {
 template <class T>
 typename std::enable_if<std::is_floating_point<T>::value, std::string>::type
 toString(const T &val) {
+  if (std::isinf(val)) {
+    return (val < 0) ? "-INFINITY" : "INFINITY";
+  }
   std::stringstream sstream;
   sstream << std::setprecision(std::numeric_limits<T>::max_digits10) << std::showpoint << val;
   return sstream.str();

src/index_notation/property_pointers.cpp

@@ -78,7 +78,7 @@ IdentityPtr::IdentityPtr(Literal identity) : PropertyPtr(), content(new Content)
 }
 
 IdentityPtr::IdentityPtr(Literal identity, std::vector<int> &p) : PropertyPtr(), content(new Content) {
-  content->identity;
+  content->identity = identity;
   content->positions = p;
 }
 

src/lower/lowerer_impl_imperative.cpp

@@ -1828,13 +1828,20 @@ Stmt LowererImplImperative::lowerMergeCases(ir::Expr coordinate, IndexVar coordi
   vector<Iterator> inserters;
   tie(appenders, inserters) = splitAppenderAndInserters(loopLattice.results());
 
-  // If loo
-  if (loopLattice.iterators().size() == 1 || (loopLattice.exact() &&
-        isa<Assignment>(stmt) && returnsTrue(stmt.as<Assignment>().getRhs()))) {
-    // Just one iterator so no conditional
+  if (loopLattice.iterators().size() == 1) {
+    // Just one iterator, so no conditionals needed 
     taco_iassert(!loopLattice.points()[0].isOmitter());
-    Stmt body = lowerForallBody(coordinate, stmt, {}, inserters,
-                                appenders, loopLattice, reducedAccesses, mergeStrategy);
+    Stmt body = lowerForallBody(coordinate, stmt, {}, inserters, appenders, 
+                                loopLattice, reducedAccesses, mergeStrategy);
+    result.push_back(body);
+  }
+  else if (loopLattice.exact() && isa<Assignment>(stmt) && 
+           returnsTrue(stmt.as<Assignment>().getRhs())) {
+    // All cases require the same computation, so no conditionals needed
+    taco_iassert(!loopLattice.points()[0].isOmitter());
+    Stmt body = lowerForallBody(coordinate, stmt, {}, inserters, appenders, 
+                                MergeLattice({loopLattice.points()[0]}), 
+                                reducedAccesses, mergeStrategy);
     result.push_back(body);
   }
   else if (!loopLattice.points().empty()) {
@@ -2028,17 +2035,26 @@ Stmt LowererImplImperative::lowerMergeCasesWithExplicitZeroChecks(ir::Expr coord
                                                         MergeStrategy mergeStrategy) {
 
     vector<Stmt> result;
-    if (lattice.points().size() == 1 && lattice.iterators().size() == 1
-        || (lattice.exact() && 
-      isa<Assignment>(stmt) && returnsTrue(stmt.as<Assignment>().getRhs()))) {
-      // Just one iterator so no conditional
+    if (lattice.points().size() == 1 && lattice.iterators().size() == 1) {
+      // Just one iterator, so no conditional needed
       vector<Iterator> appenders;
       vector<Iterator> inserters;
       tie(appenders, inserters) = splitAppenderAndInserters(lattice.results());
       taco_iassert(!lattice.points()[0].isOmitter());
       Stmt body = lowerForallBody(coordinate, stmt, {}, inserters,
                                   appenders, lattice, reducedAccesses, mergeStrategy);
       result.push_back(body);
+    } else if (lattice.exact() && isa<Assignment>(stmt) && 
+               returnsTrue(stmt.as<Assignment>().getRhs())) {
+      // All cases require the same computation, so no conditionals needed
+      vector<Iterator> appenders;
+      vector<Iterator> inserters;
+      tie(appenders, inserters) = splitAppenderAndInserters(lattice.results());
+      taco_iassert(!lattice.points()[0].isOmitter());
+      Stmt body = lowerForallBody(coordinate, stmt, {}, inserters, appenders,
+                                  MergeLattice({lattice.points()[0]}), 
+                                  reducedAccesses, mergeStrategy);
+      result.push_back(body);
     } else if (!lattice.points().empty()) {
       map<Iterator, Expr> iteratorToConditionMap;
 
@@ -3046,7 +3062,7 @@ Stmt LowererImplImperative::initResultArrays(vector<Access> writes,
     taco_iassert(!iterators.empty());
 
     Expr tensor = getTensorVar(write.getTensorVar());
-    Expr fill = GetProperty::make(tensor, TensorProperty::FillValue);
+    Expr fill = lower(write.getTensorVar().getFill());
     Expr valuesArr = GetProperty::make(tensor, TensorProperty::Values);
     bool clearValuesAllocation = false;
 
@@ -3214,7 +3230,7 @@ Stmt LowererImplImperative::initResultArrays(IndexVar var, vector<Access> writes
   vector<Stmt> result;
   for (auto& write : writes) {
     Expr tensor = getTensorVar(write.getTensorVar());
-    Expr fill = GetProperty::make(tensor, TensorProperty::FillValue);
+    Expr fill = lower(write.getTensorVar().getFill());
     Expr values = GetProperty::make(tensor, TensorProperty::Values);
 
     vector<Iterator> iterators = getIteratorsFrom(var, getIterators(write));