fix rebase errors (pytorch#105)

zheng-xq · web-flow · commit b1900f876f1e · 2020-02-05T15:18:40.000-08:00
diff --git a/torch/csrc/jit/passes/tensorexpr_fuser.cpp b/torch/csrc/jit/passes/tensorexpr_fuser.cpp
@@ -705,7 +705,7 @@ class TensorExprKernel {
             Node* n = v->node();
             int64_t dim = n->i(attr::dim);
             int64_t chunks = n->i(attr::chunks);
-            return chunk(tensors.at(n->inputs()[0]->unique()), v->offset(), dim, chunks, axes);
+            return chunk(tensors_.at(n->inputs()[0]->unique()), v->offset(), dim, chunks, axes);
           }
         );
       }
@@ -832,7 +832,7 @@ class TensorExprKernel {
       } else {
         for (torch::jit::Value* output : n->outputs()) {
           if (output->hasUses()) {
-            tensors.emplace(output->unique(), ComputeValue(output));
+            tensors_.emplace(output->unique(), ComputeValue(output));
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ class TensorExprKernel {`
`705`	`705`	`Node* n = v->node();`
`706`	`706`	`int64_t dim = n->i(attr::dim);`
`707`	`707`	`int64_t chunks = n->i(attr::chunks);`
`708`		`- return chunk(tensors.at(n->inputs()[0]->unique()), v->offset(), dim, chunks, axes);`
	`708`	`+ return chunk(tensors_.at(n->inputs()[0]->unique()), v->offset(), dim, chunks, axes);`
`709`	`709`	`}`
`710`	`710`	`);`
`711`	`711`	`}`
`@@ -832,7 +832,7 @@ class TensorExprKernel {`
`832`	`832`	`} else {`
`833`	`833`	`for (torch::jit::Value* output : n->outputs()) {`
`834`	`834`	`if (output->hasUses()) {`
`835`		`- tensors.emplace(output->unique(), ComputeValue(output));`
	`835`	`+ tensors_.emplace(output->unique(), ComputeValue(output));`
`836`	`836`	`}`
`837`	`837`	`}`
`838`	`838`	`}`