Fix names

Author: zhang677

include/taco/index_notation/index_notation.h

@@ -778,15 +778,17 @@ class IndexStmt : public util::IntrusivePtr<const IndexStmtNode> {
   IndexStmt assemble(TensorVar result, AssembleStrategy strategy, 
                      bool separately_schedulable = false) const;
 
-  /// The wsaccel primitive specifies the dimensions of a workspace that
-  /// will be accelerated. Acc controls whether acceleration will be applied.
-  /// If accels is empty it means all dimensions should be accelerated.
-  /// Currently, it only supports one-dimension acceleration. Acceleration is used
-  /// by default.
+  /// The wsaccel primitive specifies the dimensions of a workspace that will be accelerated.
+  /// Acceleration means adding compressed acceleration datastructures (bitmap, coordinate list) to a dense work space.
+  /// shouldAccel controls whether acceleration will be applied.
+  /// When shouldAccel is true, if accelIndexVars is empty, then all dimensions should be accelerated.
+  /// When shouldAccel is true, if accelIndexVars is not empty, then dimensions in accelIndexVars will be accelerated.
+  /// When shouldAccel is false, accelIndexVars is ignored.
+  /// Currently, it only supports one-dimension acceleration. Acceleration is used by default.
   ///
   /// Precondition:
-  /// Workspace can be accessed by the IndexVars in the accels.
-  IndexStmt wsaccel(TensorVar& ws, bool Acc = true,const std::vector<IndexVar>& accels={});
+  /// Workspace can be accessed by the IndexVars in the accelIndexVars.
+  IndexStmt wsaccel(TensorVar& ws, bool shouldAccel = true,const std::vector<IndexVar>& accelIndexVars ={});
 
   /// Casts index statement to specified subtype.
   template <typename SubType>
@@ -1167,13 +1169,13 @@ class TensorVar : public util::Comparable<TensorVar> {
   const Literal& getFill() const;
 
   /// Gets the acceleration dimensions
-  const std::vector<IndexVar>& getAccels() const;
+  const std::vector<IndexVar>& getaccelIndexVars() const;
 
   /// Gets the acceleration flag
-  bool getAcc() const;
+  bool getshouldAccel() const;
 
   /// Set the acceleration dimensions
-  void setAccels(const std::vector<IndexVar>& accels, bool Acc);
+  void setaccelIndexVars(const std::vector<IndexVar>& accelIndexVars, bool shouldAccel);
 
   /// Set the fill value of the tensor variable
   void setFill(const Literal& fill);

src/index_notation/index_notation.cpp

@@ -1972,7 +1972,7 @@ IndexStmt IndexStmt::pos(IndexVar i, IndexVar ipos, Access access) const {
 
   // Replace all occurrences of i with ipos
   transformed = Transformation(ForAllReplace({i}, {ipos})).apply(transformed, &reason);
-    if (!transformed.defined()) {
+  if (!transformed.defined()) {
     taco_uerror << reason;
   }
 
@@ -2048,9 +2048,9 @@ IndexStmt IndexStmt::assemble(TensorVar result, AssembleStrategy strategy,
   return transformed;
 }
 
-IndexStmt IndexStmt::wsaccel(TensorVar& ws, bool Acc, const std::vector<IndexVar>& accels) {
-    if (accels.size() == 0) {
-        ws.setAccels(accels, Acc);
+IndexStmt IndexStmt::wsaccel(TensorVar& ws, bool shouldAccel, const std::vector<IndexVar>& accelIndexVars) {
+    if (accelIndexVars.size() == 0) {
+        ws.setaccelIndexVars(accelIndexVars, shouldAccel);
         return *this;
     }
     set<IndexVar> TempVars;
@@ -2065,12 +2065,12 @@ IndexStmt IndexStmt::wsaccel(TensorVar& ws, bool Acc, const std::vector<IndexVar
         ctx->match(where->producer);
         ctx->match(where->consumer);
     }));
-    for (auto i : accels) {
+    for (auto i : accelIndexVars) {
         if (TempVars.find(i) == TempVars.end()) {
             taco_uerror << "No matching indexVars in the Accel";
         }
     }
-    ws.setAccels(accels, Acc);
+    ws.setaccelIndexVars(accelIndexVars, shouldAccel);
     return *this;
 }
 
@@ -2546,8 +2546,8 @@ struct TensorVar::Content {
   Format format;
   Schedule schedule;
   Literal fill;
-  std::vector<IndexVar> accels;
-  bool Acc;
+  std::vector<IndexVar> accelIndexVars;
+  bool shouldAccel;
 };
 
 TensorVar::TensorVar() : content(nullptr) {
@@ -2580,8 +2580,8 @@ TensorVar::TensorVar(const int& id, const string& name, const Type& type, const
   content->type = type;
   content->format = format;
   content->fill = fill.defined()? fill : Literal::zero(type.getDataType());
-  content->accels = std::vector<IndexVar> {};
-  content->Acc = true;
+  content->accelIndexVars = std::vector<IndexVar> {};
+  content->shouldAccel = true;
 }
 
 int TensorVar::getId() const {
@@ -2625,17 +2625,17 @@ const Literal& TensorVar::getFill() const {
   return content->fill;
 }
 
-const std::vector<IndexVar>& TensorVar::getAccels() const {
-  return content->accels;
+const std::vector<IndexVar>& TensorVar::getaccelIndexVars() const {
+  return content->accelIndexVars;
 }
 
-bool TensorVar::getAcc() const {
-  return content->Acc;
+bool TensorVar::getshouldAccel() const {
+  return content->shouldAccel;
 }
 
-void TensorVar::setAccels(const std::vector<IndexVar>& accels, bool Acc) {
-  content->Acc = Acc;
-  content->accels = accels;
+void TensorVar::setaccelIndexVars(const std::vector<IndexVar>& accelIndexVars, bool shouldAccel) {
+  content->shouldAccel = shouldAccel;
+  content->accelIndexVars = accelIndexVars;
 }
 
 void TensorVar::setFill(const Literal &fill) {

src/lower/lowerer_impl_imperative.cpp

@@ -2276,7 +2276,7 @@ std::pair<bool,bool> LowererImplImperative::canAccelerateDenseTemp(Where where)
   TensorVar temporary = where.getTemporary();
 
   // (0) Acceleration flag is true
-  if (!temporary.getAcc()) {
+  if (!temporary.getshouldAccel()) {
     return std::make_pair(false, false);
   }