[TensorExpr] Nuke tensorexpr::schedule namespace. (#35126)

Mikhail Zolotukhin · facebook-github-bot · commit 95ad94c75b09 · 2020-03-20T23:39:14.000-07:00
Summary: Pull Request resolved: #35126 Test Plan: Imported from OSS Differential Revision: D20569364 Pulled By: ZolotukhinM fbshipit-source-id: c0d51ecadf411918641cdbdc6d8cb06e207d2c9b
diff --git a/test/cpp/tensorexpr/test_cuda.cpp b/test/cpp/tensorexpr/test_cuda.cpp
@@ -18,7 +18,7 @@
 namespace torch {
 namespace jit {
 using namespace torch::jit::tensorexpr;
-using namespace torch::jit::tensorexpr::schedule;
+using namespace torch::jit::tensorexpr;
 
 template <typename ctype>
 void testCudaTestVectorAdd01_impl() {
diff --git a/test/cpp/tensorexpr/test_llvm.cpp b/test/cpp/tensorexpr/test_llvm.cpp
@@ -17,7 +17,7 @@
 namespace torch {
 namespace jit {
 using namespace torch::jit::tensorexpr;
-using namespace torch::jit::tensorexpr::schedule;
+using namespace torch::jit::tensorexpr;
 
 using LLVMExprEval = ExprEval<LLVMCodeGen>;
 
diff --git a/test/cpp/tensorexpr/test_loopnest.cpp b/test/cpp/tensorexpr/test_loopnest.cpp
@@ -17,7 +17,7 @@ namespace torch {
 namespace jit {
 
 using namespace torch::jit::tensorexpr;
-using namespace torch::jit::tensorexpr::schedule;
+using namespace torch::jit::tensorexpr;
 
 void testExprSimple01() {
   KernelScope kernel_scope;
diff --git a/torch/csrc/jit/tensorexpr/kernel.cpp b/torch/csrc/jit/tensorexpr/kernel.cpp
@@ -990,7 +990,7 @@ void TensorExprKernel::lowerToBackend(BackendType backendType) {
     }
   }
 
-  torch::jit::tensorexpr::schedule::LoopNest l(tensorOutputs);
+  torch::jit::tensorexpr::LoopNest l(tensorOutputs);
 
   // Compute non-output tensors_ inline
   for (auto& p : tensors_) {
diff --git a/torch/csrc/jit/tensorexpr/loopnest.cpp b/torch/csrc/jit/tensorexpr/loopnest.cpp
@@ -14,7 +14,6 @@
 namespace torch {
 namespace jit {
 namespace tensorexpr {
-namespace schedule {
 
 namespace {
 
@@ -870,7 +869,6 @@ bool LoopNest::hasLoopBodyFor(Tensor* t) const {
   return tensor_to_stmt_.count(t) > 0;
 }
 
-} // namespace schedule
 } // namespace tensorexpr
 } // namespace jit
 } // namespace torch
diff --git a/torch/csrc/jit/tensorexpr/loopnest.h b/torch/csrc/jit/tensorexpr/loopnest.h
@@ -11,7 +11,6 @@
 namespace torch {
 namespace jit {
 namespace tensorexpr {
-namespace schedule {
 
 class TORCH_API LoopNest {
  public:
@@ -48,7 +47,6 @@ class TORCH_API LoopNest {
   std::unordered_set<Tensor*> output_tensors_;
   std::unordered_set<Tensor*> intermediate_tensors_;
 };
-} // namespace schedule
 } // namespace tensorexpr
 } // namespace jit
 } // namespace torch

Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ void TensorExprKernel::lowerToBackend(BackendType backendType) {`
`990`	`990`	`}`
`991`	`991`	`}`
`992`	`992`
`993`		`- torch::jit::tensorexpr::schedule::LoopNest l(tensorOutputs);`
	`993`	`+ torch::jit::tensorexpr::LoopNest l(tensorOutputs);`
`994`	`994`
`995`	`995`	`// Compute non-output tensors_ inline`
`996`	`996`	`for (auto& p : tensors_) {`