Merge pull request #584 from nicolasvasilache/pr/namespace

Fixing namespacing issues

Author: ftynse

tc/core/cuda/cuda_tc_executor.cc

@@ -86,7 +86,7 @@ CudaCompilationResult CudaBackend::compileWithTcMapper(
 
   // Now we can build stuff
   auto mappedScop =
-      polyhedral::MappedScop::makeWithOuterBlockInnerThreadStrategy(
+      polyhedral::cuda::MappedScop::makeWithOuterBlockInnerThreadStrategy(
           std::move(scop), options);
   LOG_IF(INFO, FLAGS_debug_tc_mapper) << "Mapped schedule:" << std::endl
                                       << *(mappedScop->schedule());

tc/core/polyhedral/cpu/mapped_scop.cc

@@ -37,6 +37,7 @@
 
 namespace tc {
 namespace polyhedral {
+namespace cpu {
 
 std::unique_ptr<Jit> MappedScop::codegen(
     const std::string& specializedName) const {
@@ -89,5 +90,6 @@ std::unique_ptr<MappedScop> MappedScop::makeSequential(
   return mappedScop;
 }
 
+} // namespace cpu
 } // namespace polyhedral
 } // namespace tc

tc/core/polyhedral/cpu/mapped_scop.h

@@ -29,6 +29,7 @@
 
 namespace tc {
 namespace polyhedral {
+namespace cpu {
 
 class MappedScop {
  private:
@@ -70,5 +71,7 @@ class MappedScop {
  public:
   const uint64_t unroll;
 };
+
+} // namespace cpu
 } // namespace polyhedral
 } // namespace tc

tc/core/polyhedral/cuda/codegen.cc

@@ -31,11 +31,17 @@
 #include "tc/core/polyhedral/memory_promotion.h"
 #include "tc/core/polyhedral/schedule_isl_conversion.h"
 #include "tc/core/polyhedral/schedule_transforms.h"
+#include "tc/core/polyhedral/scop.h"
 
 using namespace std;
 
+using tc::polyhedral::detail::ScheduleTreeContext;
+using tc::polyhedral::detail::ScheduleTreeDomain;
+using tc::polyhedral::detail::toIslSchedule;
+
 namespace tc {
 namespace polyhedral {
+namespace cuda {
 
 namespace {
 
@@ -612,8 +618,7 @@ void emitHalideExpr(
   class EmitHalide : public Halide::Internal::IRPrinter {
     using Halide::Internal::IRPrinter::visit;
     void visit(const Halide::Internal::Variable* op) {
-      auto pwAff = tc::polyhedral::detail::makeAffFromMappedExpr(
-          Halide::Expr(op), context);
+      auto pwAff = detail::makeAffFromMappedExpr(Halide::Expr(op), context);
       auto expr = context.build().expr_from(pwAff);
       auto s = expr.to_C_str();
       if (!is_identifier_or_nonnegative_integer(expr)) {
@@ -627,8 +632,7 @@ void emitHalideExpr(
       } else if (
           op->call_type == Halide::Internal::Call::CallType::Halide ||
           op->call_type == Halide::Internal::Call::CallType::Image) {
-        tc::polyhedral::detail::emitMappedTensorAccess(
-            op->name, op, op->args, context);
+        detail::emitMappedTensorAccess(op->name, op, op->args, context);
       } else if (op->is_intrinsic(tc2halide::kReductionUpdate)) {
         op->args[0].accept(this);
       } else {
@@ -831,8 +835,8 @@ string emitCudaKernel(
     const std::string& specializedName,
     const MappedScop& mscop) {
   // Expecting a schedule with domain root and context first child.
-  TC_CHECK(mscop.schedule()->as<detail::ScheduleTreeDomain>());
-  TC_CHECK(mscop.schedule()->child({0})->as<detail::ScheduleTreeContext>());
+  TC_CHECK(mscop.schedule()->as<ScheduleTreeDomain>());
+  TC_CHECK(mscop.schedule()->child({0})->as<ScheduleTreeContext>());
   const auto& scop = mscop.scop();
 
   // Make a map of the specialized scalar parameter values
@@ -876,7 +880,7 @@ string emitCudaKernel(
     return collectIteratorMaps(n, b, &nodeInfoMap);
   };
 
-  auto schedule = detail::toIslSchedule(mscop.schedule());
+  auto schedule = toIslSchedule(mscop.schedule());
   auto astBuild = isl::ast_build(schedule.get_ctx());
   astBuild = astBuild.set_at_each_domain(collect);
   auto root = mscop.schedule();
@@ -890,5 +894,6 @@ string emitCudaKernel(
   return ss.str();
 }
 
+} // namespace cuda
 } // namespace polyhedral
 } // namespace tc

tc/core/polyhedral/cuda/codegen.h

@@ -26,6 +26,7 @@
 
 namespace tc {
 namespace polyhedral {
+namespace cuda {
 
 struct CodegenContext;
 struct CodegenStatementContext;
@@ -146,5 +147,6 @@ std::string emitCudaKernel(
     const std::string& specializedName,
     const MappedScop& scop);
 
+} // namespace cuda
 } // namespace polyhedral
 } // namespace tc