Did some naming changes in response to review

Chillee · Chillee · commit b04473911c85 · 2019-05-29T18:03:30.000-07:00
diff --git a/torch/csrc/jit/passes/alias_analysis.cpp b/torch/csrc/jit/passes/alias_analysis.cpp
@@ -162,14 +162,14 @@ void AliasDb::dump() const {
     if (!element->pointsTo.empty()) {
       std::cout << getElementName(element) << " points to: ";
       for (const auto pointedTo : element->pointsTo) {
-        std::cout << getElementName(Element::toElement(pointedTo)) << ", ";
+        std::cout << getElementName(Element::fromIndex(pointedTo)) << ", ";
       }
       std::cout << "\n";
     }
     if (!element->contained_elements.empty()) {
       std::cout << getElementName(element) << " contains: ";
       for (const auto contained : element->contained_elements) {
-        std::cout << getElementName(Element::toElement(contained)) << ", ";
+        std::cout << getElementName(Element::fromIndex(contained)) << ", ";
       }
       std::cout << "\n";
     }
@@ -540,7 +540,7 @@ void AliasDb::analyzeWait(Node* node) {
     const auto el = pr.second;
     const auto& pointedFrom = el->pointedFrom;
     TORCH_INTERNAL_ASSERT(!pointedFrom.empty());
-    const auto wildcardValue = Element::toElement(*pointedFrom.begin())->value;
+    const auto wildcardValue = Element::fromIndex(*pointedFrom.begin())->value;
     TORCH_INTERNAL_ASSERT(wildcardValue);
     registerWrite(wildcardValue, node);
   }
diff --git a/torch/csrc/jit/passes/utils/memory_dag.cpp b/torch/csrc/jit/passes/utils/memory_dag.cpp
@@ -8,16 +8,16 @@
 namespace torch {
 namespace jit {
 namespace {
-std::vector<const Element*> decomprMap;
+std::vector<const Element*> indexToElementMap;
 } // namespace
 unsigned Element::indexCount = 0;
 Element::Element(const Value* value_) : value(value_), index(indexCount++) {
-  decomprMap.push_back(this);
+  indexToElementMap.push_back(this);
 }
 
-const Element* Element::toElement(unsigned x) {
-  TORCH_INTERNAL_ASSERT(x < decomprMap.size());
-  auto res = decomprMap[x];
+const Element* Element::fromIndex(unsigned x) {
+  TORCH_INTERNAL_ASSERT(x < indexToElementMap.size());
+  auto res = indexToElementMap[x];
   return res;
 }
 
@@ -55,11 +55,11 @@ void collectAllContainedMemoryLocations(
   cont.set(compIdx);
 
   for (const auto& mem_loc : elem->getMemoryLocations()) {
-    collectAllContainedMemoryLocations(Element::toElement(mem_loc), cont);
+    collectAllContainedMemoryLocations(Element::fromIndex(mem_loc), cont);
   }
 
   for (const auto& contained : elem->contained_elements) {
-    collectAllContainedMemoryLocations(Element::toElement(contained), cont);
+    collectAllContainedMemoryLocations(Element::fromIndex(contained), cont);
   }
 }
 
@@ -131,25 +131,25 @@ void Element::bfs(BfsDirection dir, MemoryLocations& res) const {
   ska::flat_hash_set<int> seen;
   queue.push(this->index);
   while (!queue.empty()) {
-    const auto el = queue.front();
+    const auto index = queue.front();
     queue.pop();
-    seen.insert(el);
-    auto decompEl = Element::toElement(el);
-    if (decompEl->pointsTo.empty()) {
-      res.set(el);
+    seen.insert(index);
+    auto el = Element::fromIndex(index);
+    if (el->pointsTo.empty()) {
+      res.set(index);
     }
 
     switch (dir) {
       case BfsDirection::POINTS_TO: {
-        for (auto ptr : decompEl->pointsTo) {
+        for (auto ptr : el->pointsTo) {
           if (!seen.count(ptr)) {
             queue.push(ptr);
           }
         }
       } break;
 
       case BfsDirection::POINTED_FROM: {
-        for (auto ptr : decompEl->pointedFrom) {
+        for (auto ptr : el->pointedFrom) {
           if (!seen.count(ptr)) {
             queue.push(ptr);
           }
diff --git a/torch/csrc/jit/passes/utils/memory_dag.h b/torch/csrc/jit/passes/utils/memory_dag.h
@@ -142,7 +142,7 @@ struct Element {
   void bfs(BfsDirection dir, MemoryLocations& res) const;
 
   // Converts from the compressed index representation
-  static const Element* toElement(unsigned x);
+  static const Element* fromIndex(unsigned x);
 };
 } // namespace jit
 } // namespace torch

Original file line number	Diff line number	Diff line change
`@@ -162,14 +162,14 @@ void AliasDb::dump() const {`
`162`	`162`	`if (!element->pointsTo.empty()) {`
`163`	`163`	`std::cout << getElementName(element) << " points to: ";`
`164`	`164`	`for (const auto pointedTo : element->pointsTo) {`
`165`		`- std::cout << getElementName(Element::toElement(pointedTo)) << ", ";`
	`165`	`+ std::cout << getElementName(Element::fromIndex(pointedTo)) << ", ";`
`166`	`166`	`}`
`167`	`167`	`std::cout << "\n";`
`168`	`168`	`}`
`169`	`169`	`if (!element->contained_elements.empty()) {`
`170`	`170`	`std::cout << getElementName(element) << " contains: ";`
`171`	`171`	`for (const auto contained : element->contained_elements) {`
`172`		`- std::cout << getElementName(Element::toElement(contained)) << ", ";`
	`172`	`+ std::cout << getElementName(Element::fromIndex(contained)) << ", ";`
`173`	`173`	`}`
`174`	`174`	`std::cout << "\n";`
`175`	`175`	`}`
`@@ -540,7 +540,7 @@ void AliasDb::analyzeWait(Node* node) {`
`540`	`540`	`const auto el = pr.second;`
`541`	`541`	`const auto& pointedFrom = el->pointedFrom;`
`542`	`542`	`TORCH_INTERNAL_ASSERT(!pointedFrom.empty());`
`543`		`- const auto wildcardValue = Element::toElement(*pointedFrom.begin())->value;`
	`543`	`+ const auto wildcardValue = Element::fromIndex(*pointedFrom.begin())->value;`
`544`	`544`	`TORCH_INTERNAL_ASSERT(wildcardValue);`
`545`	`545`	`registerWrite(wildcardValue, node);`
`546`	`546`	`}`